hack/update-expected.sh

2021-06-26 19:50:54 -07:00 · 2021-06-26 19:50:54 -07:00 · 7dfe9d82ab
parent e1df9f09dd
commit 7dfe9d82ab
97 changed files with 278 additions and 163 deletions
--- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml
+++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml
@ -62,7 +62,7 @@ contents: |
      - --requestheader-group-headers=X-Remote-Group
      - --requestheader-username-headers=X-Remote-User
      - --secure-port=443
-      - --service-account-key-file=/srv/kubernetes/service-account.pub
+      - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub
      - --service-cluster-ip-range=100.64.0.0/13
      - --storage-backend=etcd3
      - --tls-cert-file=/srv/kubernetes/server.crt
@ -226,6 +226,19 @@ owner: aws-iam-authenticator
 path: /srv/kubernetes/aws-iam-authenticator/key.pem
 type: file
 ---
+contents: |
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
+  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
+  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/service-account.pub
+type: file
+---
 contents:
  task:
    Name: kubelet-api
@ -248,19 +261,6 @@ mode: "0600"
 path: /srv/kubernetes/kubelet-api.key
 type: file
 ---
-contents: |
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
-  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
-  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-mode: "0600"
-path: /srv/kubernetes/service-account.pub
-type: file
---
 contents: ""
 ifNotExists: true
 mode: "0400"
--- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml
+++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml
@ -40,7 +40,7 @@ contents: |
      - --requestheader-group-headers=X-Remote-Group
      - --requestheader-username-headers=X-Remote-User
      - --secure-port=443
-      - --service-account-key-file=/srv/kubernetes/service-account.pub
+      - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub
      - --service-cluster-ip-range=100.64.0.0/13
      - --storage-backend=etcd3
      - --tls-cert-file=/srv/kubernetes/server.crt
@ -166,6 +166,19 @@ mode: "0755"
 path: /srv/kubernetes
 type: directory
 ---
+contents: |
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
+  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
+  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/service-account.pub
+type: file
+---
 contents:
  task:
    Name: kubelet-api
@ -188,19 +201,6 @@ mode: "0600"
 path: /srv/kubernetes/kubelet-api.key
 type: file
 ---
-contents: |
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
-  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
-  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-mode: "0600"
-path: /srv/kubernetes/service-account.pub
-type: file
---
 contents: ""
 ifNotExists: true
 mode: "0400"
--- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml
+++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml
@ -40,7 +40,7 @@ contents: |
      - --requestheader-group-headers=X-Remote-Group
      - --requestheader-username-headers=X-Remote-User
      - --secure-port=443
-      - --service-account-key-file=/srv/kubernetes/service-account.pub
+      - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub
      - --service-cluster-ip-range=100.64.0.0/13
      - --storage-backend=etcd3
      - --tls-cert-file=/srv/kubernetes/server.crt
@ -166,6 +166,19 @@ mode: "0755"
 path: /srv/kubernetes
 type: directory
 ---
+contents: |
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
+  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
+  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/service-account.pub
+type: file
+---
 contents:
  task:
    Name: kubelet-api
@ -188,19 +201,6 @@ mode: "0600"
 path: /srv/kubernetes/kubelet-api.key
 type: file
 ---
-contents: |
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
-  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
-  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-mode: "0600"
-path: /srv/kubernetes/service-account.pub
-type: file
---
 contents: ""
 ifNotExists: true
 mode: "0400"
--- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml
+++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml
@ -40,7 +40,7 @@ contents: |
      - --requestheader-group-headers=X-Remote-Group
      - --requestheader-username-headers=X-Remote-User
      - --secure-port=443
-      - --service-account-key-file=/srv/kubernetes/service-account.pub
+      - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub
      - --service-cluster-ip-range=100.64.0.0/13
      - --storage-backend=etcd3
      - --tls-cert-file=/srv/kubernetes/server.crt
@ -166,6 +166,19 @@ mode: "0755"
 path: /srv/kubernetes
 type: directory
 ---
