Automated cherry pick of #14880: Use short service name with discovery labels

cmd/kops-controller/controllers/hosts_controller.go

@@ -31,6 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/klog/v2"
+	"k8s.io/kops/cmd/kops-controller/pkg/config"
 	"k8s.io/kops/pkg/apis/kops"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -40,6 +41,9 @@ import (
 // HostsReconciler populates an /etc/hosts style file in the CoreDNS config map,
 // supporting in-pod resolution of our k8s.local entries.
 type HostsReconciler struct {
+	// clusterName identifies the kOps cluster
+	clusterName string
+
 	// configMapID identifies the configmap we should update
 	configMapID types.NamespacedName
 
@@ -57,8 +61,9 @@ type HostsReconciler struct {
 }
 
 // NewHostsReconciler is the constructor for a HostsReconciler
-func NewHostsReconciler(mgr manager.Manager, configMapID types.NamespacedName) (*HostsReconciler, error) {
+func NewHostsReconciler(mgr manager.Manager, opt *config.Options, configMapID types.NamespacedName) (*HostsReconciler, error) {
 	r := &HostsReconciler{
+		clusterName: opt.ClusterName,
 		client:      mgr.GetClient(),
 		log:         ctrl.Log.WithName("controllers").WithName("Hosts"),
 		configMapID: configMapID,
@@ -102,10 +107,17 @@ func (r *HostsReconciler) updateHosts(ctx context.Context, endpointsList *corev1
 		endpoints := &endpointsList.Items[i]
 
 		hostname := endpoints.Labels[kops.DiscoveryLabelKey]
+		hostname = strings.TrimSuffix(hostname, ".")
 		if hostname == "" {
 			klog.Warningf("endpoints %s/%s found without discovery label %q; filtering is not working correctly", endpoints.Name, endpoints.Namespace, kops.DiscoveryLabelKey)
 			continue
 		}
+		suffix := ".internal." + r.clusterName
+		if !strings.HasSuffix(hostname, suffix) {
+			hostname = hostname + suffix
+		} else {
+			klog.Warningf("endpoints %s/%s found with full internal name for discovery label %q; use short name %q instead", endpoints.Name, endpoints.Namespace, kops.DiscoveryLabelKey, strings.TrimSuffix(hostname, suffix))
+		}
 
 		for j := range endpoints.Subsets {
 			subset := &endpoints.Subsets[j]

cmd/kops-controller/main.go

@@ -278,7 +278,7 @@ func addGossipController(mgr manager.Manager, opt *config.Options) error {
 		Name:      "coredns",
 	}
 
-	controller, err := controllers.NewHostsReconciler(mgr, configMapID)
+	controller, err := controllers.NewHostsReconciler(mgr, opt, configMapID)
 	if err != nil {
 		return err
 	}

cmd/kops-controller/pkg/config/options.go

@@ -23,6 +23,7 @@ import (
 )
 
 type Options struct {
+	ClusterName           string         `json:"clusterName,omitempty"`
 	Cloud                 string         `json:"cloud,omitempty"`
 	ConfigBase            string         `json:"configBase,omitempty"`
 	SecretStore           string         `json:"secretStore,omitempty"`

pkg/model/components/etcdmanager/model.go

@@ -262,7 +262,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
 	var clientHost string
 
 	if featureflag.APIServerNodes.Enabled() {
-		clientHost = etcdCluster.Name + ".etcd." + b.ClusterName()
+		clientHost = etcdCluster.Name + ".etcd.internal." + b.ClusterName()
 	} else {
 		clientHost = "__name__"
 	}

pkg/model/components/kopscontroller/template_functions.go

@@ -49,8 +49,6 @@ func (t *templateFunctions) GossipServices() ([]*corev1.Service, error) {
 		return nil, nil
 	}
 
-	suffix := t.Cluster.Name
-
 	var services []*corev1.Service
 
 	// api service
@@ -63,7 +61,7 @@ func (t *templateFunctions) GossipServices() ([]*corev1.Service, error) {
 			"k8s-app": "kops-controller",
 		}
 		service.Labels = map[string]string{
-			kops.DiscoveryLabelKey: "api.internal." + suffix,
+			kops.DiscoveryLabelKey: "api",
 		}
 		services = append(services, service)
 	}
@@ -78,7 +76,7 @@ func (t *templateFunctions) GossipServices() ([]*corev1.Service, error) {
 			"k8s-app": "kops-controller",
 		}
 		service.Labels = map[string]string{
-			kops.DiscoveryLabelKey: "kops-controller.internal." + suffix,
+			kops.DiscoveryLabelKey: "kops-controller",
 		}
 		services = append(services, service)
 	}
@@ -96,7 +94,7 @@ func (t *templateFunctions) GossipServices() ([]*corev1.Service, error) {
 				{Name: "https", Port: int32(ports.ClientPort), Protocol: corev1.ProtocolTCP},
 			}
 			service.Labels = map[string]string{
-				kops.DiscoveryLabelKey: etcdCluster.Name + ".etcd." + suffix,
+				kops.DiscoveryLabelKey: etcdCluster.Name + ".etcd",
 			}
 			service.Spec.Selector = etcdmanager.SelectorForCluster(etcdCluster)
 			services = append(services, service)

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: cef401a491db199533e3419485f72a24405558710238e9aa6c94becfb9ffe040
+    manifestHash: 122d6e4f0f90e25d765cc3bdc4da178505a1877a924b0397fb9c839fa3d8c47c
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://tests/additionalobjects.example.com","secretStore":"memfs://tests/additionalobjects.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.additionalobjects.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
+    {"clusterName":"additionalobjects.example.com","cloud":"aws","configBase":"memfs://tests/additionalobjects.example.com","secretStore":"memfs://tests/additionalobjects.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.additionalobjects.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   annotations:
-    dns.alpha.kubernetes.io/internal: events.etcd.minimal.example.com
+    dns.alpha.kubernetes.io/internal: events.etcd.internal.minimal.example.com
   creationTimestamp: null
   labels:
     k8s-app: etcd-manager-events
@@ -15,7 +15,7 @@ spec:
     - -c
     - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
       --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd/events
-      --client-urls=https://events.etcd.minimal.example.com:4002 --cluster-name=etcd-events
+      --client-urls=https://events.etcd.internal.minimal.example.com:4002 --cluster-name=etcd-events
       --containerized=true --dns-suffix=.internal.minimal.example.com --grpc-port=3997
       --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
       --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   annotations:
-    dns.alpha.kubernetes.io/internal: main.etcd.minimal.example.com
+    dns.alpha.kubernetes.io/internal: main.etcd.internal.minimal.example.com
   creationTimestamp: null
   labels:
     k8s-app: etcd-manager-main
@@ -15,7 +15,7 @@ spec:
     - -c
     - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
       --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd/main
-      --client-urls=https://main.etcd.minimal.example.com:4001 --cluster-name=etcd
+      --client-urls=https://main.etcd.internal.minimal.example.com:4001 --cluster-name=etcd
       --containerized=true --dns-suffix=.internal.minimal.example.com --grpc-port=3996
       --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
       --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b637abaef9194a7a5e03248fcafe0ba0d59288e2839c4f2ad69ddbca67c91cdc
+    manifestHash: 7764c419abb36a1c362cafc7362889dd83e1346280019aef316cb2d17387e792
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/minimal.example.com","secretStore":"memfs://clusters.example.com/minimal.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["apiservers.minimal.example.com","nodes.minimal.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
+    {"clusterName":"minimal.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/minimal.example.com","secretStore":"memfs://clusters.example.com/minimal.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["apiservers.minimal.example.com","nodes.minimal.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: a366253bb43f0a1292d6187d567b5a0f8730e83f5ce4f7036043b53d602b4870
+    manifestHash: d17d9bc5761e7649a5e95278de1ca1e27c480d7795cc933a26ab5418b06e9004
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/minimal.example.com","secretStore":"memfs://clusters.example.com/minimal.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.minimal.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
+    {"clusterName":"minimal.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/minimal.example.com","secretStore":"memfs://clusters.example.com/minimal.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.minimal.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 1442981fceafd9b580b59a951f2a9ab040f2757db13aa1c69a5d271018bbb554
+    manifestHash: 204aab19bed7367ace38285591800db801da97fb953bb0ee36c6fe37b4e8f53d
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/bastionuserdata.example.com","secretStore":"memfs://clusters.example.com/bastionuserdata.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.bastionuserdata.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
+    {"clusterName":"bastionuserdata.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/bastionuserdata.example.com","secretStore":"memfs://clusters.example.com/bastionuserdata.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.bastionuserdata.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: c3869cd1c487a10dd9fda584767f8b561da83a584dac2ac703e6d42cae4c3d92
+    manifestHash: 541cc50d85013fa267b1e23a42da8a849dcc384c4ab337b397923aa4de06e130
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/complex.example.com","secretStore":"memfs://clusters.example.com/complex.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.complex.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"],"useInstanceIDForNodeName":true}}
+    {"clusterName":"complex.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/complex.example.com","secretStore":"memfs://clusters.example.com/complex.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.complex.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"],"useInstanceIDForNodeName":true}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: a52ed6985ef96cb38ec6e6ffb06dd33f14bc176fd4391a35da2167d5b365f641
+    manifestHash: e8dec542ef431f0ece341b54e2ee189ba84d76839e488a30a6012424fa4f718d
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/compress.example.com","secretStore":"memfs://clusters.example.com/compress.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.compress.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
+    {"clusterName":"compress.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/compress.example.com","secretStore":"memfs://clusters.example.com/compress.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.compress.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 51767b6519d44e1d0a9645fb83cbbc74c5a3a86fa9c4a17651466525eb66106a
+    manifestHash: a95acb0913f3a6286e8985ea80b8d5eea4d8ae5e34bdb88f57ccdb36b62fb64b
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/containerd.example.com","secretStore":"memfs://clusters.example.com/containerd.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.containerd.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
+    {"clusterName":"containerd.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/containerd.example.com","secretStore":"memfs://clusters.example.com/containerd.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.containerd.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 51767b6519d44e1d0a9645fb83cbbc74c5a3a86fa9c4a17651466525eb66106a
+    manifestHash: a95acb0913f3a6286e8985ea80b8d5eea4d8ae5e34bdb88f57ccdb36b62fb64b
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:

tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   config.yaml: |
-    {"cloud":"aws","configBase":"memfs://clusters.example.com/containerd.example.com","secretStore":"memfs://clusters.example.com/containerd.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.containerd.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
+    {"clusterName":"containerd.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/containerd.example.com","secretStore":"memfs://clusters.example.com/containerd.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.containerd.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}}
 kind: ConfigMap
 metadata:
   creationTimestamp: null

tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content

@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: e154b6f3171bdd4c0ae8ba4cd85f27ce56c0d8a78f036b626906e526f81eaf09
+    manifestHash: 062b38e478bd5a5b7f5aa3069f30c9a9e128565e5ac149c394cda22f7bc3f1bf
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector: