Run hack/update-expected.sh

kubernetes · Aug 2, 2022 · 322bb7d · 322bb7d
1 parent 16fa47a
commit 322bb7d
Show file tree

Hide file tree

Showing 372 changed files with 2,283 additions and 615 deletions.
diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
@@ -128,8 +128,8 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/events.yaml
-Name: manifests-etcdmanager-events
+Location: manifests/etcd/events-master-us-test-1a.yaml
+Name: manifests-etcdmanager-events-master-us-test-1a
 Public: null
 ---
 Base: null
@@ -197,6 +197,6 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/main.yaml
-Name: manifests-etcdmanager-main
+Location: manifests/etcd/main-master-us-test-1a.yaml
+Name: manifests-etcdmanager-main-master-us-test-1a
 Public: null
diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -127,8 +127,8 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/events.yaml
-Name: manifests-etcdmanager-events
+Location: manifests/etcd/events-master-us-test-1a.yaml
+Name: manifests-etcdmanager-events-master-us-test-1a
 Public: null
 ---
 Base: null
@@ -195,6 +195,6 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/main.yaml
-Name: manifests-etcdmanager-main
+Location: manifests/etcd/main-master-us-test-1a.yaml
+Name: manifests-etcdmanager-main-master-us-test-1a
 Public: null
diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -130,8 +130,8 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/events.yaml
-Name: manifests-etcdmanager-events
+Location: manifests/etcd/events-master-us-test-1a.yaml
+Name: manifests-etcdmanager-events-master-us-test-1a
 Public: null
 ---
 Base: null
@@ -201,6 +201,6 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/main.yaml
-Name: manifests-etcdmanager-main
+Location: manifests/etcd/main-master-us-test-1a.yaml
+Name: manifests-etcdmanager-main-master-us-test-1a
 Public: null
diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -136,8 +136,8 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/events.yaml
-Name: manifests-etcdmanager-events
+Location: manifests/etcd/events-master-us-test-1a.yaml
+Name: manifests-etcdmanager-events-master-us-test-1a
 Public: null
 ---
 Base: null
@@ -213,6 +213,6 @@ Contents: |
       name: varlogetcd
   status: {}
 Lifecycle: ""
-Location: manifests/etcd/main.yaml
-Name: manifests-etcdmanager-main
+Location: manifests/etcd/main-master-us-test-1a.yaml
+Name: manifests-etcdmanager-main-master-us-test-1a
 Public: null
diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
@@ -439,7 +439,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
   ConfigBase: memfs://clusters.example.com/minimal.example.com
   InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
-  NodeupConfigHash: 3qdPx3oiEVN1GYvNvnqegPn5HfCT20qnIKcMOu2SUUk=
+  NodeupConfigHash: AyfQUSU3pU4Y3sxv654JYBDiSYYB8tzFt/l5u3IaG/A=
 
   __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
@@ -262,7 +262,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: 3qdPx3oiEVN1GYvNvnqegPn5HfCT20qnIKcMOu2SUUk=
+NodeupConfigHash: AyfQUSU3pU4Y3sxv654JYBDiSYYB8tzFt/l5u3IaG/A=
 
 __EOF_KUBE_ENV
 

diff --git a/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content b/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content
diff --git a/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content b/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content
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
@@ -268,8 +268,8 @@ containerdConfig:
   logLevel: info
   version: 1.4.13
 etcdManifests:
-- memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml
-- memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml
+- memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
+- memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
diff --git a/tests/integration/update_cluster/apiservernodes/kubernetes.tf b/tests/integration/update_cluster/apiservernodes/kubernetes.tf
@@ -698,18 +698,18 @@ resource "aws_s3_object" "kops-version-txt" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-events" {
+resource "aws_s3_object" "manifests-etcdmanager-events-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events_content")
-  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/events.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content")
+  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-main" {
+resource "aws_s3_object" "manifests-etcdmanager-main-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main_content")
-  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/main.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content")
+  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

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
@@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: M0ExiycRdbTLCRkTX6AW9JLM7pzSA6UViGzDd/fW9A0=
+NodeupConfigHash: 7tYJ8eQDhzVM78NRdWfNPKZ4cOkWJXk6mXZnAGX8YWI=
 
 __EOF_KUBE_ENV
 

diff --git a/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content b/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content
diff --git a/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content b/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content
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
@@ -260,8 +260,8 @@ containerdConfig:
   logLevel: info
   version: 1.4.13
 etcdManifests:
-- memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml
-- memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml
+- memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
+- memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
diff --git a/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf b/tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
@@ -612,18 +612,18 @@ resource "aws_s3_object" "kops-version-txt" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-events" {
+resource "aws_s3_object" "manifests-etcdmanager-events-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events_content")
-  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/events.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content")
+  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-main" {
+resource "aws_s3_object" "manifests-etcdmanager-main-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main_content")
-  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/main.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content")
+  key                    = "clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

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
@@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: 8C9/e/L3ChpoTk1s7hH/kSi5SZ48BrQxCfzAMbVpSio=
+NodeupConfigHash: 2peKS73CtFUTXEuCFx9ZBqDMjI10ZvjaIE+dDXzv9U0=
 
 __EOF_KUBE_ENV
 

diff --git a/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content b/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content
diff --git a/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content b/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content
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
@@ -260,8 +260,8 @@ containerdConfig:
   logLevel: info
   version: 1.4.13
 etcdManifests:
-- memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main.yaml
-- memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events.yaml
+- memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main-master-us-test-1a.yaml
+- memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events-master-us-test-1a.yaml
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
@@ -862,18 +862,18 @@ resource "aws_s3_object" "kops-version-txt" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-events" {
+resource "aws_s3_object" "manifests-etcdmanager-events-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events_content")
-  key                    = "clusters.example.com/bastionuserdata.example.com/manifests/etcd/events.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content")
+  key                    = "clusters.example.com/bastionuserdata.example.com/manifests/etcd/events-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-main" {
+resource "aws_s3_object" "manifests-etcdmanager-main-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main_content")
-  key                    = "clusters.example.com/bastionuserdata.example.com/manifests/etcd/main.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content")
+  key                    = "clusters.example.com/bastionuserdata.example.com/manifests/etcd/main-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -276,7 +276,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
   ConfigBase: memfs://clusters.example.com/complex.example.com
   InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
-  NodeupConfigHash: /kzT+UsXGjhR1gYHcSZeQvy9456yLuzeKFyG7m6xfiM=
+  NodeupConfigHash: zKAziGeNI03FEJJKZK/mwm9dABFb7D9LGHQR0p5KuIM=
 
   __EOF_KUBE_ENV
 

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
@@ -275,7 +275,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: /kzT+UsXGjhR1gYHcSZeQvy9456yLuzeKFyG7m6xfiM=
+NodeupConfigHash: zKAziGeNI03FEJJKZK/mwm9dABFb7D9LGHQR0p5KuIM=
 
 __EOF_KUBE_ENV
 

diff --git a/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content b/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content
diff --git a/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content b/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content
diff --git a/...egration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...egration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -272,8 +272,8 @@ containerdConfig:
   logLevel: info
   version: 1.6.6
 etcdManifests:
-- memfs://clusters.example.com/complex.example.com/manifests/etcd/main.yaml
-- memfs://clusters.example.com/complex.example.com/manifests/etcd/events.yaml
+- memfs://clusters.example.com/complex.example.com/manifests/etcd/main-master-us-test-1a.yaml
+- memfs://clusters.example.com/complex.example.com/manifests/etcd/events-master-us-test-1a.yaml
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml

diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf
@@ -786,18 +786,18 @@ resource "aws_s3_object" "kops-version-txt" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-events" {
+resource "aws_s3_object" "manifests-etcdmanager-events-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events_content")
-  key                    = "clusters.example.com/complex.example.com/manifests/etcd/events.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content")
+  key                    = "clusters.example.com/complex.example.com/manifests/etcd/events-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-main" {
+resource "aws_s3_object" "manifests-etcdmanager-main-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main_content")
-  key                    = "clusters.example.com/complex.example.com/manifests/etcd/main.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content")
+  key                    = "clusters.example.com/complex.example.com/manifests/etcd/main-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

diff --git a/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@@ -133,7 +133,7 @@ ensure-install-dir
 
 echo "H4sIAAAAAAAA/+xWzXLbNhC+8ykw08ktJsXYTVtOLoqUxmrilJWSptcVsKJQgQC7ACirT98BQEqyY8fTybEdzUji/mF/vv1ArowXM6M3sqkyxmBv37xezVaLOckeKYgYQw1rhaJiG1AWM8Za0NDgyhmCBmcKrEVbMUceM260A6mRll472WLFjhJxUooQWJnmPfaoKib1xmSM9UhWGl2xMr/Ky8tMGL5LOdid7BbaOlBqOAc1p0PnpNFD8kx7pTJ0XMyUtw7JBkfsUTubyjiGv0zhQx1SP6zb+TVO68UKaegCKGX2NcleKmxCL2IWjIE2+tAab6febU8dgk5OvZCoOcbTL1iISBod2tz2PBe4Aa9cMk3HzIzXrmJlkHm3NST/hlDgjRFYsanaw8FOQxoZY2upxVQIQmsrNsnjJ2MsTrMm00uBVIVpZuP4pqKVNtRYK99IPWT1AVq0HXB8LzfID1xhFL+XrXRL0A1SfA4JSo5TzkOOUTRPBZyD4Fz+0SikmP4KudEiKW+8Ayd1c0zmM663xuyi8ndQUjyu/mAELtE6kjyEjbIlWuOJ42/eOAilOi5SM4f6ts51tiqK8sUPsUlldTWZlHctf+2RSIpxUEXCzHcPur7IGJMtNFgxwkZaR4d896PNpSnCgC+gkzZhpi/zF2UcSlAodDXhBolwnNvHQzceudAOSYNa1PHx2linoU2jeHN7pjutTEiE8C+P1m0RBFJEBoo40BQVmoawAWfovu2bW0dwHf+GrOTt6PLHxRJb4/AiWlzc93tLxnfJ775DVN23/2RD6i0+7BK0YbeRe8LakKvY1dVllJyjbWGtD2Ae5wGdzOXQsJybtgvNzPEW2k5hEHwR4ZfP71aflot/EaIwHWopir4s/tzv7CniwC2LOi5HxcrJJH95FfBRREaxaR1eA9+hFlWEWWKTmdGOjFJIN5E9j6zCwWHA9mwxX9oTrzgHfDvH8L0MG8SlwtVB8xpJGlGxsp3YxzaepyxDxJTiTy9TiuVJGYASyPnB/vHIqZ5wFsIvjXeB4Edy+9oC8GOZF+1Q52kTVEKfwrjBiXnPZMfi78LcW7zLPzNCgdpJUGO/wtE1mdtD9WT1nV8miEZd+0Q5XQx6VsFZZsFgxbcovErT/FogezT8tnYMZFI9fvXwJqzicH8ze7AOW3GUL41xFSueQM78w+oM2+XkTGPipTk+5gG/6njJzHHtm0bq5hq0UGHlxxqwT7R9DSQq1mJr6JBDD1IFv1flZHIjn2sjcGPviJ+NQhl+7c+E+Or7Z89jq78wHaV3bAcGTpCuIbSq6IEKJdfF0M3iZPAF+jS6vaFdujWHpdEyY6wzYqE3BLPxpWbx8Pg78Bary/xl8rkBLTdo3ZAJOl6cXg2KdtBGytl6J8xevyXgOK795eQR1YykkxxUbYQNs7NZC2FC7/4HzH8FMCkQ0kBKocrTlL8VTf8AAAD//wEAAP//578IaCkMAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
-echo "H4sIAAAAAAAA/1TOQUvEMBAF4Ht+Re5LtyqoEPCwrq0WsUhFUW9DOmlLk07MJLX666XuqdfH9x7vaCm1z4HmocWgJHyzONJkhu4WGJV06AyrPNc2ccTAe1zAeYt7TS7X5HxA3oSimjjCpPE+UPI1uHUE1m6WOIvIMTuHLWrIopJP/0jU1GLypwsPwL2S5vHzoti599dyvKyWgszd1c+8HH4pldcNj33xdXjblS8fZ9DdiD8AAAD//wEAAP//ijOvJc8AAAA=" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/1TOwWrDMBAE0Lu+Qj/giJRCQdCDk0AS2ho1h/a8kde2QNKqWsn15xc3J1+HN8McPdXeZJpdj1lL+GVxpDi48QCMWgYMA2ulrK9cMPMOFwjJ485SUJZCysibUFwjF4gWz5lq6iCsI7B2m8pNQS7NHrboRh61/PhHoqMea3pcuABPWraTvfDsDuYtPo/D91d3Mu3L+X4zP/z+dLqSu9cl7ZX/hPZV/AEAAP//AQAA//+4UoR7zwAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml
 
 download-release
 echo "== nodeup node config done =="

diff --git a/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content b/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content
diff --git a/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content b/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content
diff --git a/...gration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...gration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -260,8 +260,8 @@ containerdConfig:
   logLevel: info
   version: 1.4.13
 etcdManifests:
