hack/update-expected.sh

nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml

@@ -194,6 +194,7 @@ contents:
     alternateNames:
     - localhost
     - 127.0.0.1
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: aws-iam-authenticator
@@ -210,6 +211,7 @@ contents:
     alternateNames:
     - localhost
     - 127.0.0.1
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: aws-iam-authenticator
@@ -232,6 +234,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -243,6 +246,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -259,6 +263,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -270,6 +275,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -294,6 +300,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -305,6 +312,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -320,6 +328,7 @@ path: /var/log/kube-apiserver.log
 type: file
 ---
 Name: apiserver-aggregator
+keypairID: ""
 signer: apiserver-aggregator-ca
 subject:
   CommonName: aggregator
@@ -329,18 +338,21 @@ Name: aws-iam-authenticator
 alternateNames:
 - localhost
 - 127.0.0.1
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: aws-iam-authenticator
 type: server
 ---
 Name: etcd-client
+keypairID: ""
 signer: etcd-clients-ca
 subject:
   CommonName: kube-apiserver
 type: client
 ---
 Name: kubelet-api
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubelet-api

nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml

@@ -172,6 +172,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -183,6 +184,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -199,6 +201,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -210,6 +213,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -234,6 +238,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -245,6 +250,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -260,18 +266,21 @@ path: /var/log/kube-apiserver.log
 type: file
 ---
 Name: apiserver-aggregator
+keypairID: ""
 signer: apiserver-aggregator-ca
 subject:
   CommonName: aggregator
 type: client
 ---
 Name: etcd-client
+keypairID: ""
 signer: etcd-clients-ca
 subject:
   CommonName: kube-apiserver
 type: client
 ---
 Name: kubelet-api
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubelet-api

nodeup/pkg/model/tests/golden/minimal/tasks-kops-controller.yaml

@@ -7,6 +7,7 @@ contents:
     Name: kops-controller
     alternateNames:
     - kops-controller.internal.minimal.example.com
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kops-controller
@@ -21,6 +22,7 @@ contents:
     Name: kops-controller
     alternateNames:
     - kops-controller.internal.minimal.example.com
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kops-controller
@@ -90,6 +92,7 @@ type: file
 Name: kops-controller
 alternateNames:
 - kops-controller.internal.minimal.example.com
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kops-controller

nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml

@@ -172,6 +172,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -183,6 +184,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -199,6 +201,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -210,6 +213,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -234,6 +238,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -245,6 +250,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -260,18 +266,21 @@ path: /var/log/kube-apiserver.log
 type: file
 ---
 Name: apiserver-aggregator
+keypairID: ""
 signer: apiserver-aggregator-ca
 subject:
   CommonName: aggregator
 type: client
 ---
 Name: etcd-client
+keypairID: ""
 signer: etcd-clients-ca
 subject:
   CommonName: kube-apiserver
 type: client
 ---
 Name: kubelet-api
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubelet-api

nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml

@@ -219,6 +219,7 @@ contents:
     CA:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -226,6 +227,7 @@ contents:
     Cert:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -233,6 +235,7 @@ contents:
     Key:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -250,6 +253,7 @@ path: /var/log/kube-controller-manager.log
 type: file
 ---
 Name: kube-controller-manager
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-controller-manager
@@ -258,6 +262,7 @@ type: client
 CA:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager
@@ -265,6 +270,7 @@ CA:
 Cert:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager
@@ -272,6 +278,7 @@ Cert:
 Key:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager

nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml

@@ -79,6 +79,7 @@ contents:
     CA:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -86,6 +87,7 @@ contents:
     Cert:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -93,6 +95,7 @@ contents:
     Key:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -110,6 +113,7 @@ path: /var/log/kube-proxy.log
 type: file
 ---
 Name: kube-proxy
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-proxy
@@ -118,6 +122,7 @@ type: client
 CA:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy
@@ -125,6 +130,7 @@ CA:
 Cert:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy
@@ -132,6 +138,7 @@ Cert:
 Key:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy

nodeup/pkg/model/tests/golden/minimal/tasks-kube-scheduler.yaml

@@ -68,6 +68,7 @@ contents:
     CA:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -75,6 +76,7 @@ contents:
     Cert:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -82,6 +84,7 @@ contents:
     Key:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -99,6 +102,7 @@ path: /var/log/kube-scheduler.log
 type: file
 ---
 Name: kube-scheduler
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-scheduler
@@ -107,6 +111,7 @@ type: client
 CA:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler
@@ -114,6 +119,7 @@ CA:
 Cert:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler
@@ -121,6 +127,7 @@ Cert:
 Key:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler

nodeup/pkg/model/tests/golden/minimal/tasks-kubectl.yaml

@@ -11,6 +11,7 @@ contents:
     CA:
       task:
         Name: kubecfg
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: kubecfg
@@ -20,6 +21,7 @@ contents:
     Cert:
       task:
         Name: kubecfg
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: kubecfg
@@ -29,6 +31,7 @@ contents:
     Key:
       task:
         Name: kubecfg
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: kubecfg
@@ -42,6 +45,7 @@ path: /var/lib/kubectl/kubeconfig
 type: file
 ---
 Name: kubecfg
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubecfg
@@ -52,6 +56,7 @@ type: client
 CA:
   task:
     Name: kubecfg
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubecfg
@@ -61,6 +66,7 @@ CA:
 Cert:
   task:
     Name: kubecfg
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubecfg
@@ -70,6 +76,7 @@ Cert:
 Key:
   task:
     Name: kubecfg
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubecfg

nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml

@@ -48,6 +48,7 @@ contents:
     - 100.64.0.1
     - 127.0.0.1
     includeRootCertificate: true
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubernetes-master
@@ -69,6 +70,7 @@ contents:
     - 100.64.0.1
     - 127.0.0.1
     includeRootCertificate: true
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubernetes-master
@@ -88,6 +90,7 @@ alternateNames:
 - 100.64.0.1
 - 127.0.0.1
 includeRootCertificate: true
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubernetes-master

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml

@@ -172,6 +172,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -183,6 +184,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -199,6 +201,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -210,6 +213,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -234,6 +238,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -245,6 +250,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -260,18 +266,21 @@ path: /var/log/kube-apiserver.log
 type: file
 ---
 Name: apiserver-aggregator
+keypairID: ""
 signer: apiserver-aggregator-ca
 subject:
   CommonName: aggregator
 type: client
 ---
 Name: etcd-client
+keypairID: ""
 signer: etcd-clients-ca
 subject:
   CommonName: kube-apiserver
 type: client
 ---
 Name: kubelet-api
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubelet-api

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml

@@ -172,6 +172,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -183,6 +184,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -199,6 +201,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -210,6 +213,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -234,6 +238,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -245,6 +250,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -260,18 +266,21 @@ path: /var/log/kube-apiserver.log
 type: file
 ---
 Name: apiserver-aggregator
+keypairID: ""
 signer: apiserver-aggregator-ca
 subject:
   CommonName: aggregator
 type: client
 ---
 Name: etcd-client
+keypairID: ""
 signer: etcd-clients-ca
 subject:
   CommonName: kube-apiserver
 type: client
 ---
 Name: kubelet-api
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubelet-api

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml

@@ -219,6 +219,7 @@ contents:
     CA:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -226,6 +227,7 @@ contents:
     Cert:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -233,6 +235,7 @@ contents:
     Key:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -250,6 +253,7 @@ path: /var/log/kube-controller-manager.log
 type: file
 ---
 Name: kube-controller-manager
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-controller-manager
@@ -258,6 +262,7 @@ type: client
 CA:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager
@@ -265,6 +270,7 @@ CA:
 Cert:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager
@@ -272,6 +278,7 @@ Cert:
 Key:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml

@@ -219,6 +219,7 @@ contents:
     CA:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -226,6 +227,7 @@ contents:
     Cert:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -233,6 +235,7 @@ contents:
     Key:
       task:
         Name: kube-controller-manager
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-controller-manager
@@ -250,6 +253,7 @@ path: /var/log/kube-controller-manager.log
 type: file
 ---
 Name: kube-controller-manager
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-controller-manager
@@ -258,6 +262,7 @@ type: client
 CA:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager
@@ -265,6 +270,7 @@ CA:
 Cert:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager
@@ -272,6 +278,7 @@ Cert:
 Key:
   task:
     Name: kube-controller-manager
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-controller-manager

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-amd64.yaml

