From 8473e8b2e7b4f2d1bdde1ffd322479999aa6615c Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Mon, 7 Nov 2022 17:38:20 -0800 Subject: [PATCH 1/2] Stop making MasterInternalName configurable --- docs/cluster_spec.md | 2 +- docs/tutorial/upgrading-kubernetes.md | 1 - k8s/crds/kops.k8s.io_clusters.yaml | 9 ++++----- nodeup/pkg/model/context.go | 6 +++--- nodeup/pkg/model/etc_hosts.go | 4 ++-- nodeup/pkg/model/kube_apiserver.go | 4 ++-- nodeup/pkg/model/kube_proxy.go | 2 +- nodeup/pkg/model/kube_proxy_test.go | 1 - nodeup/pkg/model/protokube.go | 2 +- .../tests/containerdbuilder/flatcar/cluster.yaml | 1 - .../from_docker_19.03.11/cluster.yaml | 1 - .../from_docker_19.03.14/cluster.yaml | 1 - .../tests/containerdbuilder/simple/cluster.yaml | 1 - .../tests/containerdbuilder/skipinstall/cluster.yaml | 1 - .../tests/dockerbuilder/docker_19.03.11/cluster.yaml | 1 - .../tests/dockerbuilder/healthcheck/cluster.yaml | 1 - .../model/tests/dockerbuilder/logflags/cluster.yaml | 1 - .../tests/dockerbuilder/skipinstall/cluster.yaml | 1 - nodeup/pkg/model/tests/golden/awsiam/cluster.yaml | 1 - .../tests/golden/dedicated-apiserver/cluster.yaml | 1 - .../tests/golden/hooks-containerd-exec/cluster.yaml | 1 - .../tests/golden/hooks-docker-exec/cluster.yaml | 1 - nodeup/pkg/model/tests/golden/minimal/cluster.yaml | 1 - .../pkg/model/tests/golden/side-loading/cluster.yaml | 1 - .../tests/golden/without-etcd-events/cluster.yaml | 1 - .../model/tests/kubelet/featuregates/cluster.yaml | 1 - nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml | 1 - nodeup/pkg/model/tests/protokube/cluster.yaml | 1 - .../updateservicebuilder/automatic/cluster.yaml | 1 - .../tests/updateservicebuilder/external/cluster.yaml | 1 - pkg/apis/kops/cluster.go | 12 +++++------- pkg/apis/kops/v1alpha2/cluster.go | 5 +++-- pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 3 +-- pkg/apis/kops/v1alpha3/cluster.go | 4 +--- pkg/apis/kops/v1alpha3/zz_generated.conversion.go | 2 -- pkg/kubeconfig/create_kubecfg.go | 5 +---- pkg/kubeconfig/create_kubecfg_test.go | 4 +--- pkg/model/awsmodel/dns.go | 10 +++++----- pkg/model/components/discovery.go | 2 +- pkg/model/components/etcdmanager/model.go | 4 ++-- .../etcdmanager/tests/interval/cluster.yaml | 1 - .../etcdmanager/tests/minimal/cluster.yaml | 1 - .../tests/overwrite_settings/cluster.yaml | 1 - .../components/etcdmanager/tests/proxy/cluster.yaml | 1 - .../kubeapiserver/tests/minimal/cluster.yaml | 1 - pkg/testutils/cluster.go | 1 - .../scenarios/podidentitywebhook/cluster.yaml.tmpl | 1 - tests/e2e/templates/apiserver-dns-none.yaml.tmpl | 1 - tests/e2e/templates/apiserver.yaml.tmpl | 1 - tests/e2e/templates/many-addons.yaml.tmpl | 1 - tests/e2e/templates/simple.yaml.tmpl | 1 - tests/e2e/templates/staticcpumanagerpolicy.tmpl | 1 - tests/integration/conversion/aws/v1alpha2.yaml | 1 - tests/integration/conversion/aws/v1alpha3.yaml | 1 - tests/integration/conversion/azure/v1alpha2.yaml | 1 - tests/integration/conversion/azure/v1alpha3.yaml | 1 - tests/integration/conversion/canal/v1alpha2.yaml | 1 - tests/integration/conversion/canal/v1alpha3.yaml | 1 - tests/integration/conversion/cilium/v1alpha2.yaml | 1 - tests/integration/conversion/cilium/v1alpha3.yaml | 1 - tests/integration/conversion/do/v1alpha2.yaml | 1 - tests/integration/conversion/do/v1alpha3.yaml | 1 - tests/integration/conversion/gce/v1alpha2.yaml | 1 - tests/integration/conversion/gce/v1alpha3.yaml | 1 - .../conversion/minimal/legacy-v1alpha2.yaml | 1 - tests/integration/conversion/minimal/v1alpha2.yaml | 1 - tests/integration/conversion/minimal/v1alpha3.yaml | 1 - tests/integration/conversion/openstack/v1alpha2.yaml | 1 - tests/integration/conversion/openstack/v1alpha3.yaml | 1 - .../aws-lb-controller/in-v1alpha2.yaml | 1 - .../update_cluster/complex/in-legacy-v1alpha2.yaml | 1 - .../update_cluster/complex/in-v1alpha2.yaml | 1 - .../update_cluster/compress/in-v1alpha2.yaml | 1 - .../containerd-custom/in-v1alpha2.yaml | 1 - .../update_cluster/containerd/in-v1alpha2.yaml | 1 - .../update_cluster/digit/in-v1alpha2.yaml | 1 - .../update_cluster/docker-custom/in-v1alpha2.yaml | 1 - .../existing_iam_cloudformation/in-v1alpha2.yaml | 1 - .../update_cluster/existing_sg/in-v1alpha2.yaml | 1 - .../update_cluster/external_dns/in-v1alpha2.yaml | 1 - .../external_dns_irsa/in-v1alpha2.yaml | 1 - .../update_cluster/externallb/in-v1alpha2.yaml | 1 - .../update_cluster/externalpolicies/in-v1alpha2.yaml | 1 - .../integration/update_cluster/irsa/in-v1alpha2.yaml | 1 - .../update_cluster/karpenter/in-v1alpha2.yaml | 1 - .../update_cluster/lifecycle_phases/in-v1alpha2.yaml | 1 - .../many-addons-ccm-irsa/in-v1alpha2.yaml | 1 - .../many-addons-ccm-irsa23/in-v1alpha2.yaml | 1 - .../many-addons-ccm-irsa24/in-v1alpha2.yaml | 1 - .../many-addons-ccm-irsa25/in-v1alpha2.yaml | 1 - .../many-addons-ccm-irsa26/in-v1alpha2.yaml | 1 - .../update_cluster/many-addons-ccm/in-v1alpha2.yaml | 1 - .../update_cluster/many-addons/in-v1alpha2.yaml | 1 - .../update_cluster/minimal-etcd/in-v1alpha2.yaml | 1 - .../update_cluster/minimal-gp3/in-v1alpha2.yaml | 1 - .../minimal-ipv6-calico/in-v1alpha2.yaml | 1 - .../minimal-ipv6-cilium/in-v1alpha2.yaml | 1 - .../minimal-ipv6-private/in-v1alpha2.yaml | 1 - .../update_cluster/minimal-ipv6/in-v1alpha2.yaml | 1 - .../minimal-longclustername/in-v1alpha2.yaml | 1 - .../update_cluster/minimal-warmpool/in-v1alpha2.yaml | 1 - .../update_cluster/minimal/in-v1alpha2.yaml | 1 - .../update_cluster/minimal_gossip/in-v1alpha2.yaml | 1 - .../minimal_gossip_irsa/in-v1alpha2.yaml | 1 - .../update_cluster/mixed_instances/in-v1alpha2.yaml | 1 - .../mixed_instances_spot/in-v1alpha2.yaml | 1 - .../nth_sqs_resources/in-v1alpha2.yaml | 1 - .../update_cluster/nvidia/in-v1alpha2.yaml | 1 - .../private-shared-ip/in-v1alpha2.yaml | 1 - .../private-shared-subnet/in-v1alpha2.yaml | 1 - .../update_cluster/privatecalico/in-v1alpha2.yaml | 1 - .../update_cluster/privatecanal/in-v1alpha2.yaml | 1 - .../update_cluster/privatecilium/in-v1alpha2.yaml | 1 - .../update_cluster/privatecilium2/in-v1alpha2.yaml | 1 - .../privateciliumadvanced/in-v1alpha2.yaml | 1 - .../update_cluster/privatedns1/in-v1alpha2.yaml | 1 - .../update_cluster/privatedns2/in-v1alpha2.yaml | 1 - .../update_cluster/privateflannel/in-v1alpha2.yaml | 1 - .../update_cluster/privatekopeio/in-v1alpha2.yaml | 1 - .../update_cluster/privateweave/in-v1alpha2.yaml | 1 - .../public-jwks-apiserver/in-v1alpha2.yaml | 1 - .../update_cluster/shared_subnet/in-v1alpha2.yaml | 1 - .../update_cluster/shared_vpc/in-v1alpha2.yaml | 1 - .../update_cluster/unmanaged/in-v1alpha2.yaml | 1 - .../update_cluster/vfs-said/in-v1alpha2.yaml | 1 - .../addons/karpenter.sh/k8s-1.19.yaml.template | 4 ++-- .../k8s-1.16-v1.11.yaml.template | 6 +++--- .../k8s-1.16.yaml.template | 2 +- .../k8s-1.22.yaml.template | 2 +- .../k8s-1.25.yaml.template | 2 +- upup/pkg/fi/cloudup/dns.go | 4 ++-- upup/pkg/fi/cloudup/dns_test.go | 1 - upup/pkg/fi/cloudup/template_functions.go | 1 + .../amazonvpc-containerd/cluster.yaml | 1 - .../bootstrapchannelbuilder/amazonvpc/cluster.yaml | 1 - .../awscloudcontroller/cluster.yaml | 1 - .../awsiamauthenticator/crd/cluster.yaml | 1 - .../awsiamauthenticator/mappings/cluster.yaml | 1 - .../bootstrapchannelbuilder/cilium/cluster.yaml | 1 - .../bootstrapchannelbuilder/coredns/cluster.yaml | 1 - .../metrics-server/insecure-1.19/cluster.yaml | 1 - .../metrics-server/secure-1.19/cluster.yaml | 1 - .../service-account-iam/cluster.yaml | 1 - .../bootstrapchannelbuilder/simple/cluster.yaml | 1 - .../tests/bootstrapchannelbuilder/weave/cluster.yaml | 1 - 145 files changed, 45 insertions(+), 177 deletions(-) diff --git a/docs/cluster_spec.md b/docs/cluster_spec.md index e4a2cb4c52..8801fe33ef 100644 --- a/docs/cluster_spec.md +++ b/docs/cluster_spec.md @@ -66,7 +66,7 @@ spec: *Openstack only* As of kOps 1.12.0 it is possible to use the load balancer internally by setting the `useForInternalApi: true`. -This will point both `masterPublicName` and `masterInternalName` to the load balancer. You can therefore set both of these to the same value in this configuration. +This will point `masterPublicName` to the load balancer. ```yaml spec: diff --git a/docs/tutorial/upgrading-kubernetes.md b/docs/tutorial/upgrading-kubernetes.md index 8a1a9d8574..1c4b784525 100644 --- a/docs/tutorial/upgrading-kubernetes.md +++ b/docs/tutorial/upgrading-kubernetes.md @@ -45,7 +45,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.17.2 - masterInternalName: api.internal.simple.k8s.local masterPublicName: api.simple.k8s.local networking: kubenet: {} diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 3bba77ca6a..3f378ef6d8 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -895,9 +895,9 @@ spec: DNS This is because some clouds let us define a managed zone foo.bar, and then have kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. DNSZone will probably be a suffix - of the MasterPublicName and MasterInternalName Note that DNSZone - can either by the host name of the zone (containing dots), or can - be an identifier for the zone. + of the MasterPublicName. Note that DNSZone can either by the host + name of the zone (containing dots), or can be an identifier for + the zone. type: string docker: description: DockerConfig is the configuration for docker @@ -3933,8 +3933,7 @@ spec: be a "spec" like stable) type: string masterInternalName: - description: MasterInternalName is the internal DNS name for the master - nodes + description: MasterInternalName is unused. type: string masterKubelet: description: MasterKubelet is the kubelet configuration for nodes diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go index 6c7c0a4578..ad906392ff 100644 --- a/nodeup/pkg/model/context.go +++ b/nodeup/pkg/model/context.go @@ -234,7 +234,7 @@ func (c *NodeupModelContext) BuildIssuedKubeconfig(name string, subject nodetask // @note: use https even for local connections, so we can turn off the insecure port kubeConfig.ServerURL = "https://127.0.0.1" } else { - kubeConfig.ServerURL = "https://" + c.Cluster.Spec.MasterInternalName + kubeConfig.ServerURL = "https://" + c.Cluster.APIInternalName() } ctx.AddTask(kubeConfig) return kubeConfig.GetConfig() @@ -278,7 +278,7 @@ func (c *NodeupModelContext) BuildBootstrapKubeconfig(name string, ctx *fi.Model // @note: use https even for local connections, so we can turn off the insecure port kubeConfig.ServerURL = "https://127.0.0.1" } else { - kubeConfig.ServerURL = "https://" + c.Cluster.Spec.MasterInternalName + kubeConfig.ServerURL = "https://" + c.Cluster.APIInternalName() } err = ctx.EnsureTask(kubeConfig) @@ -323,7 +323,7 @@ func (c *NodeupModelContext) BuildBootstrapKubeconfig(name string, ctx *fi.Model // This code path is used for the kubelet cert in Kubernetes 1.18 and earlier. kubeConfig.ServerURL = "https://127.0.0.1" } else { - kubeConfig.ServerURL = "https://" + c.Cluster.Spec.MasterInternalName + kubeConfig.ServerURL = "https://" + c.Cluster.APIInternalName() } err = kubeConfig.Run(nil) diff --git a/nodeup/pkg/model/etc_hosts.go b/nodeup/pkg/model/etc_hosts.go index 5176739296..07567c01c0 100644 --- a/nodeup/pkg/model/etc_hosts.go +++ b/nodeup/pkg/model/etc_hosts.go @@ -37,7 +37,7 @@ func (b *EtcHostsBuilder) Build(c *fi.ModelBuilderContext) error { if b.IsMaster && (b.Cluster.IsGossip() || b.Cluster.UsesNoneDNS()) { task.Records = append(task.Records, nodetasks.HostRecord{ - Hostname: b.Cluster.Spec.MasterInternalName, + Hostname: b.Cluster.APIInternalName(), Addresses: []string{"127.0.0.1"}, }) if b.Cluster.Spec.MasterPublicName != "" { @@ -48,7 +48,7 @@ func (b *EtcHostsBuilder) Build(c *fi.ModelBuilderContext) error { } } else if b.BootConfig.APIServerIP != "" { task.Records = append(task.Records, nodetasks.HostRecord{ - Hostname: b.Cluster.Spec.MasterInternalName, + Hostname: b.Cluster.APIInternalName(), Addresses: []string{b.BootConfig.APIServerIP}, }) if b.UseKopsControllerForNodeBootstrap() { diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index 052bf323c2..afd5bb5fc2 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -370,7 +370,7 @@ func (b *KubeAPIServerBuilder) writeServerCertificate(c *fi.ModelBuilderContext, if b.Cluster.Spec.MasterPublicName != "" { alternateNames = append(alternateNames, b.Cluster.Spec.MasterPublicName) } - alternateNames = append(alternateNames, b.Cluster.Spec.MasterInternalName) + alternateNames = append(alternateNames, b.Cluster.APIInternalName()) alternateNames = append(alternateNames, b.Cluster.Spec.AdditionalSANs...) // Load balancer IPs passed in through NodeupConfig @@ -734,7 +734,7 @@ func (b *KubeAPIServerBuilder) buildAnnotations() map[string]string { if b.Cluster.Spec.API != nil { if b.Cluster.Spec.API.LoadBalancer == nil || !b.Cluster.Spec.API.LoadBalancer.UseForInternalAPI { - annotations["dns.alpha.kubernetes.io/internal"] = b.Cluster.Spec.MasterInternalName + annotations["dns.alpha.kubernetes.io/internal"] = b.Cluster.APIInternalName() } if b.Cluster.Spec.API.DNS != nil && b.Cluster.Spec.MasterPublicName != "" { diff --git a/nodeup/pkg/model/kube_proxy.go b/nodeup/pkg/model/kube_proxy.go index fd4b8a0d03..0c8a99695d 100644 --- a/nodeup/pkg/model/kube_proxy.go +++ b/nodeup/pkg/model/kube_proxy.go @@ -126,7 +126,7 @@ func (b *KubeProxyBuilder) buildPod() (*v1.Pod, error) { // which would mean that DNS can't rely on API to come up c.Master = "https://127.0.0.1" } else { - c.Master = "https://" + b.Cluster.Spec.MasterInternalName + c.Master = "https://" + b.Cluster.APIInternalName() } } diff --git a/nodeup/pkg/model/kube_proxy_test.go b/nodeup/pkg/model/kube_proxy_test.go index ae477fa24c..a9d25d2f88 100644 --- a/nodeup/pkg/model/kube_proxy_test.go +++ b/nodeup/pkg/model/kube_proxy_test.go @@ -38,7 +38,6 @@ func TestKubeProxyBuilder_buildPod(t *testing.T) { // https://pkg.go.dev/k8s.io/kops/pkg/apis/kops#KubeProxyConfig cluster := &kops.Cluster{} - cluster.Spec.MasterInternalName = "dev-cluster" cluster.Spec.KubeProxy = &kops.KubeProxyConfig{} cluster.Spec.KubeProxy.Image = "kube-proxy:1.2" diff --git a/nodeup/pkg/model/protokube.go b/nodeup/pkg/model/protokube.go index 319a549deb..76b716b6c5 100644 --- a/nodeup/pkg/model/protokube.go +++ b/nodeup/pkg/model/protokube.go @@ -224,7 +224,7 @@ func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) (*Protokube } // @TODO: This is hacky, but we want it so that we can have a different internal & external name - internalSuffix := t.Cluster.Spec.MasterInternalName + internalSuffix := t.Cluster.APIInternalName() internalSuffix = strings.TrimPrefix(internalSuffix, "api.") f.DNSInternalSuffix = fi.String(internalSuffix) } diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml index f282eeeb59..66c7d54a52 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: legacy: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml index 5e3d558a2c..3e13495c5a 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: legacy: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml index 63a80d2177..ead52ac01b 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: legacy: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml index f282eeeb59..66c7d54a52 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: legacy: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml index fbbe7a31e4..e2c8d3b9a0 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: legacy: false kubernetesVersion: v1.22.3 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml index 082048a667..94e141a432 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml @@ -24,7 +24,6 @@ spec: iam: legacy: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml index 1f37342bd7..f1aba6f14d 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml @@ -24,7 +24,6 @@ spec: iam: legacy: false kubernetesVersion: v1.4.6 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml index 0bf756f11b..9d3bebe04c 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: legacy: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.logflags.example.com masterPublicName: api.logflags.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml index a3c1926892..b42134ecec 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: legacy: false kubernetesVersion: v1.22.6 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml b/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml index 94d19b0864..050a2add5d 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml @@ -33,7 +33,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml index 7760a8f56e..b55de8a3e5 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml @@ -31,7 +31,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml b/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml index 689bbab3ec..f9cedc943e 100644 --- a/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml @@ -31,7 +31,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.22.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml b/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml index 8c8858b065..2ea2b8691b 100644 --- a/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml @@ -31,7 +31,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.22.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/golden/minimal/cluster.yaml b/nodeup/pkg/model/tests/golden/minimal/cluster.yaml index ea34339c09..7cfc8ddb60 100644 --- a/nodeup/pkg/model/tests/golden/minimal/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/cluster.yaml @@ -31,7 +31,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.23.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml b/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml index ff0dfbc8e2..c2bc08d3ff 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml @@ -31,7 +31,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: https://storage.googleapis.com/kubernetes-release/release/v1.22.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml index 8543db732f..d81ce4314d 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml index 58f59037f3..9e3cc2546e 100644 --- a/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml +++ b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml @@ -26,7 +26,6 @@ spec: AllowExtTrafficLocalEndpoints: "false" podManifestPath: "/etc/kubernetes/manifests" kubernetesVersion: v1.24.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml b/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml index 26893cafd2..db10bc6da6 100644 --- a/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml +++ b/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml @@ -23,7 +23,6 @@ spec: kubelet: podManifestPath: "/etc/kubernetes/manifests" kubernetesVersion: v1.24.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/protokube/cluster.yaml b/nodeup/pkg/model/tests/protokube/cluster.yaml index 34e7330d48..32a121cfa5 100644 --- a/nodeup/pkg/model/tests/protokube/cluster.yaml +++ b/nodeup/pkg/model/tests/protokube/cluster.yaml @@ -27,7 +27,6 @@ spec: kubelet: hostnameOverride: master.hostname.invalid kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml b/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml index 34e7330d48..32a121cfa5 100644 --- a/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml +++ b/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml @@ -27,7 +27,6 @@ spec: kubelet: hostnameOverride: master.hostname.invalid kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml b/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml index 907e0dfc01..b2077366b8 100644 --- a/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml +++ b/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml @@ -27,7 +27,6 @@ spec: kubelet: hostnameOverride: master.hostname.invalid kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go index 2da29b3086..7c9abf8376 100644 --- a/pkg/apis/kops/cluster.go +++ b/pkg/apis/kops/cluster.go @@ -72,8 +72,6 @@ type ClusterSpec struct { Subnets []ClusterSubnetSpec `json:"subnets,omitempty"` // MasterPublicName is the external DNS name for the master nodes MasterPublicName string `json:"masterPublicName,omitempty"` - // MasterInternalName is the internal DNS name for the master nodes - MasterInternalName string `json:"masterInternalName,omitempty"` // NetworkCIDR is the CIDR used for the AWS VPC / DO/ GCE Network, or otherwise allocated to k8s // This is a real CIDR, not the internal k8s network // On AWS, it maps to the VPC CIDR. It is not required on GCE. @@ -98,7 +96,7 @@ type ClusterSpec struct { // DNSZone is the DNS zone we should use when configuring DNS // This is because some clouds let us define a managed zone foo.bar, and then have // kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. - // DNSZone will probably be a suffix of the MasterPublicName and MasterInternalName + // DNSZone will probably be a suffix of the MasterPublicName. // Note that DNSZone can either by the host name of the zone (containing dots), // or can be an identifier for the zone. DNSZone string `json:"dnsZone,omitempty"` @@ -803,10 +801,6 @@ func (c *Cluster) FillDefaults() error { return fmt.Errorf("cluster Name not set in FillDefaults") } - if c.Spec.MasterInternalName == "" { - c.Spec.MasterInternalName = "api.internal." + c.ObjectMeta.Name - } - return nil } @@ -920,6 +914,10 @@ func (c *Cluster) UsesNoneDNS() bool { return false } +func (c *Cluster) APIInternalName() string { + return "api.internal." + c.ObjectMeta.Name +} + func (c *ClusterSpec) IsIPv6Only() bool { return utils.IsIPv6CIDR(c.NonMasqueradeCIDR) } diff --git a/pkg/apis/kops/v1alpha2/cluster.go b/pkg/apis/kops/v1alpha2/cluster.go index 1a6003ec62..3a67ef258a 100644 --- a/pkg/apis/kops/v1alpha2/cluster.go +++ b/pkg/apis/kops/v1alpha2/cluster.go @@ -72,7 +72,8 @@ type ClusterSpec struct { Project string `json:"project,omitempty"` // MasterPublicName is the external DNS name for the master nodes MasterPublicName string `json:"masterPublicName,omitempty"` - // MasterInternalName is the internal DNS name for the master nodes + // MasterInternalName is unused. + // +k8s:conversion-gen=false MasterInternalName string `json:"masterInternalName,omitempty"` // NetworkCIDR is the CIDR used for the AWS VPC / GCE Network, or otherwise allocated to k8s // This is a real CIDR, not the internal k8s network @@ -97,7 +98,7 @@ type ClusterSpec struct { // DNSZone is the DNS zone we should use when configuring DNS // This is because some clouds let us define a managed zone foo.bar, and then have // kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. - // DNSZone will probably be a suffix of the MasterPublicName and MasterInternalName + // DNSZone will probably be a suffix of the MasterPublicName. // Note that DNSZone can either by the host name of the zone (containing dots), // or can be an identifier for the zone. DNSZone string `json:"dnsZone,omitempty"` diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 8f4e2a31b8..d7badbef3a 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -2446,7 +2446,7 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out * } // INFO: in.Project opted out of conversion generation out.MasterPublicName = in.MasterPublicName - out.MasterInternalName = in.MasterInternalName + // INFO: in.MasterInternalName opted out of conversion generation out.NetworkCIDR = in.NetworkCIDR out.AdditionalNetworkCIDRs = in.AdditionalNetworkCIDRs out.NetworkID = in.NetworkID @@ -2870,7 +2870,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec, out.Subnets = nil } out.MasterPublicName = in.MasterPublicName - out.MasterInternalName = in.MasterInternalName out.NetworkCIDR = in.NetworkCIDR out.AdditionalNetworkCIDRs = in.AdditionalNetworkCIDRs out.NetworkID = in.NetworkID diff --git a/pkg/apis/kops/v1alpha3/cluster.go b/pkg/apis/kops/v1alpha3/cluster.go index 5a9c5c6e08..1a8a7fe6a6 100644 --- a/pkg/apis/kops/v1alpha3/cluster.go +++ b/pkg/apis/kops/v1alpha3/cluster.go @@ -68,8 +68,6 @@ type ClusterSpec struct { Subnets []ClusterSubnetSpec `json:"subnets,omitempty"` // MasterPublicName is the external DNS name for the master nodes MasterPublicName string `json:"masterPublicName,omitempty"` - // MasterInternalName is the internal DNS name for the master nodes - MasterInternalName string `json:"masterInternalName,omitempty"` // NetworkCIDR is the CIDR used for the AWS VPC / GCE Network, or otherwise allocated to k8s // This is a real CIDR, not the internal k8s network // On AWS, it maps to the VPC CIDR. It is not required on GCE. @@ -93,7 +91,7 @@ type ClusterSpec struct { // DNSZone is the DNS zone we should use when configuring DNS // This is because some clouds let us define a managed zone foo.bar, and then have // kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. - // DNSZone will probably be a suffix of the MasterPublicName and MasterInternalName + // DNSZone will probably be a suffix of the MasterPublicName. // Note that DNSZone can either by the host name of the zone (containing dots), // or can be an identifier for the zone. DNSZone string `json:"dnsZone,omitempty"` diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index a174907af6..aad7e3c888 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -2555,7 +2555,6 @@ func autoConvert_v1alpha3_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out * out.Subnets = nil } out.MasterPublicName = in.MasterPublicName - out.MasterInternalName = in.MasterInternalName out.NetworkCIDR = in.NetworkCIDR out.AdditionalNetworkCIDRs = in.AdditionalNetworkCIDRs out.NetworkID = in.NetworkID @@ -2978,7 +2977,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha3_ClusterSpec(in *kops.ClusterSpec, out.Subnets = nil } out.MasterPublicName = in.MasterPublicName - out.MasterInternalName = in.MasterInternalName out.NetworkCIDR = in.NetworkCIDR out.AdditionalNetworkCIDRs = in.AdditionalNetworkCIDRs out.NetworkID = in.NetworkID diff --git a/pkg/kubeconfig/create_kubecfg.go b/pkg/kubeconfig/create_kubecfg.go index f076630f30..7047ea8cd8 100644 --- a/pkg/kubeconfig/create_kubecfg.go +++ b/pkg/kubeconfig/create_kubecfg.go @@ -37,10 +37,7 @@ func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.Se var master string if internal { - master = cluster.Spec.MasterInternalName - if master == "" { - master = "api.internal." + clusterName - } + master = cluster.APIInternalName() } else { master = cluster.Spec.MasterPublicName if master == "" { diff --git a/pkg/kubeconfig/create_kubecfg_test.go b/pkg/kubeconfig/create_kubecfg_test.go index d287016434..2bf050c092 100644 --- a/pkg/kubeconfig/create_kubecfg_test.go +++ b/pkg/kubeconfig/create_kubecfg_test.go @@ -17,7 +17,6 @@ limitations under the License. package kubeconfig import ( - "fmt" "testing" "time" @@ -121,7 +120,6 @@ func (f fakeKeyStore) MirrorTo(basedir vfs.Path) error { func buildMinimalCluster(clusterName string, masterPublicName string, lbCert bool, nlb bool) *kops.Cluster { cluster := testutils.BuildMinimalCluster(clusterName) cluster.Spec.MasterPublicName = masterPublicName - cluster.Spec.MasterInternalName = fmt.Sprintf("internal.%v", masterPublicName) cluster.Spec.KubernetesVersion = "1.24.0" cluster.Spec.API = &kops.AccessSpec{ LoadBalancer: &kops.LoadBalancerAccessSpec{}, @@ -324,7 +322,7 @@ func TestBuildKubecfg(t *testing.T) { }, want: &KubeconfigBuilder{ Context: "testcluster", - Server: "https://internal.testcluster.test.com", + Server: "https://api.internal.testcluster", CACerts: []byte(nextCertificate + certData), User: "testcluster", }, diff --git a/pkg/model/awsmodel/dns.go b/pkg/model/awsmodel/dns.go index b7e377d54b..f25d6c2ad1 100644 --- a/pkg/model/awsmodel/dns.go +++ b/pkg/model/awsmodel/dns.go @@ -129,11 +129,11 @@ func (b *DNSModelBuilder) Build(c *fi.ModelBuilderContext) error { return err } - // Using EnsureTask as MasterInternalName and MasterPublicName could be the same + // Using EnsureTask as APIInternalName() and MasterPublicName could be the same { err := c.EnsureTask(&awstasks.DNSName{ - Name: fi.String(b.Cluster.Spec.MasterInternalName), - ResourceName: fi.String(b.Cluster.Spec.MasterInternalName), + Name: fi.String(b.Cluster.APIInternalName()), + ResourceName: fi.String(b.Cluster.APIInternalName()), Lifecycle: b.Lifecycle, Zone: b.LinkToDNSZone(), ResourceType: fi.String("A"), @@ -145,8 +145,8 @@ func (b *DNSModelBuilder) Build(c *fi.ModelBuilderContext) error { } if b.UseIPv6ForAPI() { err := c.EnsureTask(&awstasks.DNSName{ - Name: fi.String(b.Cluster.Spec.MasterInternalName + "-AAAA"), - ResourceName: fi.String(b.Cluster.Spec.MasterInternalName), + Name: fi.String(b.Cluster.APIInternalName() + "-AAAA"), + ResourceName: fi.String(b.Cluster.APIInternalName()), Lifecycle: b.Lifecycle, Zone: b.LinkToDNSZone(), ResourceType: fi.String("AAAA"), diff --git a/pkg/model/components/discovery.go b/pkg/model/components/discovery.go index 1d0a6a2215..1785b6936b 100644 --- a/pkg/model/components/discovery.go +++ b/pkg/model/components/discovery.go @@ -74,7 +74,7 @@ func (b *DiscoveryOptionsBuilder) BuildOptions(o interface{}) error { if supportsPublicJWKS(clusterSpec) && clusterSpec.MasterPublicName != "" { serviceAccountIssuer = "https://" + clusterSpec.MasterPublicName } else { - serviceAccountIssuer = "https://" + clusterSpec.MasterInternalName + serviceAccountIssuer = "https://api.internal." + b.ClusterName } } kubeAPIServer.ServiceAccountIssuer = &serviceAccountIssuer diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index 38586181e2..9266d3cd97 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -294,7 +294,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance dnsInternalSuffix := "" if b.Cluster.IsGossip() { // @TODO: This is hacky, but we want it so that we can have a different internal & external name - dnsInternalSuffix = b.Cluster.Spec.MasterInternalName + dnsInternalSuffix = b.Cluster.APIInternalName() dnsInternalSuffix = strings.TrimPrefix(dnsInternalSuffix, "api.") } @@ -316,7 +316,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance case "cilium": if !featureflag.APIServerNodes.Enabled() { - clientHost = b.Cluster.Spec.MasterInternalName + clientHost = b.Cluster.APIInternalName() } default: return nil, fmt.Errorf("unknown etcd cluster key %q", etcdCluster.Name) diff --git a/pkg/model/components/etcdmanager/tests/interval/cluster.yaml b/pkg/model/components/etcdmanager/tests/interval/cluster.yaml index 4c38ebe91d..f8617d13d6 100644 --- a/pkg/model/components/etcdmanager/tests/interval/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/interval/cluster.yaml @@ -34,7 +34,6 @@ spec: backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml index 0f581b8ed4..10d4c92514 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml @@ -29,7 +29,6 @@ spec: backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml index 8d944c38ce..80b07f0425 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml @@ -39,7 +39,6 @@ spec: backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml b/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml index aa9eb13d99..c89515b9f5 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml @@ -33,7 +33,6 @@ spec: backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml b/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml index dd84042b19..66f2cf081b 100644 --- a/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml +++ b/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml @@ -10,7 +10,6 @@ spec: cloudProvider: aws configBase: memfs://clusters.example.com/minimal.example.com kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/pkg/testutils/cluster.go b/pkg/testutils/cluster.go index 351ae0552a..263be64aa0 100644 --- a/pkg/testutils/cluster.go +++ b/pkg/testutils/cluster.go @@ -37,7 +37,6 @@ func BuildMinimalCluster(clusterName string) *kops.Cluster { c.Spec.Containerd = &kops.ContainerdConfig{} c.Spec.MasterPublicName = fmt.Sprintf("api.%v", clusterName) - c.Spec.MasterInternalName = fmt.Sprintf("internal.api.%v", clusterName) c.Spec.KubernetesAPIAccess = []string{"0.0.0.0/0"} c.Spec.SSHAccess = []string{"0.0.0.0/0"} diff --git a/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl b/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl index af55ccbcdb..e50807357a 100644 --- a/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl +++ b/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl @@ -30,7 +30,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: {{.kubernetesVersion}} - masterInternalName: api.internal.{{.clusterName}} masterPublicName: api.{{.clusterName}} networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/e2e/templates/apiserver-dns-none.yaml.tmpl b/tests/e2e/templates/apiserver-dns-none.yaml.tmpl index 290e110699..3f89ca89c0 100644 --- a/tests/e2e/templates/apiserver-dns-none.yaml.tmpl +++ b/tests/e2e/templates/apiserver-dns-none.yaml.tmpl @@ -26,7 +26,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: {{.kubernetesVersion}} - masterInternalName: api.internal.{{.clusterName}} networkCIDR: 172.20.0.0/16 networking: calico: {} diff --git a/tests/e2e/templates/apiserver.yaml.tmpl b/tests/e2e/templates/apiserver.yaml.tmpl index 9d53ba88ae..ccaf4778c4 100644 --- a/tests/e2e/templates/apiserver.yaml.tmpl +++ b/tests/e2e/templates/apiserver.yaml.tmpl @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: {{.kubernetesVersion}} - masterInternalName: api.internal.{{.clusterName}} masterPublicName: api.{{.clusterName}} networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/e2e/templates/many-addons.yaml.tmpl b/tests/e2e/templates/many-addons.yaml.tmpl index 5415084ce9..3137774d7a 100644 --- a/tests/e2e/templates/many-addons.yaml.tmpl +++ b/tests/e2e/templates/many-addons.yaml.tmpl @@ -35,7 +35,6 @@ spec: provider: CoreDNS nodeLocalDNS: enabled: true - masterInternalName: api.internal.{{.clusterName}} masterPublicName: api.{{.clusterName}} metricsServer: enabled: true diff --git a/tests/e2e/templates/simple.yaml.tmpl b/tests/e2e/templates/simple.yaml.tmpl index cfe957efa6..4708d0908c 100644 --- a/tests/e2e/templates/simple.yaml.tmpl +++ b/tests/e2e/templates/simple.yaml.tmpl @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: {{.kubernetesVersion}} - masterInternalName: api.internal.{{.clusterName}} masterPublicName: api.{{.clusterName}} networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/e2e/templates/staticcpumanagerpolicy.tmpl b/tests/e2e/templates/staticcpumanagerpolicy.tmpl index 218945e183..99371582bd 100644 --- a/tests/e2e/templates/staticcpumanagerpolicy.tmpl +++ b/tests/e2e/templates/staticcpumanagerpolicy.tmpl @@ -32,7 +32,6 @@ spec: ephemeral-storage: 1Gi memory: 120Mi kubernetesVersion: {{.kubernetesVersion}} - masterInternalName: api.internal.{{.clusterName}} masterPublicName: api.{{.clusterName}} networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/aws/v1alpha2.yaml b/tests/integration/conversion/aws/v1alpha2.yaml index 94b71a916e..7fb0392eff 100644 --- a/tests/integration/conversion/aws/v1alpha2.yaml +++ b/tests/integration/conversion/aws/v1alpha2.yaml @@ -42,7 +42,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/aws/v1alpha3.yaml b/tests/integration/conversion/aws/v1alpha3.yaml index bf6f08a183..c4012df076 100644 --- a/tests/integration/conversion/aws/v1alpha3.yaml +++ b/tests/integration/conversion/aws/v1alpha3.yaml @@ -41,7 +41,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/azure/v1alpha2.yaml b/tests/integration/conversion/azure/v1alpha2.yaml index ffc1558c2e..be92c5643f 100644 --- a/tests/integration/conversion/azure/v1alpha2.yaml +++ b/tests/integration/conversion/azure/v1alpha2.yaml @@ -39,7 +39,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/azure/v1alpha3.yaml b/tests/integration/conversion/azure/v1alpha3.yaml index 20404aba1d..88924167a7 100644 --- a/tests/integration/conversion/azure/v1alpha3.yaml +++ b/tests/integration/conversion/azure/v1alpha3.yaml @@ -37,7 +37,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/canal/v1alpha2.yaml b/tests/integration/conversion/canal/v1alpha2.yaml index 8ca4e65335..50ef76ad60 100644 --- a/tests/integration/conversion/canal/v1alpha2.yaml +++ b/tests/integration/conversion/canal/v1alpha2.yaml @@ -33,7 +33,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/canal/v1alpha3.yaml b/tests/integration/conversion/canal/v1alpha3.yaml index 2de1ab04a7..867d0d2b9e 100644 --- a/tests/integration/conversion/canal/v1alpha3.yaml +++ b/tests/integration/conversion/canal/v1alpha3.yaml @@ -33,7 +33,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/cilium/v1alpha2.yaml b/tests/integration/conversion/cilium/v1alpha2.yaml index 5648f9b11b..93e0038b77 100644 --- a/tests/integration/conversion/cilium/v1alpha2.yaml +++ b/tests/integration/conversion/cilium/v1alpha2.yaml @@ -33,7 +33,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/cilium/v1alpha3.yaml b/tests/integration/conversion/cilium/v1alpha3.yaml index dde9960137..a932054cdc 100644 --- a/tests/integration/conversion/cilium/v1alpha3.yaml +++ b/tests/integration/conversion/cilium/v1alpha3.yaml @@ -33,7 +33,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/do/v1alpha2.yaml b/tests/integration/conversion/do/v1alpha2.yaml index 970c6c4131..e4c89edb0d 100644 --- a/tests/integration/conversion/do/v1alpha2.yaml +++ b/tests/integration/conversion/do/v1alpha2.yaml @@ -32,7 +32,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/do/v1alpha3.yaml b/tests/integration/conversion/do/v1alpha3.yaml index b56832ddac..4d4f88c729 100644 --- a/tests/integration/conversion/do/v1alpha3.yaml +++ b/tests/integration/conversion/do/v1alpha3.yaml @@ -31,7 +31,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/gce/v1alpha2.yaml b/tests/integration/conversion/gce/v1alpha2.yaml index 44806b86e0..19ad5fcc11 100644 --- a/tests/integration/conversion/gce/v1alpha2.yaml +++ b/tests/integration/conversion/gce/v1alpha2.yaml @@ -32,7 +32,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/gce/v1alpha3.yaml b/tests/integration/conversion/gce/v1alpha3.yaml index 60635ec131..bb805c51e5 100644 --- a/tests/integration/conversion/gce/v1alpha3.yaml +++ b/tests/integration/conversion/gce/v1alpha3.yaml @@ -32,7 +32,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/minimal/legacy-v1alpha2.yaml b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml index 35ea048f56..b215ad44f2 100644 --- a/tests/integration/conversion/minimal/legacy-v1alpha2.yaml +++ b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml @@ -33,7 +33,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/minimal/v1alpha2.yaml b/tests/integration/conversion/minimal/v1alpha2.yaml index e61e5b8ac9..34b4f298dc 100644 --- a/tests/integration/conversion/minimal/v1alpha2.yaml +++ b/tests/integration/conversion/minimal/v1alpha2.yaml @@ -33,7 +33,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/minimal/v1alpha3.yaml b/tests/integration/conversion/minimal/v1alpha3.yaml index 1283ac5310..70226e51e2 100644 --- a/tests/integration/conversion/minimal/v1alpha3.yaml +++ b/tests/integration/conversion/minimal/v1alpha3.yaml @@ -33,7 +33,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/openstack/v1alpha2.yaml b/tests/integration/conversion/openstack/v1alpha2.yaml index 583f227228..ef362cdd17 100644 --- a/tests/integration/conversion/openstack/v1alpha2.yaml +++ b/tests/integration/conversion/openstack/v1alpha2.yaml @@ -48,7 +48,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/conversion/openstack/v1alpha3.yaml b/tests/integration/conversion/openstack/v1alpha3.yaml index 872c819f0e..472c3a8eb8 100644 --- a/tests/integration/conversion/openstack/v1alpha3.yaml +++ b/tests/integration/conversion/openstack/v1alpha3.yaml @@ -46,7 +46,6 @@ spec: kubernetesAPIAccess: - 0.0.0.0/0 kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml b/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml index cf85f3f82b..7a6b231104 100644 --- a/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml @@ -27,7 +27,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml index bcb75937f6..e942243457 100644 --- a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml @@ -51,7 +51,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.24.0 - masterInternalName: api.internal.complex.example.com masterPublicName: api.complex.example.com networkCIDR: 172.20.0.0/16 additionalNetworkCIDRs: diff --git a/tests/integration/update_cluster/complex/in-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-v1alpha2.yaml index 6a46d4b91a..b8c61a4af8 100644 --- a/tests/integration/update_cluster/complex/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-v1alpha2.yaml @@ -51,7 +51,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.24.0 - masterInternalName: api.internal.complex.example.com masterPublicName: api.complex.example.com networkCIDR: 172.20.0.0/16 additionalNetworkCIDRs: diff --git a/tests/integration/update_cluster/compress/in-v1alpha2.yaml b/tests/integration/update_cluster/compress/in-v1alpha2.yaml index 242dc105fa..7960372289 100644 --- a/tests/integration/update_cluster/compress/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/compress/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.compress.example.com masterPublicName: api.compress.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml b/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml index 803c4130af..bb7bb21bd5 100644 --- a/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml @@ -32,7 +32,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.containerd.example.com masterPublicName: api.containerd.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/containerd/in-v1alpha2.yaml b/tests/integration/update_cluster/containerd/in-v1alpha2.yaml index 4c4e1b4fd9..ceaa36fe47 100644 --- a/tests/integration/update_cluster/containerd/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/containerd/in-v1alpha2.yaml @@ -23,7 +23,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.containerd.example.com masterPublicName: api.containerd.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/digit/in-v1alpha2.yaml b/tests/integration/update_cluster/digit/in-v1alpha2.yaml index 212987f9c6..3d51c3ecda 100644 --- a/tests/integration/update_cluster/digit/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/digit/in-v1alpha2.yaml @@ -44,7 +44,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.123.example.com masterPublicName: api.123.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml b/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml index 6e95229472..f90d56fa7e 100644 --- a/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml @@ -29,7 +29,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.docker.example.com masterPublicName: api.docker.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml index 93a0bf3a77..e1ea41d315 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml b/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml index 93274102ef..4005f61e9a 100644 --- a/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml @@ -33,7 +33,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.existingsg.example.com masterPublicName: api.existingsg.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml b/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml index b21d71e0a4..4181dfc7f9 100644 --- a/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml @@ -24,7 +24,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml index 3521625fa1..6c4512478c 100644 --- a/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml @@ -25,7 +25,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/externallb/in-v1alpha2.yaml b/tests/integration/update_cluster/externallb/in-v1alpha2.yaml index bf81a04b34..06c096d78a 100644 --- a/tests/integration/update_cluster/externallb/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/externallb/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.externallb.example.com masterPublicName: api.externallb.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml b/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml index aefaca60ae..99b3df55f5 100644 --- a/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.externalpolicies.example.com masterPublicName: api.externalpolicies.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/irsa/in-v1alpha2.yaml index 3e3ae16847..7dfbe894dd 100644 --- a/tests/integration/update_cluster/irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/irsa/in-v1alpha2.yaml @@ -51,7 +51,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml b/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml index ad7982e77e..a5219c3276 100644 --- a/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml @@ -25,7 +25,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.25.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml b/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml index eddc09d357..c9a357730b 100644 --- a/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.lifecyclephases.example.com masterPublicName: api.lifecyclephases.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml index b3bdda0a18..233cbaa637 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml index 9bab7e1386..0b85db9d86 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.23.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml index 2c8cc45399..008f14ad44 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.24.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml index 8ef1178654..acde3b1ab5 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.25.0-rc.1 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml index a714cacbb4..61134a20ee 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.26.0-alpha.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml index 4234ee9f11..e6c7d55891 100644 --- a/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml @@ -33,7 +33,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml index 51fcdca875..1b662a897b 100644 --- a/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml @@ -33,7 +33,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml index f40ff657be..a3bdaf4e9f 100644 --- a/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal-etcd.example.com masterPublicName: api.minimal-etcd.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml index 1dcff0f2c7..fef7af3929 100644 --- a/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml @@ -28,7 +28,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml index fd556e18db..a9f40fcd1b 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml @@ -33,7 +33,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.25.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterPublicName: api.minimal-ipv6.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml index 2971d32f84..196c36682b 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterPublicName: api.minimal-ipv6.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-ipv6-private/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6-private/in-v1alpha2.yaml index 3c607fe6be..9a9fcfc768 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-private/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.23.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterPublicName: api.minimal-ipv6.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml index 7a28a735b6..b670c9639c 100644 --- a/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml @@ -34,7 +34,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterPublicName: api.minimal-ipv6.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml index 557113e290..2546e2ad07 100644 --- a/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml @@ -19,7 +19,6 @@ spec: name: us-test-1a name: events kubernetesVersion: v1.21.0 - masterInternalName: api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com masterPublicName: api.this.is.truly.a.really.really.long.cluster-name.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml index 21404927c6..970633e817 100644 --- a/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml @@ -25,7 +25,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal-warmpool.example.com masterPublicName: api.minimal-warmpool.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml index 47daf1384a..bb6222758e 100644 --- a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml @@ -19,7 +19,6 @@ spec: name: us-test-1a name: events kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml index 694524ea99..5215cc539e 100644 --- a/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.k8s.local masterPublicName: api.minimal.k8s.local networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml index a2fb0ed0e6..ac1deef728 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml @@ -23,7 +23,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.k8s.local masterPublicName: api.minimal.k8s.local networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml b/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml index f36a70b338..3ca454244c 100644 --- a/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml @@ -30,7 +30,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.mixedinstances.example.com masterPublicName: api.mixedinstances.example.com networkCIDR: 10.0.0.0/16 networking: diff --git a/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml b/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml index e45c19dedf..f93b8fc9fb 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml @@ -30,7 +30,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.mixedinstances.example.com masterPublicName: api.mixedinstances.example.com networkCIDR: 10.0.0.0/16 networking: diff --git a/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml b/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml index 5311faf42b..6ca36e437e 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.nthsqsresources.longclustername.example.com masterPublicName: api.nthsqsresources.longclustername.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml b/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml index 708a887742..f21a43d327 100644 --- a/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml @@ -26,7 +26,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml b/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml index 101dbef6fa..5b0268edfb 100644 --- a/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.private-shared-ip.example.com masterPublicName: api.private-shared-ip.example.com networkCIDR: 172.20.0.0/16 networkID: vpc-12345678 diff --git a/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml b/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml index 758ee1e6d2..1a9283a183 100644 --- a/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.private-shared-subnet.example.com masterPublicName: api.private-shared-subnet.example.com networkCIDR: 172.20.0.0/16 networkID: vpc-12345678 diff --git a/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml index 174f389a8f..8b970519ae 100644 --- a/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml @@ -29,7 +29,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.25.0 - masterInternalName: api.internal.privatecalico.example.com masterPublicName: api.privatecalico.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml index 0399fe64f5..54c3f34732 100644 --- a/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.25.0 - masterInternalName: api.internal.privatecanal.example.com masterPublicName: api.privatecanal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml index 39340a11ea..5f4408daa8 100644 --- a/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.privatecilium.example.com masterPublicName: api.privatecilium.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml index 0d9c1f6299..250a68a44a 100644 --- a/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml @@ -24,7 +24,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.24.0 - masterInternalName: api.internal.privatecilium.example.com masterPublicName: api.privatecilium.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml b/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml index 3af5dc3d91..80227961a3 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml @@ -28,7 +28,6 @@ spec: kubeProxy: enabled: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.privateciliumadvanced.example.com masterPublicName: api.privateciliumadvanced.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml index a9634fe964..818027be9c 100644 --- a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml @@ -26,7 +26,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.privatedns1.example.com masterPublicName: api.privatedns1.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml b/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml index f8a47d2db3..e5cc31d86f 100644 --- a/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml @@ -23,7 +23,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.privatedns2.example.com masterPublicName: api.privatedns2.example.com networkCIDR: 172.20.0.0/16 networkID: vpc-12345678 diff --git a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml index 88c5852449..7157a54b24 100644 --- a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.25.0 - masterInternalName: api.internal.privateflannel.example.com masterPublicName: api.privateflannel.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml b/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml index 06c995aae4..85c634ee2d 100644 --- a/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.privatekopeio.example.com masterPublicName: api.privatekopeio.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml b/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml index 5e56a310c0..6f368de2fc 100644 --- a/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.privateweave.example.com masterPublicName: api.privateweave.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml b/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml index c1e38f235b..5b6965626a 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml @@ -26,7 +26,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.24.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml b/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml index 50e668d4d8..6358513628 100644 --- a/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.sharedsubnet.example.com masterPublicName: api.sharedsubnet.example.com networkCIDR: 172.20.0.0/16 networkID: vpc-12345678 diff --git a/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml b/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml index 815022836d..2e1ef14082 100644 --- a/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.sharedvpc.example.com masterPublicName: api.sharedvpc.example.com networkCIDR: 172.20.0.0/16 networkID: vpc-12345678 diff --git a/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml b/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml index a0c28f0f1f..07d2a6d7a8 100644 --- a/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.unmanaged.example.com masterPublicName: api.unmanaged.example.com networkID: vpc-12345678 networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml b/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml index 01ff6a83f6..625daee5c3 100644 --- a/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml @@ -22,7 +22,6 @@ spec: kubelet: anonymousAuth: false kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template b/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template index a55ecfbe52..51233419e3 100644 --- a/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template +++ b/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template @@ -914,7 +914,7 @@ spec: - name: CLUSTER_NAME value: {{ ClusterName }} - name: CLUSTER_ENDPOINT - value: https://{{ .MasterInternalName }} + value: https://{{ APIInternalName }} - name: CONFIG_LOGGING_NAME value: "karpenter-config-logging" - name: KARPENTER_SERVICE @@ -1022,7 +1022,7 @@ spec: - name: KUBERNETES_MIN_VERSION value: "1.19.0-0" - name: CLUSTER_ENDPOINT - value: https://{{ .MasterInternalName }} + value: https://{{ APIInternalName }} - name: CONFIG_LOGGING_NAME value: "karpenter-config-logging" - name: KARPENTER_SERVICE diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.11.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.11.yaml.template index dd2b115b8d..5af00f6a28 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.11.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.11.yaml.template @@ -46,7 +46,7 @@ data: etcd-config: |- --- endpoints: - - https://{{ $.MasterInternalName }}:4003 + - https://{{ APIInternalName }}:4003 trusted-ca-file: '/var/lib/etcd-secrets/etcd-ca.crt' key-file: '/var/lib/etcd-secrets/etcd-client-cilium.key' @@ -681,7 +681,7 @@ spec: name: cilium-config optional: true - name: KUBERNETES_SERVICE_HOST - value: "{{ $.MasterInternalName }}" + value: "{{ APIInternalName }}" - name: KUBERNETES_SERVICE_PORT value: "443" {{ with .EnablePolicy }} @@ -947,7 +947,7 @@ spec: name: cilium-config optional: true - name: KUBERNETES_SERVICE_HOST - value: "{{ $.MasterInternalName }}" + value: "{{ APIInternalName }}" - name: KUBERNETES_SERVICE_PORT value: "443" image: "quay.io/cilium/operator:{{ .Version }}" diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template index 95153e2db3..798f0ce89b 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template @@ -10,7 +10,7 @@ metadata: name: kubernetes-services-endpoint namespace: kube-system data: - KUBERNETES_SERVICE_HOST: "{{ .MasterInternalName }}" + KUBERNETES_SERVICE_HOST: "{{ APIInternalName }}" KUBERNETES_SERVICE_PORT: "443" {{- end }} diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.22.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.22.yaml.template index b2c8f51238..fbf16f9dc0 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.22.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.22.yaml.template @@ -10,7 +10,7 @@ metadata: name: kubernetes-services-endpoint namespace: kube-system data: - KUBERNETES_SERVICE_HOST: "{{ .MasterInternalName }}" + KUBERNETES_SERVICE_HOST: "{{ APIInternalName }}" KUBERNETES_SERVICE_PORT: "443" {{- end }} diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template index 4b4bf32c9e..00e7c4a581 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template @@ -9,7 +9,7 @@ metadata: name: kubernetes-services-endpoint namespace: kube-system data: - KUBERNETES_SERVICE_HOST: "{{ .MasterInternalName }}" + KUBERNETES_SERVICE_HOST: "{{ APIInternalName }}" KUBERNETES_SERVICE_PORT: "443" {{- end }} --- diff --git a/upup/pkg/fi/cloudup/dns.go b/upup/pkg/fi/cloudup/dns.go index 356ebd1df2..419a839a51 100644 --- a/upup/pkg/fi/cloudup/dns.go +++ b/upup/pkg/fi/cloudup/dns.go @@ -265,9 +265,9 @@ func buildPrecreateDNSHostnames(cluster *kops.Cluster) []recordKey { } } - if cluster.Spec.MasterInternalName != "" && !useLBForInternalAPI { + if !useLBForInternalAPI { recordKeys = append(recordKeys, recordKey{ - hostname: cluster.Spec.MasterInternalName, + hostname: cluster.APIInternalName(), rrsType: internalType, }) } diff --git a/upup/pkg/fi/cloudup/dns_test.go b/upup/pkg/fi/cloudup/dns_test.go index 6a6ce1d325..b8ae2ee6a1 100644 --- a/upup/pkg/fi/cloudup/dns_test.go +++ b/upup/pkg/fi/cloudup/dns_test.go @@ -125,7 +125,6 @@ func TestPrecreateDNSNames(t *testing.T) { cluster.ObjectMeta.Name = "cluster1.example.com" cluster.Spec.MasterPublicName = "api." + cluster.ObjectMeta.Name - cluster.Spec.MasterInternalName = "api.internal." + cluster.ObjectMeta.Name cluster.Spec.EtcdClusters = []kops.EtcdClusterSpec{ { Name: "main", diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index ca48d1e7ea..fe8c77f562 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -116,6 +116,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS dest["HasHighlyAvailableControlPlane"] = tf.HasHighlyAvailableControlPlane dest["ControlPlaneControllerReplicas"] = tf.ControlPlaneControllerReplicas dest["APIServerNodeRole"] = tf.APIServerNodeRole + dest["APIInternalName"] = tf.Cluster.APIInternalName dest["CloudTags"] = tf.CloudTagsForInstanceGroup dest["KubeDNS"] = func() *kops.KubeDNSConfig { diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml index e9302d4fe4..eacc9703e8 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml @@ -23,7 +23,6 @@ spec: name: events iam: {} kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml index 63736355c0..1af89eb9a4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml @@ -22,7 +22,6 @@ spec: name: events iam: {} kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml index a9d68b98de..2c49cae50d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml @@ -27,7 +27,6 @@ spec: cloudProvider: aws iam: {} kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml index 2a8927a644..7b687cd855 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml @@ -26,7 +26,6 @@ spec: name: events iam: {} kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml index c04893457e..b75a1eab02 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml @@ -30,7 +30,6 @@ spec: name: events iam: {} kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml index 448899365b..263ad97081 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml @@ -24,7 +24,6 @@ spec: name: events iam: {} kubernetesVersion: 1.22.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml index 5fe7b8c2d7..e7fab25828 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml @@ -46,7 +46,6 @@ spec: - kube-dns topologyKey: kubernetes.io/hostname weight: 100 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml index 4272c75bd4..d708cc340f 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml @@ -24,7 +24,6 @@ spec: name: events iam: {} kubernetesVersion: 1.22.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com metricsServer: enabled: true diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml index 47fbef5416..837dbfdf61 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml @@ -26,7 +26,6 @@ spec: name: events iam: {} kubernetesVersion: 1.22.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com metricsServer: enabled: true diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml index f1b64f95d0..df925d9f99 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml @@ -23,7 +23,6 @@ spec: iam: useServiceAccountExternalPermissions: true kubernetesVersion: v1.22.6 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml index 72cdd29333..a62dd5e5b7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml @@ -22,7 +22,6 @@ spec: name: events iam: {} kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: - proxy.api.minimal.example.com diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml index 693a214d66..8f23030774 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml @@ -20,7 +20,6 @@ spec: name: events iam: {} kubernetesVersion: v1.21.0 - masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: From 294c0a3a0400ae6855458ae41d2e3719d9efbd00 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Mon, 7 Nov 2022 17:40:37 -0800 Subject: [PATCH 2/2] hack/update-expected.sh --- .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../complex/data/aws_s3_object_cluster-completed.spec_content | 1 - .../compress/data/aws_s3_object_cluster-completed.spec_content | 1 - .../digit/data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../externallb/data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../ha/data/aws_s3_object_cluster-completed.spec_content | 1 - .../ha_gce/data/aws_s3_object_cluster-completed.spec_content | 1 - .../irsa/data/aws_s3_object_cluster-completed.spec_content | 1 - .../karpenter/data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../minimal/data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../nvidia/data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../data/aws_s3_object_cluster-completed.spec_content | 1 - .../shared_vpc/data/aws_s3_object_cluster-completed.spec_content | 1 - .../unmanaged/data/aws_s3_object_cluster-completed.spec_content | 1 - .../vfs-said/data/aws_s3_object_cluster-completed.spec_content | 1 - 66 files changed, 66 deletions(-) diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index 0e8e90f7bd..713311d0f7 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.23.0 - masterInternalName: api.internal.additionalobjects.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index 3661580b4f..dcd11893e2 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -156,7 +156,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.22.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content index d9d3cd47e0..17e34df056 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content @@ -147,7 +147,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content index e813e84cbf..0149ca6deb 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content @@ -144,7 +144,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.bastionuserdata.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content index 3d042b255f..29ef1e88b9 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -195,7 +195,6 @@ spec: - 1.1.1.0/24 - pl-44444444 kubernetesVersion: 1.24.0 - masterInternalName: api.internal.complex.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content index 679e5fc838..2ea5870330 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.compress.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index eaeb55a930..b34afafab7 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -164,7 +164,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.123.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content index 96a4213e30..6989791b44 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content @@ -150,7 +150,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.existing-iam.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content index f6a2e653a7..fbb029e3bf 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content @@ -153,7 +153,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.existingsg.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content index d08f0406b3..a8d8ff6580 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content index cbc2993e60..c04cc9b8c6 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -143,7 +143,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content index 80a36d3dd2..bf5b5e0feb 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.externallb.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content index e0bbc34965..ceae412d40 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content @@ -159,7 +159,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.externalpolicies.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content index 8ab8c8ee69..17908d12ea 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content @@ -150,7 +150,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.ha.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content index f1347feeea..bce74e7907 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content @@ -154,7 +154,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.ha-gce.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index 890cd1894f..5a5a3477ac 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -171,7 +171,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content index 53e3abc3f3..606a97dd6f 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.25.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index 1192b43f55..e910741430 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -182,7 +182,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content index ea37c01c8c..95ad134e09 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content @@ -185,7 +185,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.23.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index b99dc9691c..6becec04c6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -185,7 +185,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.24.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index 646c12404e..f29bd60770 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -184,7 +184,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.25.0-rc.1 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 83c925bbab..a9865919d7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -184,7 +184,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.26.0-alpha.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index 04a8ec3583..53934b3ead 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -181,7 +181,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index 3dc36cadd8..c06d3d9a4c 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content index 9ffb135532..d65cf54fe6 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.23.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index 4799f7bf0d..a6eb75c03b 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.24.3 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index 7c0eb471b8..6c21925a91 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -173,7 +173,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.25.0-rc.1 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index 91c8852b58..b993486dcc 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -173,7 +173,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.26.0-alpha.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index 3b0e8175cc..960b1e3adc 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -172,7 +172,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.26.0-alpha.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content index 3a50c0c639..57e86948a1 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content @@ -148,7 +148,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content index d65ac7e1af..e79453d2c2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content @@ -175,7 +175,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.25.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content index ed566051e9..4d2c6927b9 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content @@ -172,7 +172,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content index b82563649e..56da9e97ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content @@ -175,7 +175,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.23.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content index 9d691e31c0..c7f6d4f0df 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -172,7 +172,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal-ipv6.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content index 8ebcb830a2..8b1b51027e 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -139,7 +139,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com masterKubelet: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content index 8291760d2c..2a6ee9ae97 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content @@ -155,7 +155,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal-warmpool.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content index c7acd89982..f6ba2d8433 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content @@ -139,7 +139,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content index 1bc259c1cf..88897a1f0e 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content @@ -149,7 +149,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.23.0 - masterInternalName: api.internal.minimal-gce.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content index c4199d1ead..2918440999 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content @@ -149,7 +149,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal-gce-ilb.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content index 5412ad5698..e700c2cd2e 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -153,7 +153,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.23.0 - masterInternalName: api.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content index b8bb066129..eeb5dd90db 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -149,7 +149,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.23.0 - masterInternalName: api.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content index 56451f55aa..e66ca94150 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content @@ -145,7 +145,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal-gce-private.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content index 074436d243..48134f86fe 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content @@ -141,7 +141,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.k8s.local masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content index 161d153d2e..afba8a5ecf 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.k8s.local masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content index e352de5802..9f5fd519b4 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content @@ -155,7 +155,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.25.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content index dddf4ca550..04515033e3 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content @@ -150,7 +150,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.mixedinstances.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content index dddf4ca550..04515033e3 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content @@ -150,7 +150,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.mixedinstances.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content index f71b83dbf0..900f120ca0 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.nthsqsresources.longclustername.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index dd83ae3288..57525f9c95 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -145,7 +145,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content index 3d9eb2e353..7058f02c07 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content @@ -144,7 +144,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.private-shared-ip.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content index 32110e5861..cb3735b658 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content @@ -144,7 +144,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.private-shared-subnet.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content index e1a17a6486..64c7dad050 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content @@ -169,7 +169,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: 1.25.0 - masterInternalName: api.internal.privatecalico.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content index 683db473a4..0a169a6311 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.25.0 - masterInternalName: api.internal.privatecanal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content index 8d816a6f40..aa3fbc0c66 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content @@ -144,7 +144,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.privatecilium.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content index 31551a1b75..f5b5d02190 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -170,7 +170,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.24.0 - masterInternalName: api.internal.privatecilium.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content index 874d590b0b..52322c9892 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content @@ -152,7 +152,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.privateciliumadvanced.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 5fcef84f60..6aa26ed4f3 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -147,7 +147,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.privatedns1.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content index bffb55db8e..66f7900d6a 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content @@ -144,7 +144,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.privatedns2.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index 1046b5fb23..24f70f4e94 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.25.0 - masterInternalName: api.internal.privateflannel.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content index e8abc870fc..67e34c18a6 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content @@ -143,7 +143,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.privatekopeio.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content index cbe1268b7a..bf5bd825fe 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content @@ -144,7 +144,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.privateweave.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content index aa0853aeb1..0aca166f0a 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.24.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content index 43827f88f7..221f75953d 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.sharedsubnet.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content index de7942a0b1..92172e7fa1 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.sharedvpc.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content index 28cc5cd16c..28ca340b30 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content @@ -144,7 +144,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.unmanaged.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content index eee49dded7..70bb94cddc 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 kubernetesVersion: 1.21.0 - masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false cgroupDriver: systemd