-- memfs://clusters.example.com/compress.example.com/manifests/etcd/main.yaml
-- memfs://clusters.example.com/compress.example.com/manifests/etcd/events.yaml
+- memfs://clusters.example.com/compress.example.com/manifests/etcd/main-master-us-test-1a.yaml
+- memfs://clusters.example.com/compress.example.com/manifests/etcd/events-master-us-test-1a.yaml
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
diff --git a/tests/integration/update_cluster/compress/kubernetes.tf b/tests/integration/update_cluster/compress/kubernetes.tf
@@ -565,18 +565,18 @@ resource "aws_s3_object" "kops-version-txt" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-events" {
+resource "aws_s3_object" "manifests-etcdmanager-events-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events_content")
-  key                    = "clusters.example.com/compress.example.com/manifests/etcd/events.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content")
+  key                    = "clusters.example.com/compress.example.com/manifests/etcd/events-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-main" {
+resource "aws_s3_object" "manifests-etcdmanager-main-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main_content")
-  key                    = "clusters.example.com/compress.example.com/manifests/etcd/main.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content")
+  key                    = "clusters.example.com/compress.example.com/manifests/etcd/main-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml
@@ -253,7 +253,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
   ConfigBase: memfs://clusters.example.com/containerd.example.com
   InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
-  NodeupConfigHash: hzTvph7znsVtrWF8kMVzd9KkRVVxAkIh8iwI1opkpOc=
+  NodeupConfigHash: IbWnsylBkuns1O0FeCv6hqFZZr8GssLWnQ2s1wC20mc=
 
   __EOF_KUBE_ENV
 

diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml
@@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
   ConfigBase: memfs://clusters.example.com/containerd.example.com
   InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
-  NodeupConfigHash: 86k3hZ7252xFKlmh7jHcb+lNqyKuksz7gVCnr1GDSfc=
+  NodeupConfigHash: Mhycic2EaD0gmrEvMSamFE4YZhi6tRjy5hj7PKhdX9E=
 
   __EOF_KUBE_ENV
 

diff --git a/...luster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/...luster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
@@ -240,7 +240,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/123.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: h8bP1p/uU9tjiG2m0gLnKantTlos4uy8RcrYQ1KlsYY=
+NodeupConfigHash: /Vg3DqqQYlfgGZpWkVHv5lF1On1cz2w8JqkO8fd7jac=
 
 __EOF_KUBE_ENV
 

diff --git a/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content b/...ject_manifests-etcdmanager-events_content → ...dmanager-events-master-us-test-1a_content
diff --git a/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content b/...object_manifests-etcdmanager-main_content → ...tcdmanager-main-master-us-test-1a_content
diff --git a/...ntegration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ntegration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -258,8 +258,8 @@ containerdConfig:
   logLevel: info
   version: 1.4.13
 etcdManifests:
-- memfs://clusters.example.com/123.example.com/manifests/etcd/main.yaml
-- memfs://clusters.example.com/123.example.com/manifests/etcd/events.yaml
+- memfs://clusters.example.com/123.example.com/manifests/etcd/main-master-us-test-1a.yaml
+- memfs://clusters.example.com/123.example.com/manifests/etcd/events-master-us-test-1a.yaml
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
diff --git a/tests/integration/update_cluster/digit/kubernetes.tf b/tests/integration/update_cluster/digit/kubernetes.tf
@@ -611,18 +611,18 @@ resource "aws_s3_object" "kops-version-txt" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-events" {
+resource "aws_s3_object" "manifests-etcdmanager-events-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events_content")
-  key                    = "clusters.example.com/123.example.com/manifests/etcd/events.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content")
+  key                    = "clusters.example.com/123.example.com/manifests/etcd/events-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "manifests-etcdmanager-main" {
+resource "aws_s3_object" "manifests-etcdmanager-main-master-us-test-1a" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main_content")
-  key                    = "clusters.example.com/123.example.com/manifests/etcd/main.yaml"
+  content                = file("${path.module}/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content")
+  key                    = "clusters.example.com/123.example.com/manifests/etcd/main-master-us-test-1a.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
@@ -261,7 +261,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
   ConfigBase: memfs://clusters.example.com/docker.example.com
   InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
-  NodeupConfigHash: X63Erwp16OybmfuTwCiDMDCIVoJXKa9cdUobNbuE77E=
+  NodeupConfigHash: /4aEDhd6ZvrR0+LJLuiuSVBMAkZtuMLSH2LNS13M26A=
 
   __EOF_KUBE_ENV