+contents: |
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
+  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
+  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/service-account.pub
+type: file
+---
 contents:
  task:
    Name: kubelet-api
@ -188,19 +201,6 @@ mode: "0600"
 path: /srv/kubernetes/kubelet-api.key
 type: file
 ---
-contents: |
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
-  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
-  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-mode: "0600"
-path: /srv/kubernetes/service-account.pub
-type: file
---
 contents: ""
 ifNotExists: true
 mode: "0400"
--- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml
+++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml
@ -40,7 +40,7 @@ contents: |
      - --requestheader-group-headers=X-Remote-Group
      - --requestheader-username-headers=X-Remote-User
      - --secure-port=443
-      - --service-account-key-file=/srv/kubernetes/service-account.pub
+      - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub
      - --service-cluster-ip-range=100.64.0.0/13
      - --storage-backend=etcd3
      - --tls-cert-file=/srv/kubernetes/server.crt
@ -166,6 +166,19 @@ mode: "0755"
 path: /srv/kubernetes
 type: directory
 ---
+contents: |
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
+  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
+  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/service-account.pub
+type: file
+---
 contents:
  task:
    Name: kubelet-api
@ -188,19 +201,6 @@ mode: "0600"
 path: /srv/kubernetes/kubelet-api.key
 type: file
 ---
-contents: |
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
-  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
-  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-mode: "0600"
-path: /srv/kubernetes/service-account.pub
-type: file
---
 contents: ""
 ifNotExists: true
 mode: "0400"
--- a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml
+++ b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml
@ -39,7 +39,7 @@ contents: |
      - --requestheader-group-headers=X-Remote-Group
      - --requestheader-username-headers=X-Remote-User
      - --secure-port=443
-      - --service-account-key-file=/srv/kubernetes/service-account.pub
+      - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub
      - --service-cluster-ip-range=100.64.0.0/13
      - --storage-backend=etcd3
      - --tls-cert-file=/srv/kubernetes/server.crt
@ -165,6 +165,19 @@ mode: "0755"
 path: /srv/kubernetes
 type: directory
 ---
+contents: |
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
+  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+  -----BEGIN RSA PUBLIC KEY-----
+  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
+  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
+  -----END RSA PUBLIC KEY-----
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/service-account.pub
+type: file
+---
 contents:
  task:
    Name: kubelet-api
@ -187,19 +200,6 @@ mode: "0600"
 path: /srv/kubernetes/kubelet-api.key
 type: file
 ---
-contents: |
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm
-  XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-  -----BEGIN RSA PUBLIC KEY-----
-  MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF
-  Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ==
-  -----END RSA PUBLIC KEY-----
-mode: "0600"
-path: /srv/kubernetes/service-account.pub
-type: file
---
 contents: ""
 ifNotExists: true
 mode: "0400"
--- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
@ -78,6 +78,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml
@ -77,6 +77,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml
@ -77,6 +77,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml
@ -76,6 +76,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml
@ -519,6 +519,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml
@ -494,6 +494,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 ID: null
 Lifecycle: Sync
 Name: master-public-name
--- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml
@ -531,6 +531,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml
@ -453,6 +453,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml
@ -224,6 +224,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml
@ -250,6 +250,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml
@ -155,6 +155,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml
@ -181,6 +181,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml
@ -78,6 +78,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml
+++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml
@ -78,6 +78,14 @@ oldFormat: false
 subject: cn=kubernetes
 type: ca
 ---
+Lifecycle: ""
+Name: service-account
+Signer: null
+alternateNames: null
+oldFormat: false
+subject: cn=service-account
+type: ca
+---
 Base: null
 Contents:
  task:
--- a/pkg/model/tests/data/bootstrapscript_0.txt
+++ b/pkg/model/tests/data/bootstrapscript_0.txt
@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Master
-NodeupConfigHash: MzXsqZpAZ2tZ3xBPeZF8bbyK05tE4uj4oOA/vlWSja4=
+NodeupConfigHash: L9npiRTZoJ1W2sV9djQigAKS/Bg1SHddDfAZQ6CQAA4=

 __EOF_KUBE_ENV