@@ -79,6 +79,7 @@ contents:
     CA:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -86,6 +87,7 @@ contents:
     Cert:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -93,6 +95,7 @@ contents:
     Key:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -110,6 +113,7 @@ path: /var/log/kube-proxy.log
 type: file
 ---
 Name: kube-proxy
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-proxy
@@ -118,6 +122,7 @@ type: client
 CA:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy
@@ -125,6 +130,7 @@ CA:
 Cert:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy
@@ -132,6 +138,7 @@ Cert:
 Key:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-arm64.yaml

@@ -79,6 +79,7 @@ contents:
     CA:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -86,6 +87,7 @@ contents:
     Cert:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -93,6 +95,7 @@ contents:
     Key:
       task:
         Name: kube-proxy
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-proxy
@@ -110,6 +113,7 @@ path: /var/log/kube-proxy.log
 type: file
 ---
 Name: kube-proxy
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-proxy
@@ -118,6 +122,7 @@ type: client
 CA:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy
@@ -125,6 +130,7 @@ CA:
 Cert:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy
@@ -132,6 +138,7 @@ Cert:
 Key:
   task:
     Name: kube-proxy
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-proxy

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-scheduler-amd64.yaml

@@ -68,6 +68,7 @@ contents:
     CA:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -75,6 +76,7 @@ contents:
     Cert:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -82,6 +84,7 @@ contents:
     Key:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -99,6 +102,7 @@ path: /var/log/kube-scheduler.log
 type: file
 ---
 Name: kube-scheduler
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-scheduler
@@ -107,6 +111,7 @@ type: client
 CA:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler
@@ -114,6 +119,7 @@ CA:
 Cert:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler
@@ -121,6 +127,7 @@ Cert:
 Key:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-scheduler-arm64.yaml

@@ -68,6 +68,7 @@ contents:
     CA:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -75,6 +76,7 @@ contents:
     Cert:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -82,6 +84,7 @@ contents:
     Key:
       task:
         Name: kube-scheduler
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: system:kube-scheduler
@@ -99,6 +102,7 @@ path: /var/log/kube-scheduler.log
 type: file
 ---
 Name: kube-scheduler
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: system:kube-scheduler
@@ -107,6 +111,7 @@ type: client
 CA:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler
@@ -114,6 +119,7 @@ CA:
 Cert:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler
@@ -121,6 +127,7 @@ Cert:
 Key:
   task:
     Name: kube-scheduler
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: system:kube-scheduler

nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml

@@ -171,6 +171,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -182,6 +183,7 @@ type: file
 contents:
   task:
     Name: apiserver-aggregator
+    keypairID: ""
     signer: apiserver-aggregator-ca
     subject:
       CommonName: aggregator
@@ -198,6 +200,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -209,6 +212,7 @@ type: file
 contents:
   task:
     Name: etcd-client
+    keypairID: ""
     signer: etcd-clients-ca
     subject:
       CommonName: kube-apiserver
@@ -233,6 +237,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -244,6 +249,7 @@ type: file
 contents:
   task:
     Name: kubelet-api
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kubelet-api
@@ -259,18 +265,21 @@ path: /var/log/kube-apiserver.log
 type: file
 ---
 Name: apiserver-aggregator
+keypairID: ""
 signer: apiserver-aggregator-ca
 subject:
   CommonName: aggregator
 type: client
 ---
 Name: etcd-client
+keypairID: ""
 signer: etcd-clients-ca
 subject:
   CommonName: kube-apiserver
 type: client
 ---
 Name: kubelet-api
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kubelet-api

nodeup/pkg/model/tests/protokube/tasks-protokube.yaml

@@ -24,6 +24,7 @@ contents:
     CA:
       task:
         Name: kops
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: kops
@@ -33,6 +34,7 @@ contents:
     Cert:
       task:
         Name: kops
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: kops
@@ -42,6 +44,7 @@ contents:
     Key:
       task:
         Name: kops
+        keypairID: "3"
         signer: kubernetes-ca
         subject:
           CommonName: kops
@@ -55,6 +58,7 @@ path: /var/lib/kops/kubeconfig
 type: file
 ---
 Name: kops
+keypairID: "3"
 signer: kubernetes-ca
 subject:
   CommonName: kops
@@ -65,6 +69,7 @@ type: client
 CA:
   task:
     Name: kops
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kops
@@ -74,6 +79,7 @@ CA:
 Cert:
   task:
     Name: kops
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kops
@@ -83,6 +89,7 @@ Cert:
 Key:
   task:
     Name: kops
+    keypairID: "3"
     signer: kubernetes-ca
     subject:
       CommonName: kops

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: uyxw2QanaxrAyTUMA6EDpzkUiyyKtGgpHZrmzW9MF5Y=
+  NodeupConfigHash: 1L6pI3cv8FEHcP1HKDNkdp9s+FzdakJ9Z49uvbwX+Cg=
 
   __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: KBozjKWIT5RV02kzo6rSvQfYQ73jyPDSApqfyg9E1OE=
+  NodeupConfigHash: LSL2sF5rz7LA14+RQiG6AeVjGFcKIwviDDXa4lsU23M=
 
   __EOF_KUBE_ENV
 

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: 3m0TihmabfHydii80nmac7Irnyfk+xv26p+62zf+H20=
+NodeupConfigHash: xv0/O9KF/H6k4K1J2+N3jxANywRcfPjPmFYjMOUTMIE=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: EP79BKlgvRMGBAm4LXU10tdowJNK8Dhy9plSYDjZMzQ=
+NodeupConfigHash: g5R6SgCW4Q7B3oXIWFi96RAzXnJI0KhqjoOLCpPujt0=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: aR6/gCas//cB6aSxSoWWUgGfKbYTJjQiE5oSTZ6bs58=
+  NodeupConfigHash: gu+MweUpysnfzbItJjvIrpb/vkb7/X1keL7DClRhoH0=
 
   __EOF_KUBE_ENV
 

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: aR6/gCas//cB6aSxSoWWUgGfKbYTJjQiE5oSTZ6bs58=
+NodeupConfigHash: gu+MweUpysnfzbItJjvIrpb/vkb7/X1keL7DClRhoH0=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -229,6 +229,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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/1TOzU7DMBAE4Lufwi+QplRCRZY4lBJ+JKhcDpXgtjjb1Io3a7w2yeOj0FOuo29Gsw9cWpv417eYjIZR1J6Hs+8eQNBoQjqLqWsXimRMssIJKAZcOabaMcWEsgjV6yAZBofPiUs8AM0jMHerIlVGydUNLNEHBzT6/R+pA7dY4vXCC8jF6NEfd4/r4w/feSsbuu3Xl21HZQent63tvzu7aZqn09eUP5t79QcAAP//AQAA//8UHNlZzwAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/1TOsU7EMBAE0N5f4R/ImVwBkiUaDkIAJQIKiusWe3ME2V7j9ULg61GgSjt6M5pDIPGPhT5nj8Vq+GJ1oDTNpytgtDpinNga44JwxcI7XCDmgDtH0TiKuSBvQnWXuEJyeFtI8ghxHYG12wg3Fbk2LWzRMwW0evhDaiSPkv8v9MBvVh+7miWZY/v02n/cSzfup/5n3/H7w/LdklycD9f+rN68wGm4VL8AAAD//wEAAP//43crcM8AAAA=" | base64 -d | gzip -d > conf/kube_env.yaml
 
 download-release
 echo "== nodeup node config done =="

tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: D8ZatkSJhO0kShbDZ7xKtdA2xor1d6SK3a3Rfs3HhUA=
+  NodeupConfigHash: H3ikhJycngscsQ4QTON+o4E+ahxY3wlfVDEqie+jOf0=
 
   __EOF_KUBE_ENV
 

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: kwu0YqIcc5eKz6NysUQ1Le8Fqt7PH4BplfJiklzvOCs=
+  NodeupConfigHash: nXDp86P9RdMSSSF/NXkUMgn8sfSWHuLbQ6hQW0tWfSs=
 
   __EOF_KUBE_ENV
 

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: TfZGDw3iiaRxHwVY1pkcET3l4TWwrcyG7CCxWZjQDs0=
+  NodeupConfigHash: imk1UXoCCs6yiCc1fQQkdx0kEvXA0OMpylH1JztAa+w=
 
   __EOF_KUBE_ENV
 

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: DQR5kzzU7etNvPPGUfeut4+mAK89QMhd/403v9gm1Fk=
+NodeupConfigHash: WCiHimrXQRF7h/kxAAJ/xErYfG+vNxkKV96HAQvhito=
 
 __EOF_KUBE_ENV
 

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: DQR5kzzU7etNvPPGUfeut4+mAK89QMhd/403v9gm1Fk=
+NodeupConfigHash: WCiHimrXQRF7h/kxAAJ/xErYfG+vNxkKV96HAQvhito=
 
 __EOF_KUBE_ENV
 

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: DQR5kzzU7etNvPPGUfeut4+mAK89QMhd/403v9gm1Fk=
+NodeupConfigHash: WCiHimrXQRF7h/kxAAJ/xErYfG+vNxkKV96HAQvhito=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4=
+  NodeupConfigHash: Lw8puckdB6AgGqcJiSlnCTEPT/1EDrYxw6yF8u6Zusw=
 
   __EOF_KUBE_ENV
 

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: AMwFCjGNNlzHM/+ZNTLBB56kk7gBiw2p1zfWrNkWYsg=
+NodeupConfigHash: uKX1G20lPuzt2fuXVHmkvwOJhDND/1+ziGQE0UJWBy4=
 
 __EOF_KUBE_ENV
 

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: AMwFCjGNNlzHM/+ZNTLBB56kk7gBiw2p1zfWrNkWYsg=
+NodeupConfigHash: uKX1G20lPuzt2fuXVHmkvwOJhDND/1+ziGQE0UJWBy4=
 
 __EOF_KUBE_ENV
 

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: AMwFCjGNNlzHM/+ZNTLBB56kk7gBiw2p1zfWrNkWYsg=
+NodeupConfigHash: uKX1G20lPuzt2fuXVHmkvwOJhDND/1+ziGQE0UJWBy4=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: vYvcWAlVg2hKC/Reom/9jbtatVHUOusGiiTHXNRaomo=
+  NodeupConfigHash: lXtVy+bzVqyQcE4WlNUOW2ZHj1eqGTyjUjj4FCPwDrs=
 
   __EOF_KUBE_ENV
 

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: vYvcWAlVg2hKC/Reom/9jbtatVHUOusGiiTHXNRaomo=
+NodeupConfigHash: lXtVy+bzVqyQcE4WlNUOW2ZHj1eqGTyjUjj4FCPwDrs=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: GFs06Sn4Zf+FTafagmLEc5CduMWJlxuYlTeM3bkrupA=
+NodeupConfigHash: bmURwPTHyE17b7BJgYiy3UOm48GqhHJMcRqmtGJsmps=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -225,6 +225,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: 8cG85jAw4RMzjhjw9lP8ak7vWVFXfcWH/OBhvN1o/+w=
+NodeupConfigHash: DLbGpu6PIQRRUzRudJobQVhmtjzqI//Y95mjMm1qNVA=
 
 __EOF_KUBE_ENV
 

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: 8cG85jAw4RMzjhjw9lP8ak7vWVFXfcWH/OBhvN1o/+w=
+NodeupConfigHash: DLbGpu6PIQRRUzRudJobQVhmtjzqI//Y95mjMm1qNVA=
 
 __EOF_KUBE_ENV
 

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: 8cG85jAw4RMzjhjw9lP8ak7vWVFXfcWH/OBhvN1o/+w=
+NodeupConfigHash: DLbGpu6PIQRRUzRudJobQVhmtjzqI//Y95mjMm1qNVA=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content

@@ -225,6 +225,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content

@@ -225,6 +225,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content

