kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12876 from johngmyers/api-rename 

Rename bastionPublicName in v1alpha3 API
This commit is contained in:
Kubernetes Prow Robot 2021-12-03 11:42:35 -08:00 committed by GitHub
parent ca966310e8 c23f40aea1
commit 89bc0f6587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 60 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/update_cluster.go
View File

@ -449,7 +449,7 @@ func findBastionPublicName(c *kops.Cluster) string {
if bastion == nil {
return ""
}
return bastion.BastionPublicName
return bastion.PublicName
}
func hasKubecfg(contextName string) (bool, error) {

27
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -477,32 +477,25 @@ spec:
description: Spotinst cloud-config specs
type: string
vSphereCoreDNSServer:
description: VSphereCoreDNSServer is deprecated and will be removed
in a later version
description: VSphereCoreDNSServer is unused.
type: string
vSphereDatacenter:
description: VShpereDatacenter is deprecated and will be removed
in a later version
description: VShpereDatacenter is unused.
type: string
vSphereDatastore:
description: VSphereDatastore is deprecated and will be removed
in a later version
description: VSphereDatastore is unused.
type: string
vSpherePassword:
description: VSpherePassword is deprecated and will be removed
in a later version
description: VSpherePassword is unused.
type: string
vSphereResourcePool:
description: VSphereResourcePool is deprecated and will be removed
in a later version
description: VSphereResourcePool is unused.
type: string
vSphereServer:
description: VSphereServer is deprecated and will be removed in
a later version
description: VSphereServer is unused.
type: string
vSphereUsername:
description: VSphereUsername is deprecated and will be removed
in a later version
description: VSphereUsername is unused.
type: string
type: object
cloudControllerManager:
@ -3018,8 +3011,7 @@ spec:
the CoreFile.
type: string
image:
description: Image is the name of the docker image to run - @deprecated
as this is now in the addon
description: Image is unused.
type: string
memoryLimit:
anyOf:
@ -3080,8 +3072,7 @@ spec:
be the default service discovery.
type: string
replicas:
description: Replicas is the number of pod replicas - @deprecated
as this is now in the addon, and controlled by autoscaler
description: Replicas is unused.
type: integer
serverIP:
description: ServerIP is the server ip

7
pkg/apis/kops/bastion.go
View File

@ -17,10 +17,11 @@ limitations under the License.
package kops
type BastionSpec struct {
BastionPublicName string `json:"bastionPublicName,omitempty"`
// IdleTimeoutSeconds is the bastion's Loadbalancer idle timeout
// PublicName is the domain name for the bastion load balancer.
PublicName string `json:"publicName,omitempty"`
// IdleTimeoutSeconds is the bastion's load balancer idle timeout.
IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"`
// LoadBalancer contains settings for the load balancer fronting bastion instances.
LoadBalancer *BastionLoadBalancerSpec `json:"loadBalancer,omitempty"`
}

4
pkg/apis/kops/cluster.go
View File

@ -489,10 +489,6 @@ type KubeDNSConfig struct {
Domain string `json:"domain,omitempty"`
// ExternalCoreFile is used to provide a complete CoreDNS CoreFile by the user - ignores other provided flags which modify the CoreFile.
ExternalCoreFile string `json:"externalCoreFile,omitempty"`
// Image is the name of the docker image to run - @deprecated as this is now in the addon
Image string `json:"image,omitempty"`
// Replicas is the number of pod replicas - @deprecated as this is now in the addon and controlled by autoscaler
Replicas int `json:"replicas,omitempty"`
// Provider indicates whether CoreDNS or kube-dns will be the default service discovery.
Provider string `json:"provider,omitempty"`
// ServerIP is the server ip

14
pkg/apis/kops/componentconfig.go
View File

@ -851,20 +851,6 @@ type CloudConfiguration struct {
// AWS cloud-config options
DisableSecurityGroupIngress *bool `json:"disableSecurityGroupIngress,omitempty"`
ElbSecurityGroup *string `json:"elbSecurityGroup,omitempty"`
// VSphereUsername is deprecated and will be removed in a later version
VSphereUsername *string `json:"vSphereUsername,omitempty"`
// VSpherePassword is deprecated and will be removed in a later version
VSpherePassword *string `json:"vSpherePassword,omitempty"`
// VSphereServer is deprecated and will be removed in a later version
VSphereServer *string `json:"vSphereServer,omitempty"`
// VShpereDatacenter is deprecated and will be removed in a later version
VSphereDatacenter *string `json:"vSphereDatacenter,omitempty"`
// VSphereResourcePool is deprecated and will be removed in a later version
VSphereResourcePool *string `json:"vSphereResourcePool,omitempty"`
// VSphereDatastore is deprecated and will be removed in a later version
VSphereDatastore *string `json:"vSphereDatastore,omitempty"`
// VSphereCoreDNSServer is deprecated and will be removed in a later version
VSphereCoreDNSServer *string `json:"vSphereCoreDNSServer,omitempty"`
// Spotinst cloud-config specs
SpotinstProduct *string `json:"spotinstProduct,omitempty"`
SpotinstOrientation *string `json:"spotinstOrientation,omitempty"`

2
pkg/apis/kops/v1alpha2/bastion.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package v1alpha2
type BastionSpec struct {
BastionPublicName string `json:"bastionPublicName,omitempty"`
PublicName string `json:"bastionPublicName,omitempty"`
// IdleTimeoutSeconds is the bastion's Loadbalancer idle timeout
IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"`
LoadBalancer *BastionLoadBalancerSpec `json:"loadBalancer,omitempty"`

6
pkg/apis/kops/v1alpha2/cluster.go
View File

@ -491,9 +491,11 @@ type KubeDNSConfig struct {
Domain string `json:"domain,omitempty"`
// ExternalCoreFile is used to provide a complete CoreDNS CoreFile by the user - ignores other provided flags which modify the CoreFile.
ExternalCoreFile string `json:"externalCoreFile,omitempty"`
// Image is the name of the docker image to run - @deprecated as this is now in the addon
// Image is unused.
// +k8s:conversion-gen=false
Image string `json:"image,omitempty"`
// Replicas is the number of pod replicas - @deprecated as this is now in the addon, and controlled by autoscaler
// Replicas is unused.
// +k8s:conversion-gen=false
Replicas int `json:"replicas,omitempty"`
// Provider indicates whether CoreDNS or kube-dns will be the default service discovery.
Provider string `json:"provider,omitempty"`

21
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -850,19 +850,26 @@ type CloudConfiguration struct {
// AWS cloud-config options
DisableSecurityGroupIngress *bool `json:"disableSecurityGroupIngress,omitempty"`
ElbSecurityGroup *string `json:"elbSecurityGroup,omitempty"`
// VSphereUsername is deprecated and will be removed in a later version
// VSphereUsername is unused.
// +k8s:conversion-gen=false
VSphereUsername *string `json:"vSphereUsername,omitempty"`
// VSpherePassword is deprecated and will be removed in a later version
// VSpherePassword is unused.
// +k8s:conversion-gen=false
VSpherePassword *string `json:"vSpherePassword,omitempty"`
// VSphereServer is deprecated and will be removed in a later version
// VSphereServer is unused.
// +k8s:conversion-gen=false
VSphereServer *string `json:"vSphereServer,omitempty"`
// VShpereDatacenter is deprecated and will be removed in a later version
// VShpereDatacenter is unused.
// +k8s:conversion-gen=false
VSphereDatacenter *string `json:"vSphereDatacenter,omitempty"`
// VSphereResourcePool is deprecated and will be removed in a later version
// VSphereResourcePool is unused.
// +k8s:conversion-gen=false
VSphereResourcePool *string `json:"vSphereResourcePool,omitempty"`
// VSphereDatastore is deprecated and will be removed in a later version
// VSphereDatastore is unused.
// +k8s:conversion-gen=false
VSphereDatastore *string `json:"vSphereDatastore,omitempty"`
// VSphereCoreDNSServer is deprecated and will be removed in a later version
// VSphereCoreDNSServer is unused.
// +k8s:conversion-gen=false
VSphereCoreDNSServer *string `json:"vSphereCoreDNSServer,omitempty"`
// Spotinst cloud-config specs
SpotinstProduct *string `json:"spotinstProduct,omitempty"`

31
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -1656,7 +1656,7 @@ func Convert_kops_BastionLoadBalancerSpec_To_v1alpha2_BastionLoadBalancerSpec(in
}
func autoConvert_v1alpha2_BastionSpec_To_kops_BastionSpec(in *BastionSpec, out *kops.BastionSpec, s conversion.Scope) error {
out.BastionPublicName = in.BastionPublicName
out.PublicName = in.PublicName
out.IdleTimeoutSeconds = in.IdleTimeoutSeconds
if in.LoadBalancer != nil {
in, out := &in.LoadBalancer, &out.LoadBalancer
@ -1676,7 +1676,7 @@ func Convert_v1alpha2_BastionSpec_To_kops_BastionSpec(in *BastionSpec, out *kops
}
func autoConvert_kops_BastionSpec_To_v1alpha2_BastionSpec(in *kops.BastionSpec, out *BastionSpec, s conversion.Scope) error {
out.BastionPublicName = in.BastionPublicName
out.PublicName = in.PublicName
out.IdleTimeoutSeconds = in.IdleTimeoutSeconds
if in.LoadBalancer != nil {
in, out := &in.LoadBalancer, &out.LoadBalancer
@ -2040,13 +2040,13 @@ func autoConvert_v1alpha2_CloudConfiguration_To_kops_CloudConfiguration(in *Clou
out.GCEServiceAccount = in.GCEServiceAccount
out.DisableSecurityGroupIngress = in.DisableSecurityGroupIngress
out.ElbSecurityGroup = in.ElbSecurityGroup
out.VSphereUsername = in.VSphereUsername
out.VSpherePassword = in.VSpherePassword
out.VSphereServer = in.VSphereServer
out.VSphereDatacenter = in.VSphereDatacenter
out.VSphereResourcePool = in.VSphereResourcePool
out.VSphereDatastore = in.VSphereDatastore
out.VSphereCoreDNSServer = in.VSphereCoreDNSServer
// INFO: in.VSphereUsername opted out of conversion generation
// INFO: in.VSpherePassword opted out of conversion generation
// INFO: in.VSphereServer opted out of conversion generation
// INFO: in.VSphereDatacenter opted out of conversion generation
// INFO: in.VSphereResourcePool opted out of conversion generation
// INFO: in.VSphereDatastore opted out of conversion generation
// INFO: in.VSphereCoreDNSServer opted out of conversion generation
out.SpotinstProduct = in.SpotinstProduct
out.SpotinstOrientation = in.SpotinstOrientation
if in.Openstack != nil {
@ -2102,13 +2102,6 @@ func autoConvert_kops_CloudConfiguration_To_v1alpha2_CloudConfiguration(in *kops
out.GCEServiceAccount = in.GCEServiceAccount
out.DisableSecurityGroupIngress = in.DisableSecurityGroupIngress
out.ElbSecurityGroup = in.ElbSecurityGroup
out.VSphereUsername = in.VSphereUsername
out.VSpherePassword = in.VSpherePassword
out.VSphereServer = in.VSphereServer
out.VSphereDatacenter = in.VSphereDatacenter
out.VSphereResourcePool = in.VSphereResourcePool
out.VSphereDatastore = in.VSphereDatastore
out.VSphereCoreDNSServer = in.VSphereCoreDNSServer
out.SpotinstProduct = in.SpotinstProduct
out.SpotinstOrientation = in.SpotinstOrientation
if in.Openstack != nil {
@ -5065,8 +5058,8 @@ func autoConvert_v1alpha2_KubeDNSConfig_To_kops_KubeDNSConfig(in *KubeDNSConfig,
out.CPAImage = in.CPAImage
out.Domain = in.Domain
out.ExternalCoreFile = in.ExternalCoreFile
out.Image = in.Image
out.Replicas = in.Replicas
// INFO: in.Image opted out of conversion generation
// INFO: in.Replicas opted out of conversion generation
out.Provider = in.Provider
out.ServerIP = in.ServerIP
out.StubDomains = in.StubDomains
@ -5100,8 +5093,6 @@ func autoConvert_kops_KubeDNSConfig_To_v1alpha2_KubeDNSConfig(in *kops.KubeDNSCo
out.CPAImage = in.CPAImage
out.Domain = in.Domain
out.ExternalCoreFile = in.ExternalCoreFile
out.Image = in.Image
out.Replicas = in.Replicas
out.Provider = in.Provider
out.ServerIP = in.ServerIP
out.StubDomains = in.StubDomains

6
pkg/apis/kops/v1alpha3/bastion.go
View File

@ -17,9 +17,11 @@ limitations under the License.
package v1alpha3
type BastionSpec struct {
BastionPublicName string `json:"bastionPublicName,omitempty"`
// IdleTimeoutSeconds is the bastion's Loadbalancer idle timeout
// PublicName is the domain name for the bastion load balancer.
PublicName string `json:"publicName,omitempty"`
// IdleTimeoutSeconds is the bastion's load balancer idle timeout.
IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"`
// LoadBalancer contains settings for the load balancer fronting bastion instances.
LoadBalancer *BastionLoadBalancerSpec `json:"loadBalancer,omitempty"`
}

5
pkg/apis/kops/v1alpha3/cluster.go
View File

@ -465,11 +465,6 @@ type KubeDNSConfig struct {
Domain string `json:"domain,omitempty"`
// ExternalCoreFile is used to provide a complete CoreDNS CoreFile by the user - ignores other provided flags which modify the CoreFile.
ExternalCoreFile string `json:"externalCoreFile,omitempty"`
// Image is the name of the docker image to run - @deprecated as this is now in the addon
Image string `json:"image,omitempty"`
// Replicas is the number of pod replicas - @deprecated as this is now in the addon, and controlled by autoscaler
Replicas int `json:"replicas,omitempty"`
// Provider indicates whether CoreDNS or kube-dns will be the default service discovery.
Provider string `json:"provider,omitempty"`
// ServerIP is the server ip
ServerIP string `json:"serverIP,omitempty"`

14
pkg/apis/kops/v1alpha3/componentconfig.go
View File

@ -848,20 +848,6 @@ type CloudConfiguration struct {
// AWS cloud-config options
DisableSecurityGroupIngress *bool `json:"disableSecurityGroupIngress,omitempty"`
ElbSecurityGroup *string `json:"elbSecurityGroup,omitempty"`
// VSphereUsername is deprecated and will be removed in a later version
VSphereUsername *string `json:"vSphereUsername,omitempty"`
// VSpherePassword is deprecated and will be removed in a later version
VSpherePassword *string `json:"vSpherePassword,omitempty"`
// VSphereServer is deprecated and will be removed in a later version
VSphereServer *string `json:"vSphereServer,omitempty"`
// VShpereDatacenter is deprecated and will be removed in a later version
VSphereDatacenter *string `json:"vSphereDatacenter,omitempty"`
// VSphereResourcePool is deprecated and will be removed in a later version
VSphereResourcePool *string `json:"vSphereResourcePool,omitempty"`
// VSphereDatastore is deprecated and will be removed in a later version
VSphereDatastore *string `json:"vSphereDatastore,omitempty"`
// VSphereCoreDNSServer is deprecated and will be removed in a later version
VSphereCoreDNSServer *string `json:"vSphereCoreDNSServer,omitempty"`
// Spotinst cloud-config specs
SpotinstProduct *string `json:"spotinstProduct,omitempty"`
SpotinstOrientation *string `json:"spotinstOrientation,omitempty"`

22
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -1606,7 +1606,7 @@ func Convert_kops_BastionLoadBalancerSpec_To_v1alpha3_BastionLoadBalancerSpec(in
}
func autoConvert_v1alpha3_BastionSpec_To_kops_BastionSpec(in *BastionSpec, out *kops.BastionSpec, s conversion.Scope) error {
out.BastionPublicName = in.BastionPublicName
out.PublicName = in.PublicName
out.IdleTimeoutSeconds = in.IdleTimeoutSeconds
if in.LoadBalancer != nil {
in, out := &in.LoadBalancer, &out.LoadBalancer
@ -1626,7 +1626,7 @@ func Convert_v1alpha3_BastionSpec_To_kops_BastionSpec(in *BastionSpec, out *kops
}
func autoConvert_kops_BastionSpec_To_v1alpha3_BastionSpec(in *kops.BastionSpec, out *BastionSpec, s conversion.Scope) error {
out.BastionPublicName = in.BastionPublicName
out.PublicName = in.PublicName
out.IdleTimeoutSeconds = in.IdleTimeoutSeconds
if in.LoadBalancer != nil {
in, out := &in.LoadBalancer, &out.LoadBalancer
@ -1938,13 +1938,6 @@ func autoConvert_v1alpha3_CloudConfiguration_To_kops_CloudConfiguration(in *Clou
out.GCEServiceAccount = in.GCEServiceAccount
out.DisableSecurityGroupIngress = in.DisableSecurityGroupIngress
out.ElbSecurityGroup = in.ElbSecurityGroup
out.VSphereUsername = in.VSphereUsername
out.VSpherePassword = in.VSpherePassword
out.VSphereServer = in.VSphereServer
out.VSphereDatacenter = in.VSphereDatacenter
out.VSphereResourcePool = in.VSphereResourcePool
out.VSphereDatastore = in.VSphereDatastore
out.VSphereCoreDNSServer = in.VSphereCoreDNSServer
out.SpotinstProduct = in.SpotinstProduct
out.SpotinstOrientation = in.SpotinstOrientation
if in.Openstack != nil {
@ -2000,13 +1993,6 @@ func autoConvert_kops_CloudConfiguration_To_v1alpha3_CloudConfiguration(in *kops
out.GCEServiceAccount = in.GCEServiceAccount
out.DisableSecurityGroupIngress = in.DisableSecurityGroupIngress
out.ElbSecurityGroup = in.ElbSecurityGroup
out.VSphereUsername = in.VSphereUsername
out.VSpherePassword = in.VSpherePassword
out.VSphereServer = in.VSphereServer
out.VSphereDatacenter = in.VSphereDatacenter
out.VSphereResourcePool = in.VSphereResourcePool
out.VSphereDatastore = in.VSphereDatastore
out.VSphereCoreDNSServer = in.VSphereCoreDNSServer
out.SpotinstProduct = in.SpotinstProduct
out.SpotinstOrientation = in.SpotinstOrientation
if in.Openstack != nil {
@ -4962,8 +4948,6 @@ func autoConvert_v1alpha3_KubeDNSConfig_To_kops_KubeDNSConfig(in *KubeDNSConfig,
out.CPAImage = in.CPAImage
out.Domain = in.Domain
out.ExternalCoreFile = in.ExternalCoreFile
out.Image = in.Image
out.Replicas = in.Replicas
out.Provider = in.Provider
out.ServerIP = in.ServerIP
out.StubDomains = in.StubDomains
@ -4997,8 +4981,6 @@ func autoConvert_kops_KubeDNSConfig_To_v1alpha3_KubeDNSConfig(in *kops.KubeDNSCo
out.CPAImage = in.CPAImage
out.Domain = in.Domain
out.ExternalCoreFile = in.ExternalCoreFile
out.Image = in.Image
out.Replicas = in.Replicas
out.Provider = in.Provider
out.ServerIP = in.ServerIP
out.StubDomains = in.StubDomains

35
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

@ -637,41 +637,6 @@ func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) {
*out = new(string)
**out = **in
}
if in.VSphereUsername != nil {
in, out := &in.VSphereUsername, &out.VSphereUsername
*out = new(string)
**out = **in
}
if in.VSpherePassword != nil {
in, out := &in.VSpherePassword, &out.VSpherePassword
*out = new(string)
**out = **in
}
if in.VSphereServer != nil {
in, out := &in.VSphereServer, &out.VSphereServer
*out = new(string)
**out = **in
}
if in.VSphereDatacenter != nil {
in, out := &in.VSphereDatacenter, &out.VSphereDatacenter
*out = new(string)
**out = **in
}
if in.VSphereResourcePool != nil {
in, out := &in.VSphereResourcePool, &out.VSphereResourcePool
*out = new(string)
**out = **in
}
if in.VSphereDatastore != nil {
in, out := &in.VSphereDatastore, &out.VSphereDatastore
*out = new(string)
**out = **in
}
if in.VSphereCoreDNSServer != nil {
in, out := &in.VSphereCoreDNSServer, &out.VSphereCoreDNSServer
*out = new(string)
**out = **in
}
if in.SpotinstProduct != nil {
in, out := &in.SpotinstProduct, &out.SpotinstProduct
*out = new(string)

35
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -729,41 +729,6 @@ func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) {
*out = new(string)
**out = **in
}
if in.VSphereUsername != nil {
in, out := &in.VSphereUsername, &out.VSphereUsername
*out = new(string)
**out = **in
}
if in.VSpherePassword != nil {
in, out := &in.VSpherePassword, &out.VSpherePassword
*out = new(string)
**out = **in
}
if in.VSphereServer != nil {
in, out := &in.VSphereServer, &out.VSphereServer
*out = new(string)
**out = **in
}
if in.VSphereDatacenter != nil {
in, out := &in.VSphereDatacenter, &out.VSphereDatacenter
*out = new(string)
**out = **in
}
if in.VSphereResourcePool != nil {
in, out := &in.VSphereResourcePool, &out.VSphereResourcePool
*out = new(string)
**out = **in
}
if in.VSphereDatastore != nil {
in, out := &in.VSphereDatastore, &out.VSphereDatastore
*out = new(string)
**out = **in
}
if in.VSphereCoreDNSServer != nil {
in, out := &in.VSphereCoreDNSServer, &out.VSphereCoreDNSServer
*out = new(string)
**out = **in
}
if in.SpotinstProduct != nil {
in, out := &in.SpotinstProduct, &out.SpotinstProduct
*out = new(string)

10
pkg/model/awsmodel/bastion.go
View File

@ -332,19 +332,19 @@ func (b *BastionModelBuilder) Build(c *fi.ModelBuilderContext) error {
c.AddTask(elb)
}
bastionPublicName := ""
publicName := ""
if b.Cluster.Spec.Topology != nil && b.Cluster.Spec.Topology.Bastion != nil {
bastionPublicName = b.Cluster.Spec.Topology.Bastion.BastionPublicName
publicName = b.Cluster.Spec.Topology.Bastion.PublicName
}
if bastionPublicName != "" {
if publicName != "" {
// Here we implement the bastion CNAME logic
// By default bastions will create a CNAME that follows the `bastion-$clustername` formula
t := &awstasks.DNSName{
Name: fi.String(bastionPublicName),
Name: fi.String(publicName),
Lifecycle: b.Lifecycle,
Zone: b.LinkToDNSZone(),
ResourceName: fi.String(bastionPublicName),
ResourceName: fi.String(publicName),
ResourceType: fi.String("A"),
TargetLoadBalancer: elb,
}

2
pkg/model/components/kubedns.go
View File

@ -39,8 +39,6 @@ func (b *KubeDnsOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec.KubeDNS = &kops.KubeDNSConfig{}
}
clusterSpec.KubeDNS.Replicas = 2
if clusterSpec.KubeDNS.CacheMaxSize == 0 {
clusterSpec.KubeDNS.CacheMaxSize = 1000
}

2
pkg/model/context.go
View File

@ -240,7 +240,7 @@ func (b *KopsModelContext) UseBootstrapTokens() bool {
// UsesBastionDns checks if we should use a specific name for the bastion dns
func (b *KopsModelContext) UsesBastionDns() bool {
if b.Cluster.Spec.Topology.Bastion != nil && b.Cluster.Spec.Topology.Bastion.BastionPublicName != "" {
if b.Cluster.Spec.Topology.Bastion != nil && b.Cluster.Spec.Topology.Bastion.PublicName != "" {
return true
}
return false

1
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -116,7 +116,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -137,7 +137,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -133,7 +133,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -119,7 +119,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -122,7 +122,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -112,7 +112,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -128,7 +128,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -119,7 +119,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -121,7 +121,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -138,7 +138,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -138,7 +138,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 172.20.0.10
kubeProxy:
cpuRequest: 100m

1
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -137,7 +137,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 172.20.0.10
kubeProxy:
cpuRequest: 100m

1
tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -130,7 +130,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 172.20.0.10
kubeProxy:
cpuRequest: 100m

1
tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -122,7 +122,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -117,7 +117,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -127,7 +127,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: fd00:5e4f:ce::a
upstreamNameservers:
- fd00:ec2::253

1
tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -127,7 +127,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: fd00:5e4f:ce::a
upstreamNameservers:
- fd00:ec2::253

1
tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -127,7 +127,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: fd00:5e4f:ce::a
upstreamNameservers:
- fd00:ec2::253

1
tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -127,7 +127,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: fd00:5e4f:ce::a
upstreamNameservers:
- fd00:ec2::253

1
tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -114,7 +114,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -110,7 +110,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -119,7 +119,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -119,7 +119,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -114,7 +114,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -116,7 +116,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -118,7 +118,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: KubeDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -120,7 +120,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -116,7 +116,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -123,7 +123,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: KubeDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -113,7 +113,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

1
tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -111,7 +111,6 @@ spec:
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
serverIP: 100.64.0.10
kubeProxy:
clusterCIDR: 100.96.0.0/11

2
upup/pkg/fi/cloudup/new_cluster.go
View File

@ -1052,7 +1052,7 @@ func setupTopology(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.S
if !dns.IsGossipHostname(cluster.Name) {
cluster.Spec.Topology.Bastion = &api.BastionSpec{
BastionPublicName: "bastion." + cluster.Name,
PublicName: "bastion." + cluster.Name,
}
}
if api.CloudProviderID(cluster.Spec.CloudProvider) == api.CloudProviderGCE {