--- a/pkg/model/tests/data/bootstrapscript_1.txt
+++ b/pkg/model/tests/data/bootstrapscript_1.txt
@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Master
-NodeupConfigHash: 4MBH6eVy/oDjfHW7iSgG2E2V85fj3cPHstBk0O/LrgA=
+NodeupConfigHash: vB51JBmy+BhFYBTDlPnoR0TB5D8VUdMQrHeNa5Lj1bU=

 __EOF_KUBE_ENV

--- a/pkg/model/tests/data/bootstrapscript_2.txt
+++ b/pkg/model/tests/data/bootstrapscript_2.txt
@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Master
-NodeupConfigHash: 4MBH6eVy/oDjfHW7iSgG2E2V85fj3cPHstBk0O/LrgA=
+NodeupConfigHash: vB51JBmy+BhFYBTDlPnoR0TB5D8VUdMQrHeNa5Lj1bU=

 __EOF_KUBE_ENV

--- a/pkg/model/tests/data/nodeupconfig_0.txt
+++ b/pkg/model/tests/data/nodeupconfig_0.txt
@ -1,6 +1,7 @@
 APIServerConfig:
  KubeAPIServer:
    image: CoreOS
+  ServiceAccountPublicKeys: ""
 CAs: {}
 FileAssets:
 - content: user,token
--- a/pkg/model/tests/data/nodeupconfig_1.txt
+++ b/pkg/model/tests/data/nodeupconfig_1.txt
@ -1,6 +1,7 @@
 APIServerConfig:
  KubeAPIServer:
    image: CoreOS
+  ServiceAccountPublicKeys: ""
 CAs: {}
 FileAssets:
 - content: blah blah
--- a/pkg/model/tests/data/nodeupconfig_2.txt
+++ b/pkg/model/tests/data/nodeupconfig_2.txt
@ -1,6 +1,7 @@
 APIServerConfig:
  KubeAPIServer:
    image: CoreOS
+  ServiceAccountPublicKeys: ""
 CAs: {}
 FileAssets:
 - content: blah blah
--- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
@ -163,7 +163,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La
  ConfigBase: memfs://clusters.example.com/minimal.example.com
  InstanceGroupName: apiserver
  InstanceGroupRole: APIServer
-  NodeupConfigHash: ZrF2nkmCyprnUDONifcSLPDX0tkrryjPRpJwONi6lUs=
+  NodeupConfigHash: FKeaqZnI/dOLrVy8lPWdvS2WvXhUhczI7Iu6lDciQYw=

  __EOF_KUBE_ENV

@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
  ConfigBase: memfs://clusters.example.com/minimal.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: U+9Aqc/eTytkCzRaERM+ywVrGNXGsseDBCXMn1VJGH8=
+  NodeupConfigHash: tTxzxFjI2kWmTVzywjnJCk1BKOWd28VXY3XooPHnF1k=

  __EOF_KUBE_ENV

--- 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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: lGtyFdBbcwNhryEa/VdzoQUM/f8LCiCEC/U5J+ZZ2Vw=
+NodeupConfigHash: GUtetdFfK2ik1zoZhCYKpdtrKcOSnzVSscEuiY9+t0E=

 __EOF_KUBE_ENV

--- 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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: gAsokkTnxR+hVH3VhKusaRU7e5Y1At8KaXeaSkOvV/I=
+NodeupConfigHash: 4SeJkVlFhQMg6cdt7qEb+eyViqJqhpK9V/TLPh8G95U=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@ -260,7 +260,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
  ConfigBase: memfs://clusters.example.com/complex.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: CAtSatueaxrWwrMDwFh5dqFBdS0FHQ9BINFrI7j5c8U=
+  NodeupConfigHash: fvdBgmEKdJZzmDzC5GVq2f0w589jGIZScvvfokIl5HI=

  __EOF_KUBE_ENV

--- 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
@ -259,7 +259,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: CAtSatueaxrWwrMDwFh5dqFBdS0FHQ9BINFrI7j5c8U=
+NodeupConfigHash: fvdBgmEKdJZzmDzC5GVq2f0w589jGIZScvvfokIl5HI=

 __EOF_KUBE_ENV

--- 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
@ -133,7 +133,7 @@ ensure-install-dir

 echo "H4sIAAAAAAAA/+xWTXPbNhC961dgppPJJSbFxE1bTg5V5LRWY6WslI9eIWBFoQIBZgFQVn99ZwFSH47VTKfHdjxjW7uLxe7btw8S2gY5tWat6nLEGN+5N6+X0+XsBlUHSCbGwPCVBlmyNdcORow13PAalt4ir2GquXPgSuYxwEhY47kygItgvGqgZAeLPDolJda2voMOdMmUWdsRYx2gU9aUrMius5cjacU2leC2qp0Z57nW/TVgBO5br6zpa2cmaD0CL+RUB+cBHR2EDox3qYtD9hfZdVa8iG0o87hvG1YwqWZLwB4ErrXdVag6paEmKGIVjHFjzb6xwU2C3xwB4q2aBKnACIi3XzHKiAY8uMx1IpOw5kH7FJqumdpgfMkKsgW/saj+5NTg3Eoo2UTv+N5NqIwRYytl5ERKBOdKNs7iz4ixOMwKbackYEnDHA3Tm8hGOeqx0qFWpq/qHW/AtVzAnVqD2AsN0XynGuUX3NSA8TMVqARMhKAao6kixJwH4z9aHRq44yvQ0XOTWjtlx6n9vdWAsbElCGtkcs6D516Z+lDmJ1htrN1G50eulbzsfmclLMB5VILSRtsCnA0o4LdgPScQvJAJ5r7zjfetK/O8eP5dhK8or8fj4jzy1w4QlRxGmCc2ffPo0ecjxlTDayjZ9nuX1QIzZXOa+hVvlUtE6orseREnRQ4NvkJYAyIMw3y/b4fbZsYDGq5nVfx4a503vEnzeXN/4juuEdWA8DmA8xvgEjDSBWSccsrK6xqh5t7iw9g39x75bfyXqlL3w5HfrxbQWA9XMeLq4bmf0YY2nXt4ILoexn9wVHoDjx8hLy08iIBQWfQlu75+ES2nFJw5F4jhwyh4qzLVA5YJ27QEZgb3vGk1kOGLDL98erv8sJj9gxS5bcEomXdF/sdu644Ze8GZVXFjSlaMx9nLa6JGHmXGpU14zcUWjCwjw5LETK3xaLUGnEdFPUiN4B6I1tPZzcIdxcZ7LjY3QL8XtDxCaVjujagAlZUlK5qxuyQDIlVJGVOJP7xMJRZHJxGFBPtR/EQU2oAwpfQLGzyJ/qB4F7gvDh1eNX2LxyXQiXga4t4mJT6xHfo+Z3hwcK5HUwQJxiuuB6jo6grt/b78auNtWCR2Rh/1uek3bdj+kj39ke/c08tNtvGqk75O6qWApdiADDqN90IOd4j5d/j0wlJefptETWvZv+/M7Z2HRh7sC2t9yfKvsOjm3fKE58X4xGPjqzp8zIjL+vAK3cAq1LUy9S03UtP6Dz1Al9T7lqMsWQONxX3GO640nXtVjMdz9cxYCWt3Zn4yGBX9dT8hwKtvnzyLKH8ROljPYv9+5IRnYn7FCcW845hrtcp7oPNjwBdMNeB3Frfpxe13yyhyWDPn7nMA5GnHz0WD4GytnHOj1uB8fzF4kR+/ReRN73WjhhPSb/8f/H9t8PSy1vQlDHuFoX6Hef8FAAD//wEAAP//MYvDU9kLAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml

-echo "H4sIAAAAAAAA/1TOUUvDMBQF4Pf8iryXrmwgmwEftuFsqbYiVNS3a3JrC0lvyE2q/nupe+rr4TuHc7aUzHOgeTQYlIRvFmea+vHrBIxKOnQ9q6LQNnHEwBv8AectbjS5QpPzAXkVimriCJPGh0DJN+CWEVi6eeI8Isd8C2v0QhaVfPpHoiGDyV8vlMCDknVb2+xwW3WX4z477s3HZfc5dm+uZJwft++n4f637W6yavd6uBN/AAAA//8BAAD//2VQaETPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/1TOwU6GMBAE4Hufoi/AX7mQ2MSLGJEoiFw8b8oWMS1bui34+AY9cZ18M5naUZ6GSPsyYdQSDhY1rXaZH4FRS4/eslbKuMwJI9/wB3xweDPklSEfIvIlFO3KCVaDTaQcevDnCJzdInORkFNRwhWN5FDL7g+JnibM4f/CC/CXlmXz/e78XYw127bdbPWqCHJlt3k0H3tjP5/etuq574b740H8AgAA//8BAAD//3cHslLPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml

 download-release
 echo "== nodeup node config done =="
--- 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: RFRWeCrxsIBpecKChkCyG0rxpVjp6LxPHZX5UtCsm58=
+  NodeupConfigHash: Sq0I5pz2L+2D73CjmoeIB/9z1oUeLwslx87/2iK4eJo=

  __EOF_KUBE_ENV

--- 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: UWazbJsRi0FofksMBKFY2u7RglBuWM6/4LmRFsUZH7A=
+  NodeupConfigHash: uuHLQ7LEBXbqgo/6XZAPlzKeDK9RdXNals0+fxnVQRk=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
@ -263,7 +263,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
  ConfigBase: memfs://clusters.example.com/docker.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: js/DOzyNEfbR1/cJDZFjZARgU7awwly60yL7G4DxhGU=
+  NodeupConfigHash: IZcM9ZumsH5eSiiW8bXlbD1u+j7lZSDcjoB8A8HLvPk=

  __EOF_KUBE_ENV

--- 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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0=
+NodeupConfigHash: ijOrtG5JsHgxXWvIz08I7kb04wa/op1xEDuM6oF4AWk=

 __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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: Master
-NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0=
+NodeupConfigHash: ijOrtG5JsHgxXWvIz08I7kb04wa/op1xEDuM6oF4AWk=

 __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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: Master
-NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0=
+NodeupConfigHash: ijOrtG5JsHgxXWvIz08I7kb04wa/op1xEDuM6oF4AWk=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
  ConfigBase: memfs://clusters.example.com/minimal.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE=
+  NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo=

  __EOF_KUBE_ENV

--- 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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA=
+NodeupConfigHash: bBHYG3NWErmR1E2THGXxUYh+736/VPsJZbOAzkUaKDA=

 __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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: Master
-NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA=
+NodeupConfigHash: bBHYG3NWErmR1E2THGXxUYh+736/VPsJZbOAzkUaKDA=

 __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
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: Master
-NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA=
+NodeupConfigHash: bBHYG3NWErmR1E2THGXxUYh+736/VPsJZbOAzkUaKDA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti
  ConfigBase: memfs://clusters.example.com/externallb.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: AlFC8wy99SsvC1VbRgtiwOVsKJF64x2/o6QrMW8Hv/Q=
+  NodeupConfigHash: XjxRgkih3TUUmgjQjNJJ/8b2mCbIf8kXQ1qle6ZxIAc=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
+++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/externallb.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: AlFC8wy99SsvC1VbRgtiwOVsKJF64x2/o6QrMW8Hv/Q=
+NodeupConfigHash: XjxRgkih3TUUmgjQjNJJ/8b2mCbIf8kXQ1qle6ZxIAc=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
@ -246,7 +246,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/externalpolicies.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: hopn1N2w/d1DC0i4oB1SEUAiZgA2Ios26BOJAbnMtY0=
+NodeupConfigHash: DHNc4ru6B1/N/vyTrkKAdephpBwUM8dm7/cy5xk4D+w=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
+++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU=
+NodeupConfigHash: P1aR3ZEi0agPY9otd70azdS2HHfkowgL1rlaYVacN4o=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
+++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: Master
-NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU=
+NodeupConfigHash: P1aR3ZEi0agPY9otd70azdS2HHfkowgL1rlaYVacN4o=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
+++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: Master
-NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU=
+NodeupConfigHash: P1aR3ZEi0agPY9otd70azdS2HHfkowgL1rlaYVacN4o=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
@ -245,7 +245,7 @@ CloudProvider: gce
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: Master
-NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M=
+NodeupConfigHash: MzIcPf5bm65emH0rC70EKM77eI6uG3GJhfrHgafhkT8=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
@ -245,7 +245,7 @@ CloudProvider: gce
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-b
 InstanceGroupRole: Master
-NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M=
+NodeupConfigHash: MzIcPf5bm65emH0rC70EKM77eI6uG3GJhfrHgafhkT8=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
@ -245,7 +245,7 @@ CloudProvider: gce
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-c
 InstanceGroupRole: Master
-NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M=
+NodeupConfigHash: MzIcPf5bm65emH0rC70EKM77eI6uG3GJhfrHgafhkT8=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/irsa/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: rv6TrPQKtrMb/K0NDdArz7J9SL/cX9qmZ5L+smi3ipY=
+NodeupConfigHash: hg3B2NPa/EF93K1qBzwPizWyXldYa+5ubf39Q5Uk6t4=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -252,7 +252,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: PACgJGDzNeR50goziPahdsTOGbCfchODtRpGpnfB2D8=
+NodeupConfigHash: ln7bIlLHHQFmg6Zb3FO2RKQma/CI1qtw17XgGc3o/qU=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml
@ -261,7 +261,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert
  ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: l/xI57IEaF993tGMaoFVIaymP3M01cZxEI7Wr+GweAw=
+  NodeupConfigHash: GaR1NvHcan/TYk50u3CSMboThzKascwLmIiUYnHYl7o=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml
@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
  ConfigBase: memfs://clusters.example.com/minimal.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE=
+  NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -250,7 +250,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE=
+NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml
@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert
  ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: IjTy8kBQot33WJvAaerH9tKCW6xbPl+y2JZGvdtsD3k=
+  NodeupConfigHash: P/NyVuDBHbEjsjc2b4aB86Lvn7+F6HYawQcf+vu2H2I=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: IjTy8kBQot33WJvAaerH9tKCW6xbPl+y2JZGvdtsD3k=
+NodeupConfigHash: P/NyVuDBHbEjsjc2b4aB86Lvn7+F6HYawQcf+vu2H2I=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal-json.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: flLgsUDRbjCmUHf76HMfve2Nm8iNq/RCmAyl8X00F+U=
+NodeupConfigHash: D1GfC6ZTtM+f7JEWvxvwmHduPUBCOniEksTcBYQ/Fy8=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
@ -253,7 +253,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: GPSqfzNFYOcMyOpXH/4i/0CcADXtCzn0B0okcxR31zg=
+NodeupConfigHash: MYFIg34AcC89M1I2DI0sadoxyUy/sZYhV9CVZsJEv1o=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml
@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
  ConfigBase: memfs://clusters.example.com/minimal.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE=
+  NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal/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: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE=
+NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
@ -245,7 +245,7 @@ CloudProvider: gce
 ConfigBase: memfs://tests/minimal-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: Master
-NodeupConfigHash: n3PWi1Op01/UaMsxGcSr+EUWnPtGVltFjrYQiM4JxiY=
+NodeupConfigHash: RrcEnJWcbxqxB1TbUqhS49YsSaP3ea6hHPxr+tbHM3A=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script
@ -245,7 +245,7 @@ CloudProvider: gce
 ConfigBase: memfs://tests/minimal-gce-private.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: Master
