hack/update-expected.sh

johngmyers · Sep 4, 2023 · edd3d0b · edd3d0b
1 parent 1ea0fd3
commit edd3d0b
Show file tree

Hide file tree

Showing 451 changed files with 299 additions and 451 deletions.
diff --git a/...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/...ata/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
 

diff --git a/.../additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/.../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
 

diff --git a/...ditionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/...ditionalobjects/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:

diff --git a/...bject_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...bject_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

diff --git a/...pdate_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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
diff --git a/...ntegration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/...ntegration/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
diff --git a/...piservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/...piservernodes/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
 

diff --git a/...vernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...vernodes/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
 

diff --git a/...pdate_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/...pdate_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
 

diff --git a/...te_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...te_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:

diff --git a/...a/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...a/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

diff --git a/...tegration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/...tegration/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
diff --git a/...n/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...n/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
diff --git a/...s/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/...s/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
diff --git a/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...ntroller/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
 

diff --git a/...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/...te_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
 

diff --git a/...cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...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:

diff --git a/...a/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...a/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

diff --git a/...pdate_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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
diff --git a/...ntegration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content b/...ntegration/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
diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../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
 

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_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
 

diff --git a/...itional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content b/...itional_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:

diff --git a/..._object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/..._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

diff --git a/...pdate_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/...pdate_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
diff --git a/...ter/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ter/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
diff --git a/.../update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content b/.../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
diff --git a/...nch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/...nch_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
 

diff --git a/...ws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data b/...ws_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
 

diff --git a/...aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data b/...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
 

diff --git a/...-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data b/...-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
 

diff --git a/...stom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content b/...stom/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:

diff --git a/...riority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...riority-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

diff --git a/...scaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...scaler-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
diff --git a/...aler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/...aler-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
diff --git a/...caler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/...caler-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
diff --git a/...cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content b/...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
diff --git a/...aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/...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
 

diff --git a/.../data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data b/.../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
 

diff --git a/...r/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data b/...r/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
 

diff --git a/...ority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data b/...ority-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
 

diff --git a/...ty-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content b/...ty-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:

diff --git a/...t_cas-priority-expander.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...t_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

diff --git a/...er-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...er-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
diff --git a/...-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/...-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
diff --git a/...r-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/...r-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
diff --git a/...luster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content b/...luster/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
diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../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