diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go index 3e5d90d37a..8bcdf37d1e 100644 --- a/cmd/kops/update_cluster.go +++ b/cmd/kops/update_cluster.go @@ -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) { diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 6f50c6dc5e..18006a2f75 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -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 diff --git a/pkg/apis/kops/bastion.go b/pkg/apis/kops/bastion.go index 4033ffc267..a8af627eda 100644 --- a/pkg/apis/kops/bastion.go +++ b/pkg/apis/kops/bastion.go @@ -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"` } diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go index c840a23f5c..ebef13b10b 100644 --- a/pkg/apis/kops/cluster.go +++ b/pkg/apis/kops/cluster.go @@ -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 diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go index 319fcaeae0..90d4d7531a 100644 --- a/pkg/apis/kops/componentconfig.go +++ b/pkg/apis/kops/componentconfig.go @@ -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"` diff --git a/pkg/apis/kops/v1alpha2/bastion.go b/pkg/apis/kops/v1alpha2/bastion.go index 2a8bd287ec..d1dd653477 100644 --- a/pkg/apis/kops/v1alpha2/bastion.go +++ b/pkg/apis/kops/v1alpha2/bastion.go @@ -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"` diff --git a/pkg/apis/kops/v1alpha2/cluster.go b/pkg/apis/kops/v1alpha2/cluster.go index 364378d4da..6970b6e254 100644 --- a/pkg/apis/kops/v1alpha2/cluster.go +++ b/pkg/apis/kops/v1alpha2/cluster.go @@ -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"` diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go index cdd46672b5..605dbdd8cd 100644 --- a/pkg/apis/kops/v1alpha2/componentconfig.go +++ b/pkg/apis/kops/v1alpha2/componentconfig.go @@ -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"` diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 3996a4e8e0..c3fb0b87de 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -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 diff --git a/pkg/apis/kops/v1alpha3/bastion.go b/pkg/apis/kops/v1alpha3/bastion.go index bf7b8e395e..4c1ded6795 100644 --- a/pkg/apis/kops/v1alpha3/bastion.go +++ b/pkg/apis/kops/v1alpha3/bastion.go @@ -17,10 +17,12 @@ limitations under the License. package v1alpha3 type BastionSpec struct { - BastionPublicName string `json:"bastionPublicName,omitempty"` - // IdleTimeoutSeconds is the bastion's Loadbalancer idle timeout - IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"` - LoadBalancer *BastionLoadBalancerSpec `json:"loadBalancer,omitempty"` + // 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"` } type BastionLoadBalancerSpec struct { diff --git a/pkg/apis/kops/v1alpha3/cluster.go b/pkg/apis/kops/v1alpha3/cluster.go index 40eb1a2871..a8654a7b60 100644 --- a/pkg/apis/kops/v1alpha3/cluster.go +++ b/pkg/apis/kops/v1alpha3/cluster.go @@ -465,12 +465,7 @@ 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"` + Provider string `json:"provider,omitempty"` // ServerIP is the server ip ServerIP string `json:"serverIP,omitempty"` // StubDomains redirects a domains to another DNS service diff --git a/pkg/apis/kops/v1alpha3/componentconfig.go b/pkg/apis/kops/v1alpha3/componentconfig.go index 9a6e0fd368..bfabfa2188 100644 --- a/pkg/apis/kops/v1alpha3/componentconfig.go +++ b/pkg/apis/kops/v1alpha3/componentconfig.go @@ -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"` diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 50ce08a4dc..d3aea28c16 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -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 diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go index a4660afac3..fcd3017800 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go @@ -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) diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 57373432d2..39488c8bad 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -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) diff --git a/pkg/model/awsmodel/bastion.go b/pkg/model/awsmodel/bastion.go index 1975049645..bca169f119 100644 --- a/pkg/model/awsmodel/bastion.go +++ b/pkg/model/awsmodel/bastion.go @@ -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, } diff --git a/pkg/model/components/kubedns.go b/pkg/model/components/kubedns.go index 28596b3c47..5635bbc112 100644 --- a/pkg/model/components/kubedns.go +++ b/pkg/model/components/kubedns.go @@ -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 } diff --git a/pkg/model/context.go b/pkg/model/context.go index c1738245be..c503a56337 100644 --- a/pkg/model/context.go +++ b/pkg/model/context.go @@ -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 diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content index edbcebf7f2..d18dd2dd52 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content index e61f95ec0d..140036a7d9 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content index 7d4abeacb5..bca4dce92c 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content index c177c2a452..6042868240 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content index f532db01aa..dac3ca007b 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content index a4469f57d4..996ed06396 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content index 65142afe33..fd55ab8883 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content index 1ae41d5ab3..ad9ddfe3bd 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 49516b229b..b23b07811f 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content index 6a9c2f4e4a..b5c9f7a84a 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content index 0604eb6ab7..073d6159ba 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content index 1b406533fb..cb5befd148 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 73e2022075..cc5b3f13f2 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index f2f7300018..8c336dfbd0 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 5edd1cdbc8..0b7a4121d7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content index 8053d52461..4c3e32863a 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content index 6d6791589c..3a67bad788 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content index 6dc202c6d6..7f644f14ae 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content index 747e8304da..a9e5f3d786 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content index 54207bef94..8de3467141 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content index 59ee8968b4..203ca4b13a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content index b33c35397b..87d2dc7c5f 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content index 5ea7d0d7f6..8a463858bf 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content index 041136d302..df75a6ca35 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content index 1a9f915826..7be7c9ff29 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 44d18cd3c3..3389a2a69c 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content index 69e978ee85..21a8fa8804 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content index eaafee4328..711b3d8e08 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content index d91f9619bd..e14f0184bf 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content index d91f9619bd..e14f0184bf 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content index 2c246fdf24..d261c63333 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content index a56eece54c..e2553e308c 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content index 1a2687ab89..e3a7c94231 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index 6b0b2b7114..fd08d886f4 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content index bbcb5e67dc..7f3e4298d9 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content index 0fae2c808d..5c1e569520 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content index e6274d97d4..3fdb26a982 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content index 5a4a779032..564277e31d 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content index 36497ce1a9..3949a2461c 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content index 4d425f8899..e892a91e8b 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content index d0c8aec5f6..1bf1c7ebca 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content index 86e1577028..af458c07d8 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content index 570f32c1f1..678ff83b48 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content index ea27d23d4e..e76a006f71 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content index 157b4c633c..8ef1d08c30 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index 2de8465fc8..4f87c6f001 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content index 73b6df1676..aa9f8d2287 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content index 126d32c03d..33d52b3de0 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content index 03bec58588..e0c3922ce0 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index fb3d0b4629..08c23598a3 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -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 {