-NodeupConfigHash: NGeDqbCK2rRtB9jRcoPuxPz7DVsJA2IZuP72YikfKOY=
+NodeupConfigHash: zKoRWQXy4joQiuqKVTpTsUK2pAdlST7Jt1s8rstxamY=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: RXfAaBCifiIl+YHXHi8o7+ALaEaqqiBoJaGXP2QnbKc=
+NodeupConfigHash: d1E5kcA97aLLb6+f1czZUGjNbZfACSs2tedsNXh4/DI=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml
@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop
  ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+  NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

  __EOF_KUBE_ENV

@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop
  ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
  InstanceGroupName: master-us-test-1b
  InstanceGroupRole: Master
-  NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+  NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

  __EOF_KUBE_ENV

@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop
  ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
  InstanceGroupName: master-us-test-1c
  InstanceGroupRole: Master
-  NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+  NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: Master
-NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: Master
-NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml
@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop
  ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+  NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

  __EOF_KUBE_ENV

@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop
  ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
  InstanceGroupName: master-us-test-1b
  InstanceGroupRole: Master
-  NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+  NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

  __EOF_KUBE_ENV

@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop
  ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
  InstanceGroupName: master-us-test-1c
  InstanceGroupRole: Master
-  NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+  NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: Master
-NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: Master
-NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8=
+NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml
@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro
  ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: Dk1aAD6LyilDH5Y2d75Rb5+GkIlGz8dog5kNHOv8IQM=
+  NodeupConfigHash: JunA8N0Cr4NpTSOdG+99oNWhBV1JnN/h6nw5CFnhMTU=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data
+++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: Dk1aAD6LyilDH5Y2d75Rb5+GkIlGz8dog5kNHOv8IQM=
+NodeupConfigHash: JunA8N0Cr4NpTSOdG+99oNWhBV1JnN/h6nw5CFnhMTU=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml
@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro
  ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: D94uzEMmvqyZi+pnRvwwYXqNwWMLCC4jTeIqxGkqwCQ=
+  NodeupConfigHash: p/b3vD1+APIro3lpHZS933MMJfpurNX7TLow6zqhuis=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: D94uzEMmvqyZi+pnRvwwYXqNwWMLCC4jTeIqxGkqwCQ=
+NodeupConfigHash: p/b3vD1+APIro3lpHZS933MMJfpurNX7TLow6zqhuis=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: M2RmIUPdS4QNZXpbcfpUTnmUpAKO700xyqkAK4ufkR4=
+NodeupConfigHash: tqw10j8p35yO2Uj0JC7tR2ZgWqCYt8OEEm9pvwBGMng=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml
@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope
  ConfigBase: memfs://clusters.example.com/privatecalico.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: qFC+IuNZdaczWOal4TveEvxfptUfR2I5yxnkj1EySOY=
+  NodeupConfigHash: GRk8SK1PWlrP4xOfhiwVZw+/BhuYh2qaDgIJarrydWQ=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
+++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privatecalico.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: qFC+IuNZdaczWOal4TveEvxfptUfR2I5yxnkj1EySOY=
+NodeupConfigHash: GRk8SK1PWlrP4xOfhiwVZw+/BhuYh2qaDgIJarrydWQ=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
+++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privatecanal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: c22OPNrkShxP1eWNimqV+aP5qPp4wo1LLT9OMTTdST0=
+NodeupConfigHash: NbGfE0uRvjJES5vLncpaL0EKiaE/kW2cUWgIPtNfW8U=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml
@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope
  ConfigBase: memfs://clusters.example.com/privatecilium.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: Tw9bYLgB6YLLejylOQLmNpF1EuSK2LIUjv0lWym3mAo=
+  NodeupConfigHash: YayOD0Woh/ErwF9kHnc0K4QqJ5BLHrvhIO83mpOLXcg=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: Tw9bYLgB6YLLejylOQLmNpF1EuSK2LIUjv0lWym3mAo=
+NodeupConfigHash: YayOD0Woh/ErwF9kHnc0K4QqJ5BLHrvhIO83mpOLXcg=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml
@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope
  ConfigBase: memfs://clusters.example.com/privatecilium.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: znwb+ZgMChUtCkn8yFP9Zr0EukREtfZ+q2Qp0tuAohs=