@@ -225,6 +225,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: GSEicj0IKzSzbw+4ntsUo2JgaGjD0GqanMzFSl+u/7s=
+NodeupConfigHash: XmQW3Ho9pBJJNdwxP5QLA73inzp7AMZ0AMLeNtzMKE0=
 
 __EOF_KUBE_ENV
 

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: GSEicj0IKzSzbw+4ntsUo2JgaGjD0GqanMzFSl+u/7s=
+NodeupConfigHash: XmQW3Ho9pBJJNdwxP5QLA73inzp7AMZ0AMLeNtzMKE0=
 
 __EOF_KUBE_ENV
 

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: GSEicj0IKzSzbw+4ntsUo2JgaGjD0GqanMzFSl+u/7s=
+NodeupConfigHash: XmQW3Ho9pBJJNdwxP5QLA73inzp7AMZ0AMLeNtzMKE0=
 
 __EOF_KUBE_ENV
 

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: FqNTaGQgtdbRFT3KuMuy/xzAZjH77wJuhwtrbA4iknU=
+NodeupConfigHash: IGNhop6kwQYWQzCfANMZ/yotMnaSHOrv5+1JRLZ7OHA=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: lny1kVY4Uq5R9oMgqIEkY59vza7kGUALfmC6EMOdn9o=
+NodeupConfigHash: z8YPMseE/gCrUeVDnN5pkZxmt4PsdqYGGzPx9FrHaW4=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -224,6 +224,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: hleqSCV8c4iMYzfgXzxfqQzrCmmadjYDKg9/hjx8X/o=
+  NodeupConfigHash: YFRYwuLknY+oH2Lf0b8myOiCdqH2GcoLjYXkuip/XFA=
 
   __EOF_KUBE_ENV
 

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: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4=
+  NodeupConfigHash: Lw8puckdB6AgGqcJiSlnCTEPT/1EDrYxw6yF8u6Zusw=
 
   __EOF_KUBE_ENV
 

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: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4=
+NodeupConfigHash: Lw8puckdB6AgGqcJiSlnCTEPT/1EDrYxw6yF8u6Zusw=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: A+EPWGUJZsuzCG0OWRT0rMZ3R+jhaxI32Chs5cf3XUw=
+  NodeupConfigHash: lsudo/vFdrEfr3MQHNi07SJea7fToei+LFsN2iWQdh0=
 
   __EOF_KUBE_ENV
 

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: A+EPWGUJZsuzCG0OWRT0rMZ3R+jhaxI32Chs5cf3XUw=
+NodeupConfigHash: lsudo/vFdrEfr3MQHNi07SJea7fToei+LFsN2iWQdh0=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: UrMbwXonDY8oQCd4m/xziqHLBR2dja5C8cYPie5u2HA=
+NodeupConfigHash: RrDmN94n17/WrErjacVBly5g9C+e/nBtsWllkWtffpM=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: ckbxixiF4BL4gW4LE3I4Xm50F6e60J2U+jR848JJRds=
+NodeupConfigHash: o9gSOSCq+kgXKqPoBbwY8icI577Ip2YK38b0IcFDIdU=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4=
+  NodeupConfigHash: Lw8puckdB6AgGqcJiSlnCTEPT/1EDrYxw6yF8u6Zusw=
 
   __EOF_KUBE_ENV
 

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: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4=
+NodeupConfigHash: Lw8puckdB6AgGqcJiSlnCTEPT/1EDrYxw6yF8u6Zusw=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content

@@ -225,6 +225,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: kBG8FsBCVW908FrhYSsgqivB1X6XObUbaT2vclwOF9g=
+NodeupConfigHash: 0oW8tCiIBITZq4zYID+vQy2RnAwVLV76H296rBX2N30=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content

@@ -225,6 +225,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: QUIwPAb5oBriyoHJmFZgFv0YcnSZceweh5I0xGOLSGQ=
+NodeupConfigHash: CwEhhWy/kVRjL1li8O6+IW6TYZAkRKS5hRw7sk7F6q0=
 
 __EOF_KUBE_ENV
 

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: KIjW3RB2evhF7DwQHvDR+lo7LoxYBZUGfexCfRWjdRM=
+NodeupConfigHash: gxtb9gJZS9oeTvl5OTPXGz6LoEBAMMnJQo76t8sxmAE=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+  NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
   __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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+  NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
   __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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+  NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
   __EOF_KUBE_ENV
 

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
 __EOF_KUBE_ENV
 

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
 __EOF_KUBE_ENV
 

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+  NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
   __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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+  NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
   __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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+  NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
   __EOF_KUBE_ENV
 

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
 __EOF_KUBE_ENV
 

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
 __EOF_KUBE_ENV
 

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: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4=
+NodeupConfigHash: EnGDBNyVfkeaZTiMgCs7XqhFcLxG6cWtkL02epsKjTM=
 
 __EOF_KUBE_ENV
 

tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"

tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content

@@ -223,6 +223,7 @@ Hooks:
 - null
 - null
 KeypairIDs:
+  apiserver-aggregator-ca: "6980187172486667078076483355"
   etcd-clients-ca: "6979622252718071085282986282"
   etcd-manager-ca-events: "6982279354000777253151890266"
   etcd-manager-ca-main: "6982279354000936168671127624"