hack/update-expected.sh

2023-09-04 16:12:00 -07:00 · 2023-09-04 16:12:00 -07:00 · edd3d0bf42
parent 1ea0fd3004
commit edd3d0bf42
451 changed files with 299 additions and 451 deletions
--- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: additionalobjects.example.com
 ConfigBase: memfs://tests/additionalobjects.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: yXYda9GcDSYlt1kJFalFSwuE1mB39HgmC12h+/o/12Y=
+NodeupConfigHash: FxjsWRJZOaGgNNZK0YcqMCEjT8bTvHFVsbnkE83rh+g=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.additionalobjects.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: VS/TGKfkokfEorwCmbEaeep2braPYNFsTUbmNS9zBes=
+NodeupConfigHash: BGTyfaqYUKKo9cqsKbd7zgfnReFScVOOaNSwJU9UX5s=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
+++ b/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: 6f7a7e25804de455816be53cae554c224bde42d6cb27bcf23d4d2c25c131949f
+    manifestHash: d2434e3849197a93328dce7b508fb95a60f4d31d54bfba7692e214729c3002b2
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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"],"useInstanceIDForNodeName":true}}
+    {"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
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -330,6 +330,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
@ -60,6 +60,5 @@ containerdConfig:
  version: 1.7.2
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: apiserver
 InstanceGroupRole: APIServer
-NodeupConfigHash: E2VPvrBxDk3Z9UrsdNpVds52f3v8jFHOWdbaw6+v6DQ=
+NodeupConfigHash: bS7lFdrLmDdOfwplNoOz/TMaAefxZK0gfc0HLuF1cPI=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: BScxZqbUo+kPOCxzZ5GPz77JvJ/0yG9tsgqsz0W8mL8=
+NodeupConfigHash: 4OK/CagyQRKjTwATwaTYENGuofIuWMsLf6zxCQN5Krw=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: CqpYXURYhho24iV4Hebss/lvW3p1pxlKR4Wu54jxHTA=
+NodeupConfigHash: 6zXkldZccDbJi573eLEvEOa/mEJX/QotharCFYpwxyI=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/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: b8f035cbc77d3ab983938ec5ecf553b9398aa2e9710fbe9795c9466f3a24fbfe
+    manifestHash: 2c3f870e4d2dd74d80556e77f058aa3cf97a0f87dd8ab61b8fb3acb80387cdd3
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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"],"useInstanceIDForNodeName":true}}
+    {"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
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
@ -200,6 +200,5 @@ docker:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -328,6 +328,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
@ -59,6 +59,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: DH7qXmKAJTo2Xbp9uCGNp9+mKNA4nv1jh7dAFh/O3G8=
+NodeupConfigHash: qcmONpsVF20J10Q8aBxO9+mfsTE1CZ9VyWOT+Cf3Qrw=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: dOOpSbmHCAPPu8GpqgOT4+64KZe7hqqmflK0JtQI/sc=
+NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/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: 91e5bf53d5edb03467f0476da871f0725ee798f13d6b27ff28c3e35e6300def4
+    manifestHash: b9e1b55cd690e9f3348b2fdf9360d63428cd83bec5639750215d95136aced5de
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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"],"useInstanceIDForNodeName":true}}
+    {"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
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -329,6 +329,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
@ -58,6 +58,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: bastionuserdata.example.com
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: XgjFgLNOPw0Sp/1yEr71AJwYg2KYDoad9Lw1GTou2gw=
+NodeupConfigHash: 4yogwj2V0zMKT1hDS9wU8cfgLrHoDaLkveLx5NQo4OY=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@ -160,7 +160,7 @@ ConfigServer:
  - https://kops-controller.internal.bastionuserdata.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 3Uk9hT8H6XNzh0eBqtcCw9yNlcfnJrDbBHdJ6ubOi/I=
+NodeupConfigHash: F089AXZWaaI8WCcKz6jGvjkb7oGj3fnKJPUFm+gLy/A=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content
+++ b/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: 2c6a893f45f8ae5041938a9aad0c196a5c9d5c8cc61793757ded5cc0fa6c1d84
+    manifestHash: 15e417dc6171d203bfe4f85ba59531170359b7bc3ad7f9e49270d339855d92cc
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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"],"useInstanceIDForNodeName":true}}
+    {"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
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
@ -55,6 +55,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -328,6 +328,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
@ -58,6 +58,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: cas-priority-expander-custom.example.com
 ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: oufaLLxxDuySJIPJRaWWr2m57cbTNTHSoxPdVuLiZ6g=
+NodeupConfigHash: sg3jG9XMm0ZVnn4YoM5bMiJd7XWNUgtmchp1HndIH8s=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes-high-priority
 InstanceGroupRole: Node
-NodeupConfigHash: +kCuCO9g56Z9kuKYCkm6ZpjzPNyh6ihRUZF/Mbig+Ls=
+NodeupConfigHash: ir5b1EyYklfASiXbb3ONWM+54U8dFgxCm071htriZus=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes-low-priority
 InstanceGroupRole: Node
-NodeupConfigHash: +kCuCO9g56Z9kuKYCkm6ZpjzPNyh6ihRUZF/Mbig+Ls=
+NodeupConfigHash: ir5b1EyYklfASiXbb3ONWM+54U8dFgxCm071htriZus=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: +kCuCO9g56Z9kuKYCkm6ZpjzPNyh6ihRUZF/Mbig+Ls=
+NodeupConfigHash: ir5b1EyYklfASiXbb3ONWM+54U8dFgxCm071htriZus=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.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: a549a5ef97e28380bb876a71c32488f61e2b71016df56fb738ee67675307204a
+    manifestHash: b9244653b0e78a5666b677cc8fc93527c9cbf4119d986a512f71defcc042dbfa
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@ -1,7 +1,7 @@
 apiVersion: v1
 data:
  config.yaml: |
-    {"clusterName":"cas-priority-expander-custom.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/cas-priority-expander-custom.example.com","secretStore":"memfs://clusters.example.com/cas-priority-expander-custom.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.cas-priority-expander-custom.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":"cas-priority-expander-custom.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/cas-priority-expander-custom.example.com","secretStore":"memfs://clusters.example.com/cas-priority-expander-custom.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.cas-priority-expander-custom.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
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -328,6 +328,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
@ -57,6 +57,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
@ -57,6 +57,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content
@ -57,6 +57,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: cas-priority-expander.example.com
 ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: g9wFsNYuCWXK8kBqTWjobSlegtlKIpihuW/C3h94yP0=
+NodeupConfigHash: 7dUsD+nRVKaekOetyglYoC1sxGl9JxX9dn48UP8T5YQ=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes-high-priority
 InstanceGroupRole: Node
-NodeupConfigHash: rzEJ54C4ZWMzAE65p0uX3PIP5rsd47sez3LVjN/uqIM=
+NodeupConfigHash: J0wlRPXGFKt5wsGntyz7G/Tlz0oyTeRmDf/GVIMTHJM=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes-low-priority
 InstanceGroupRole: Node
-NodeupConfigHash: rzEJ54C4ZWMzAE65p0uX3PIP5rsd47sez3LVjN/uqIM=
+NodeupConfigHash: J0wlRPXGFKt5wsGntyz7G/Tlz0oyTeRmDf/GVIMTHJM=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: rzEJ54C4ZWMzAE65p0uX3PIP5rsd47sez3LVjN/uqIM=
+NodeupConfigHash: J0wlRPXGFKt5wsGntyz7G/Tlz0oyTeRmDf/GVIMTHJM=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.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: 861d621bfa6bbace525bf3f7159e4a3e2e015528bcdd5c4b7f1e6ea16a9b6792
+    manifestHash: 3c24518364a57c5d601dc195074b4a8d74c4f95b13b399e54160159db10129da
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@ -1,7 +1,7 @@
 apiVersion: v1
 data:
  config.yaml: |
-    {"clusterName":"cas-priority-expander.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/cas-priority-expander.example.com","secretStore":"memfs://clusters.example.com/cas-priority-expander.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.cas-priority-expander.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":"cas-priority-expander.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/cas-priority-expander.example.com","secretStore":"memfs://clusters.example.com/cas-priority-expander.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.cas-priority-expander.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
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -328,6 +328,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
@ -57,6 +57,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
@ -57,6 +57,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content
@ -57,6 +57,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
+++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@ -137,7 +137,7 @@ ClusterName: complex.example.com
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: UupIEUV2WSAOgV0zSE85P7DMvhpVqRYofy/yGz2MSxI=
+NodeupConfigHash: H4IpFWHeDi9zIiRC4hhPtVgEA4sAI7UMC+Ge/n+2d2I=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
+++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@ -160,7 +160,7 @@ ConfigServer:
  - https://kops-controller.internal.complex.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: KNBl1wZxSiyCZNc56MdRDt0SF0EERWBG5Id7c8Jlr+I=
+NodeupConfigHash: PaJx989I3MwTS+W8DSHpl8w8J+lM9J+kpdmSfx1PAts=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
+++ b/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: c04acb1840fca908d0e73ddbaafdb2f86afe6dd48d35ff805a869597a8443257
+    manifestHash: 56c3d3e7f61aabe2e9e131e7915b94f808bcd6f2bd0d72a8681cc00c1a03638c
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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}}
+    {"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"]}}
 kind: ConfigMap
 metadata:
  creationTimestamp: null
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -337,6 +337,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content
@ -61,6 +61,5 @@ docker:
  skipInstall: true
 packages:
 - nfs-common
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
+++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@ -131,7 +131,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir

-echo "H4sIAAAAAAAA/2zOTUsDMRDG8Xs+Re5luypuhYAXI1pZqIsa0N7G7NQuJJmQyfj26UX2tND7/8fz2EAyDoU+pxGL0fDFygbhimUHEY32FHNB5jV+Q8wB156ispQO08cNMBodMR7YtK2f1SJsT+qHxBWSx/tCkueVCP+2EW4qcm3OYRk9UUCjLaVaKAwBEqodjSh5PrIFPhoNq312x9dtd+WeXy7ee3DhbX/7u9r8dOLOOujlbjP0j0nw8lr9AQAA//8BAAD//+4iSt/3AAAA" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/2zOsU7DMBDG8T1P4R2lEVMrSwzUgGEgqhAEie2wL2lVn8/4bFp4eoQyRer+/+n7TODqd5m/Dx6zVnCSxoQqBXMPhFo5ppRRZIVnoBRw5Zgaw3E8TFsQ1IqQRtFd52a1CLuL+ilKgejQZq5pXiH4t22VtqCU9hqW0QsH1MpwLJnDLkDEpmePNc1HHkH2Wt27je1LnY7vn9uvSZ7Xd6N7WF+d7PltuE3D/neQj59XS35zvGn+AAAA//8BAAD//7mLlAv3AAAA" | base64 -d | gzip -d > conf/kube_env.yaml

 download-release
 echo "== nodeup node config done =="
--- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
+++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
@ -131,7 +131,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir

-echo "H4sIAAAAAAAA/6yUy46qWBiF5z4Fc3MKREUwOYOfqxsLBEE4OEPc3OR+cavph+8U1clJpyudTqcYMFgr+xv8+bKkoh6vVlffsyvutlRI+plUjP2AOzMs8ZaK6rLpcN+/4UdYNgV+i+pyJtVVnCUO7u64284oSgIJd0MWZ1E44H5L/TGjKIr68fGJioZMSlKOLlKRBK4ypVNvICReckmCY5YAQSIkyFAbMFtR5k1H5lk4OQYwmuS0moMuS9lWRImcwBCTh5rDaYKIiemJYLiyPyyC0nteSo85/zKGgFXILo1MI1eI+YKlIUfkIAPxP7LX72yCTEUOgXEMiAqB7Nm2rJBFd/X1IirXxVXzXu++mRoqIbId6Pv6jNJ7ZIKtiKIN8gRxCBAHdBFMFS1fHePe+FvX+/yd5LHRvPRD4ds8t+Du2jKwQraFBG28Vb0nscc8UbKYIPkw33HxyqLJzQLLtdz42Ajoydc7RVEJIwFRAEJTMhQgchLI3pGxwN7RItgyJIr2eVjgNVicrgpRRJrYqgGGCDFPdvb04CCKgaKa2vLl5W70XuhE7vUVvRdkb7Ov0xP8Bfnn5YFRQOSvzDIOWLLx9018YIUWscK6GVlpFYUCZJ52aBIn4ifIUNp9y3XRY1i68+6y5gXLG15MSeho7z4ONy7ZsZIkzZ+7+MmSnz9/e6OY8tfW/F+r7qUTMgcogvLX/nutcg32a6s+im+zylA5dRWerw1mjqfm+byFYuOTs1SRSxyngXYg87jnjtf38dRubMks9ZJW2s0E8f3DKzMCOUOCc4mKRp5zdqYz5lJpm8Y7faNV76hsODjmlgw7rkrRvI98b1jawqX6V6s823usjdMwAsLYGi2hXi8eQ+OyDqfe44zXV0h6VMWnmoK4Ocns2KeRp1pDiOt3QYtHPgxWe13EbZus67xYteWxctP8v1jVT0vWf0zZDyodhqbf0vStbvofUV0NXV0UuHvLqgF3VVi8fTWJ26XA8/QMVf0QVhHWunpsPge0qq+4/3txrAu8pcz6imcfv7H53NNd2KdbSg/DBHI9wzkPuwOWayM7S2ebQXS52rfChh51fuOOakpHP2d/AgAA//8BAAD//wGuSAu+BQAA" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/6yUzY6ySBiF914Fe/O1CIpg0ou3KEBQEASh6R1igSj/oKVmLn4iPcmXyXQmk0mzYHFO6lm8eXLkvLoe7ba6ZUfSLpmIdiM5v3Y9aa2oIEsmroq6JV33Ru5RUefkLa6KkVyVSZa6pL2RdjliGBlk0vZZksVRT7ol88eIYRjm1+tDiqZbjKzsPF3VZfCUIR16U9fR4SzLsMtSoDqCVDfVGqwGYdFyscjB3jWB1WS30Vz9wGNHQTLdg4nSu3qG/QBBqeUjMD0c9NOw8B+Hwmc/P8w+5BS6OsWWeVao9QTexDHdYqDBK3v+zgbIUJwhNHchVSHEvuNghU7bY2DkcTHPj5r/3ATWyVQpxU5orKtP/XSLLXAUhBzAA8SlQF0wEFiqzj9b1ruIl7YLxBs9J2b9NLZ54IjCVLhpfGhHXAOpvvBn1ZomPvvQ0+kAOffjlZDM7Am92GB7tpfsakl/iNVKUVTKykAVgMiSTQUoTkPs71gbnNUEgYMhVbSvw4KowXR/VKiCJtRRTTARJCJdOcODLUKholoa//TPXrzJDYo7YzZZS9hfrKvTHv6C/PPywCqAxCPLJyFHF8G6Trac1OicNK+vnDyLIwkyX9vWqRuLA6QvnK4R2vje8964PcxFyfb7J1vQSbz27tuLkK44WZbHj1Xy4Oj7+29vFAt/b83/tepWuBG7hTwsPtY/a5Vnct9b9Sp+zCpTFdRZ9HmsCbvb14/HJUJ1QD/lkh6S5BRqWzpOOmF33Fz3zcKRrcIoJkqzGCBBsH1mZogzXXIPcV7jseBkBmvxSlPX/v4HrdroRS3A7mxjWAnlSR93ceD3vCMdyn+1ynf8+9zc91fQCbGvtlTNp/e+9jhXUG9JJhozXb6X+ZeaElrsMXftTrGv2n1Eqo2kJVcxCmdrA5GmSefVOZ81xa70Tuf/YlU3LFn3mrJfzKnv6245mVyquvsVV2XfVnlO2res7ElbRvnbd5O45CVRnIz0suujMiZaW13rrwEtqyPp/l7sqpwsGas6ktHrd62/9nQVdaclUy5MTSV3vmBpu7Ef9p2oar65bD4bPBP9NHAD9Ki87YdhXd5HfwIAAP//AQAA//9Z3yNrvgUAAA==" | base64 -d | gzip -d > conf/kube_env.yaml

 download-release
 echo "== nodeup node config done =="
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content
+++ b/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: 8ebdcd8e80a78a7e37eded1ef2ed76f6bdf74e5ea7aed7ebfff5deba1c2e6b2f
+    manifestHash: 6c8518a98b2f27749b74068eb4beb54832fff897bfc8edc666a766ffc9f2e105
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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"],"useInstanceIDForNodeName":true}}
+    {"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
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -329,6 +329,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content
@ -58,6 +58,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: xF3/mANxyTpiOEhb8FVujna3iXXLprLdghYebxfEzuA=
+NodeupConfigHash: FUUEom6ukiK3eDYB3SkAGWRQrg5+RKpXD0T6n/1X4Jc=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.containerd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: mm4w3TAX9THR0M5e5PKqSEike/KkndvFdMPxzXl27/g=
+NodeupConfigHash: ahH7ZzRD9p5KxDl1kUM6jp9srjL1L1BR9jA9/gI9oX0=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
+++ b/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: 0617b7cc24149098f3057c7e68c6647db2e0623498fcb24d1dfdf8735de0f4a3
+    manifestHash: d496bc22a5f12f0f5abd92ba3773f791f53777416e4979d9fad111c7f208d4d8
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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"],"useInstanceIDForNodeName":true}}
+    {"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
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -334,6 +334,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content
@ -63,6 +63,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: OEPABokf3PouZ4Cm/19BtjvZMkGLqw62NHpgf/iLgEE=
+NodeupConfigHash: 94mjtG+SfGDcu/VczjCRwM5mJHSEDtz+ol3uAl5qYd4=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.containerd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QTfjsUNeXkYNh1no6Qxx4xpagx1wpwF3LiBtndnhu1A=
+NodeupConfigHash: d/PBUemSeFM+VFWLbU5jCUEBM2eWLSgkjEvWjr0R2xc=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
+++ b/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: 0617b7cc24149098f3057c7e68c6647db2e0623498fcb24d1dfdf8735de0f4a3
+    manifestHash: d496bc22a5f12f0f5abd92ba3773f791f53777416e4979d9fad111c7f208d4d8
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/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: |
-    {"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"],"useInstanceIDForNodeName":true}}
+    {"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
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -329,6 +329,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content
@ -58,6 +58,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
+++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: 123.example.com
 ConfigBase: memfs://clusters.example.com/123.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: yvdc3O1Nqg8fmzReb6/PY6TBCbd/v/mfKfjXnwBMNyQ=
+NodeupConfigHash: TqPcvl4kVvZiIl2qWDBLAVLDX69Y47lotA93yu47epU=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
+++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.123.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: utTXiBbp+aQvQMf7B6QA1nfF/TJ/KIWqTP0LO6MHkUk=
+NodeupConfigHash: yqoUdggZMkzcgSHHZBzAWN7VK0OzLjJpONsKjw4JJ/w=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content
+++ b/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: 43a50ba0a93b7e07965d08b810b2201cab37ce34e0baa93f9869b650d93a9095
+    manifestHash: 76e90ac4ff01d4670fad1f3cfc4529bea7b2a80511658eac75905fdb9b2e82bc
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@ -1,7 +1,7 @@
 apiVersion: v1
 data:
  config.yaml: |
-    {"clusterName":"123.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/123.example.com","secretStore":"memfs://clusters.example.com/123.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.123.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":"123.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/123.example.com","secretStore":"memfs://clusters.example.com/123.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.123.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
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -329,6 +329,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content
@ -58,6 +58,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: PHDLW1SXhx7kpLR/T9XInCqp+1es7Q35L8sqwxN79FY=
+NodeupConfigHash: mAShQY9FnOUD5LiIGGWkuNiRCpZzYGe0MerDogURTN8=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 2/8wlbjuCUI5DfuGEvihCk4Fx/29pALTzRLn5tVmQBs=
+NodeupConfigHash: sPEfZDSw74UkUB1c4oh/+CVsx2+U2ypeNrXn7B1BSKQ=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: AWxXvyhuPgj9C5WIXZiSyRN0qOLfS7KT6S+HpgtU2u4=
+NodeupConfigHash: x9DXSNLLWBc2zHETCyJWua57Ro5j5IIKZ2+YWWQ7kz0=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.existing-iam.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: UYilWVWF7AbHarZxfgMtFE4KR9ILIjCavcYi4bkEO4Y=
+NodeupConfigHash: d6+93SBV5h0mBkncKt1EdhObQn0t3tHJIi6Nhu/4al4=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.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: f3362ac7f196f5a1e07143a7ab15dbf3bb1b841427991badb06c721025e2bea7
+    manifestHash: a7710bc054c9b3d4e97f4cfe26ebe9bad1f33550842f992f16e6ea10b0197c84
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@ -1,7 +1,7 @@
 apiVersion: v1
 data:
  config.yaml: |
-    {"clusterName":"existing-iam.example.com","cloud":"aws","configBase":"memfs://tests/existing-iam.example.com","secretStore":"memfs://tests/existing-iam.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["kops-custom-node-role"],"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":"existing-iam.example.com","cloud":"aws","configBase":"memfs://tests/existing-iam.example.com","secretStore":"memfs://tests/existing-iam.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["kops-custom-node-role"],"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
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -329,6 +329,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
@ -329,6 +329,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
@ -329,6 +329,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content
@ -58,6 +58,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: cbZsi8gYL6MjS7VnPI0ACCcW9pfCMMCsTSMQ4k2jL9g=
+NodeupConfigHash: vZTlSkCxPadc3Pd11FB0fZ8RAe7s5BraW79K0kF/ww4=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: cUUrvd22Zsm9CbYa3+7mXh+wT4xkqYDiGtWUAeY+k/g=
+NodeupConfigHash: xXXVjS8P1JDouLlfzk0vdxSBgPXsdPMB3Xy4qI4FfuQ=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: w/PuFclVijijYea3rlrjYSxmerqvrMG5RwU7X8CnWsY=
+NodeupConfigHash: o3JR7gA6vf0pkFZn9MUB6zKJ6Q52dQeIlR0NU1sUSHk=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.existingsg.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 1W6S6JOENX2AEuUqbISvuaIBO7NipdjcXBJWsvrNI9U=
+NodeupConfigHash: ubSBZl2/0wFn7AQuzVmZL21hw6/dOEhSmntEdLVYfM8=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.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: 67aef0f7912c3e591728d8f354bc866c1b96bd5ed725cf13f0b923308324e015
+    manifestHash: 7d82781d205822c153d82c6c633236ea1ea0c21189f6bae245b6eb75ba163bfe
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@ -1,7 +1,7 @@
 apiVersion: v1
 data:
  config.yaml: |
-    {"clusterName":"existingsg.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/existingsg.example.com","secretStore":"memfs://clusters.example.com/existingsg.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.existingsg.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":"existingsg.example.com","cloud":"aws","configBase":"memfs://clusters.example.com/existingsg.example.com","secretStore":"memfs://clusters.example.com/existingsg.example.com/secrets","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.existingsg.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
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@ -328,6 +328,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
@ -328,6 +328,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
@ -328,6 +328,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
  path: manifests/static/kube-apiserver-healthcheck.yaml
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content
@ -58,6 +58,5 @@ containerdConfig:
  version: 1.6.20
 docker:
  skipInstall: true
-useInstanceIDForNodeName: true
 usesLegacyGossip: false
 usesNoneDNS: false
--- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JqfWRE5olj1SrSyXCxYaXOzYIBFTlyCDY13cb0Fn4KA=
+NodeupConfigHash: UhWxV84/7jb2wSFze1pzEmopJrPwVIM23XQhhPc/j6A=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
@ -151,7 +151,7 @@ ConfigServer:
  - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: dOOpSbmHCAPPu8GpqgOT4+64KZe7hqqmflK0JtQI/sc=
+NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/external_dns/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: 91e5bf53d5edb03467f0476da871f0725ee798f13d6b27ff28c3e35e6300def4
+    manifestHash: b9e1b55cd690e9f3348b2fdf9360d63428cd83bec5639750215d95136aced5de
    name: kops-controller.addons.k8s.io
    needsRollingUpdate: control-plane
    selector:
--- a/Show More
+++ b/Show More