+  NodeupConfigHash: HNd0g/LrG5x+dqeSF60Yr8OroENrgb4dBMJCHvyW2Nw=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@ -249,7 +249,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: znwb+ZgMChUtCkn8yFP9Zr0EukREtfZ+q2Qp0tuAohs=
+NodeupConfigHash: HNd0g/LrG5x+dqeSF60Yr8OroENrgb4dBMJCHvyW2Nw=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml
@ -249,7 +249,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec
  ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com
  InstanceGroupName: master-us-test-1a
  InstanceGroupRole: Master
-  NodeupConfigHash: pYq/8Yzhuk0H1T8z4ZJNM0E344Xeym7LxR6myrhYwB4=
+  NodeupConfigHash: pp7l8itnmWpr1UA+gD/iEhNlE/YdbeFhGe8C4XcqPWk=

  __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
@ -247,7 +247,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: pYq/8Yzhuk0H1T8z4ZJNM0E344Xeym7LxR6myrhYwB4=
+NodeupConfigHash: pp7l8itnmWpr1UA+gD/iEhNlE/YdbeFhGe8C4XcqPWk=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data
+++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privatedns1.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: avrRY1Li5dJl6Ak8bLy/8RR6ALBUdKxdR7ZxGe/vkBo=
+NodeupConfigHash: YNIao1w1/Plkq0H/MPa415c9GbAJQ6VAU0JMHzQRnDc=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data
+++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privatedns2.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: ycTJyrGJ+JTIF0wuWPkksO53deGB3r8i328cFfwW0NE=
+NodeupConfigHash: e0GeFulEbRktZoGZPM0P0P2EKqtMvfWVUpEENh8bOEc=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data
+++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privateflannel.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: +wKlmNU4hK+/BBb2Na/RdFrZbIDEAewWY8gFSxDQ3c8=
+NodeupConfigHash: cd4WeAU+zD0yXWS/DMzuUc+EGv3zzxkcPXAShYnByls=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privatekopeio.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: u022yLElmlcCakyX+gEMqcAbpaNuL72bNwebu3m/pA4=
+NodeupConfigHash: 0X8CrPxiDLo18M4mMOo9WlSuT6TFeljRNptvPKG5u58=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data
+++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/privateweave.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: e26rBO+7Vl7eQjrQGdVtNdN2t2s5j/djMjFciIL6h94=
+NodeupConfigHash: ewVIbSaZfYLqmziqck2XzZ1H4SL6Rzwz/Ouh25COjx4=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -255,7 +255,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: jBmt6+uYZs1qpzVq5VzRUS3jxBsi/8K6RatUARK94yM=
+NodeupConfigHash: rivR2kusU0Xv4BjHDfzEOEwM0jFh2pWvOgBTRVknH+Q=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: iJEQ9arhOSa/j3LE/ctKHja9dRoQclnqwgF2Lco5D/k=
+NodeupConfigHash: pClweOjfZJ6M9Cw98uZ7S1BWzhVBcCUubg61A+dvy5g=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/sharedvpc.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: VZeijGPu2v0SYh3YKhbVpkIaLD41hn3o4/3/kfN7/1U=
+NodeupConfigHash: c4GTatkK+m64E8xkAC371CalFrXMF7N5ymIngYeApc0=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data
+++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data
@ -244,7 +244,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/unmanaged.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: ZaQNHe78707sLO1OKxJcEfRnNVAfWL1XbioeuZazc1Y=
+NodeupConfigHash: LIkEENWVd+eT2Mer5213Pz+QfcOAQmv5+adMgwJUveA=

 __EOF_KUBE_ENV

--- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/vfs-said/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: lGtyFdBbcwNhryEa/VdzoQUM/f8LCiCEC/U5J+ZZ2Vw=
+NodeupConfigHash: GUtetdFfK2ik1zoZhCYKpdtrKcOSnzVSscEuiY9+t0E=

 __EOF_KUBE_ENV