diff --git a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml index 0ca97a38ba..e6585426d0 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml @@ -120,8 +120,6 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/pki/kube-apiserver - name: pki - mountPath: /etc/kubernetes/cloud.config name: cloudconfig readOnly: true @@ -170,10 +168,6 @@ contents: | - hostPath: path: /etc/openssl name: etcopenssl - - hostPath: - path: /etc/kubernetes/pki/kube-apiserver - type: DirectoryOrCreate - name: pki - hostPath: path: /etc/kubernetes/cloud.config name: cloudconfig diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml index 751a0ea726..8ec723b559 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml @@ -98,8 +98,6 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/pki/kube-apiserver - name: pki - mountPath: /etc/kubernetes/cloud.config name: cloudconfig readOnly: true @@ -145,10 +143,6 @@ contents: | - hostPath: path: /etc/openssl name: etcopenssl - - hostPath: - path: /etc/kubernetes/pki/kube-apiserver - type: DirectoryOrCreate - name: pki - hostPath: path: /etc/kubernetes/cloud.config name: cloudconfig diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml index 1b71b582cd..48b5eb5ff9 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml @@ -98,8 +98,6 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/pki/kube-apiserver - name: pki - mountPath: /etc/kubernetes/cloud.config name: cloudconfig readOnly: true @@ -145,10 +143,6 @@ contents: | - hostPath: path: /etc/openssl name: etcopenssl - - hostPath: - path: /etc/kubernetes/pki/kube-apiserver - type: DirectoryOrCreate - name: pki - hostPath: path: /etc/kubernetes/cloud.config name: cloudconfig diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml index c82169b401..b17251b0a5 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml @@ -77,20 +77,6 @@ mode: "0600" path: /srv/kubernetes/server.key type: file --- -contents: | - -----BEGIN RSA PRIVATE KEY----- - MIIBPQIBAAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKmXVSysPKgE80QSU4tZ6m4 - 9pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQJBAKt/gmpHqP3qA3u8RA5R - 2W6L360Z2Mnza1FmkI/9StCCkJGjuE5yDhxU4JcVnFyX/nMxm2ockEEQDqRSu7Oo - xTECIQD2QsUsgFL4FnXWzTclySJ6ajE4Cte3gSDOIvyMNMireQIhAOEnsV8UaSI+ - ZyL7NMLzMPLCgtsrPnlamr8gdrEHf9ITAiEAxCCLbpTI/4LL2QZZrINTLVGT34Fr - Kl/yI5pjrrp/M2kCIQDfOktQyRuzJ8t5kzWsUxCkntS+FxHJn1rtQ3Jp8dV4oQIh - AOyiVWDyLZJvg7Y24Ycmp86BZjM9Wk/BfWpBXKnl9iDY - -----END RSA PRIVATE KEY----- -mode: "0600" -path: /srv/kubernetes/service-account.key -type: file ---- Name: master alternateNames: - kubernetes diff --git 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 index 085c03e127..f785a0923c 100644 --- 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 @@ -98,8 +98,6 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/pki/kube-apiserver - name: pki - mountPath: /etc/kubernetes/cloud.config name: cloudconfig readOnly: true @@ -145,10 +143,6 @@ contents: | - hostPath: path: /etc/openssl name: etcopenssl - - hostPath: - path: /etc/kubernetes/pki/kube-apiserver - type: DirectoryOrCreate - name: pki - hostPath: path: /etc/kubernetes/cloud.config name: cloudconfig diff --git 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 index b9fc2e7358..f3d737bed3 100644 --- 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 @@ -98,8 +98,6 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/pki/kube-apiserver - name: pki - mountPath: /etc/kubernetes/cloud.config name: cloudconfig readOnly: true @@ -145,10 +143,6 @@ contents: | - hostPath: path: /etc/openssl name: etcopenssl - - hostPath: - path: /etc/kubernetes/pki/kube-apiserver - type: DirectoryOrCreate - name: pki - hostPath: path: /etc/kubernetes/cloud.config name: cloudconfig diff --git 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 index cc8e9fb208..2715446a51 100644 --- 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 @@ -97,8 +97,6 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/pki/kube-apiserver - name: pki - mountPath: /etc/kubernetes/cloud.config name: cloudconfig readOnly: true @@ -144,10 +142,6 @@ contents: | - hostPath: path: /etc/openssl name: etcopenssl - - hostPath: - path: /etc/kubernetes/pki/kube-apiserver - type: DirectoryOrCreate - name: pki - hostPath: path: /etc/kubernetes/cloud.config name: cloudconfig diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index 53fed7eabb..72aabfa182 100644 --- 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: UIF8A5ED1w9P2fRrndYHLCBGNaSVTRplgwToLmlmEms= + NodeupConfigHash: uyxw2QanaxrAyTUMA6EDpzkUiyyKtGgpHZrmzW9MF5Y= __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: iiiX7Yvik7SPQ07+PQGgYQJwTzRaaaOpwnet/rDo4Ww= + NodeupConfigHash: KBozjKWIT5RV02kzo6rSvQfYQ73jyPDSApqfyg9E1OE= __EOF_KUBE_ENV diff --git 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 index 69a60e8137..3d0d619fa6 100644 --- 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: eTB2DBfNtMJN6u7mVWuc7LBvrNLKT1TZRHERRX43VLk= +NodeupConfigHash: 3m0TihmabfHydii80nmac7Irnyfk+xv26p+62zf+H20= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 5f9dc2c910..0ca8f793f9 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 6e0d30d967..ef1a79302d 100644 --- 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: uTtJ8axCo3osmPKeLJu7hPMDSjR5SgkoV4eKh3ts4iE= +NodeupConfigHash: EP79BKlgvRMGBAm4LXU10tdowJNK8Dhy9plSYDjZMzQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 57b9b87980..46dad1ca14 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index a321ece14b..be6807afc8 100644 --- 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: vrjO+00Fqv07UAc6etTtZaOgUsYpoDmVCrf3IxEQrGA= + NodeupConfigHash: aR6/gCas//cB6aSxSoWWUgGfKbYTJjQiE5oSTZ6bs58= __EOF_KUBE_ENV diff --git 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 index dbabc0cefd..c1872ecbe8 100644 --- 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: vrjO+00Fqv07UAc6etTtZaOgUsYpoDmVCrf3IxEQrGA= +NodeupConfigHash: aR6/gCas//cB6aSxSoWWUgGfKbYTJjQiE5oSTZ6bs58= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 4ae32cc57d..adda5a987c 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -235,6 +235,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 71a0603e74..a61066b523 100644 --- 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/1TOzUrEMBQF4H2eIi/QaYdRBgJuHKk/tCVa8Gd5TW5rIekNuYktPr1UV90evnM4F0fZ6kjfk8WoJCwsLjQP03gLjEp69AOrsjQuc8LIB1zBB4cHQ7405ENE3oXiceYEs8H7SDl04LcR2LpF5iIhp+IIe/RCDpVs/5DoyGIO/xcegL+UvOvr9Wg0fGpIH9qH9vV9Of1Une2r8ent+XxuTld1SnjdVDfiFwAA//8BAAD//+NR7mLPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1TOzU7DMBAE4Lufwi+QplRCRZY4lBJ+JKhcDpXgtjjb1Io3a7w2yeOj0FOuo29Gsw9cWpv417eYjIZR1J6Hs+8eQNBoQjqLqWsXimRMssIJKAZcOabaMcWEsgjV6yAZBofPiUs8AM0jMHerIlVGydUNLNEHBzT6/R+pA7dY4vXCC8jF6NEfd4/r4w/feSsbuu3Xl21HZQent63tvzu7aZqn09eUP5t79QcAAP//AQAA//8UHNlZzwAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 8f1fcc6577..a8ebe4a4a5 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml index e5f0daf430..6f4211b10a 100644 --- 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: AT7DYq7rR8a2Hsz6SojkkA9etLAjU+GB4AZbEXKxiEw= + NodeupConfigHash: D8ZatkSJhO0kShbDZ7xKtdA2xor1d6SK3a3Rfs3HhUA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index 5d232193de..7c16eaf3c4 100644 --- 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: s4V7ws1HxBsVMPFxBfHA29vgDC/xrmTzpjuJ7dJx/f4= + NodeupConfigHash: kwu0YqIcc5eKz6NysUQ1Le8Fqt7PH4BplfJiklzvOCs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml index 6d33178948..76f83f2cef 100644 --- 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: uCB+we8vSi2ma1kTwMxs06dtg6q/GgBUeXEITs8/r0Q= + NodeupConfigHash: TfZGDw3iiaRxHwVY1pkcET3l4TWwrcyG7CCxWZjQDs0= __EOF_KUBE_ENV diff --git 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 index 1292fce080..200fdce7d4 100644 --- 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: 1Wlk2kMJPVyJ8K4Y1N/PkzEljHxuqfk+L5HR3d25nx0= +NodeupConfigHash: DQR5kzzU7etNvPPGUfeut4+mAK89QMhd/403v9gm1Fk= __EOF_KUBE_ENV diff --git 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 index 5cf4bc7880..ff81d11488 100644 --- 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: 1Wlk2kMJPVyJ8K4Y1N/PkzEljHxuqfk+L5HR3d25nx0= +NodeupConfigHash: DQR5kzzU7etNvPPGUfeut4+mAK89QMhd/403v9gm1Fk= __EOF_KUBE_ENV diff --git 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 index 5fe5f93555..c048f17b90 100644 --- 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: 1Wlk2kMJPVyJ8K4Y1N/PkzEljHxuqfk+L5HR3d25nx0= +NodeupConfigHash: DQR5kzzU7etNvPPGUfeut4+mAK89QMhd/403v9gm1Fk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 9d4fa82db5..dc3632997d 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 9d4fa82db5..dc3632997d 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 9d4fa82db5..dc3632997d 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index aba4362235..643d600dcf 100644 --- 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: sY7YT7oNfZCH3MZAUkAwnkHVsjYj39LYWaV6izdJDIk= + NodeupConfigHash: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4= __EOF_KUBE_ENV diff --git 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 index 06284c8b8d..91faf8feb5 100644 --- 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: udRRYD8Hbdm3O9U657MWFIdz8NxBLbW1ObLxWeGDQxM= +NodeupConfigHash: AMwFCjGNNlzHM/+ZNTLBB56kk7gBiw2p1zfWrNkWYsg= __EOF_KUBE_ENV diff --git 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 index 35df212cef..c65f2525ce 100644 --- 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: udRRYD8Hbdm3O9U657MWFIdz8NxBLbW1ObLxWeGDQxM= +NodeupConfigHash: AMwFCjGNNlzHM/+ZNTLBB56kk7gBiw2p1zfWrNkWYsg= __EOF_KUBE_ENV diff --git 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 index c74137c1d0..3e0297ed7e 100644 --- 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: udRRYD8Hbdm3O9U657MWFIdz8NxBLbW1ObLxWeGDQxM= +NodeupConfigHash: AMwFCjGNNlzHM/+ZNTLBB56kk7gBiw2p1zfWrNkWYsg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f2baf3525f..3a9fdc9064 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index f2baf3525f..3a9fdc9064 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index f2baf3525f..3a9fdc9064 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 7e8d63c900..3746bf9d4e 100644 --- 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: cahKRe4OfYgDLlzeQ2hyUONwlVtleFOrR4LjBxjX9o8= + NodeupConfigHash: vYvcWAlVg2hKC/Reom/9jbtatVHUOusGiiTHXNRaomo= __EOF_KUBE_ENV diff --git 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 index f09be3dfe3..ebcc0f1816 100644 --- 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: cahKRe4OfYgDLlzeQ2hyUONwlVtleFOrR4LjBxjX9o8= +NodeupConfigHash: vYvcWAlVg2hKC/Reom/9jbtatVHUOusGiiTHXNRaomo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 846aba9bb9..0f3b18c4bd 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index c5ca38cea9..4a17701f6c 100644 --- 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: piqNWiBSzjLaap9r5jHr8xUBhvT/1RwuspJG50TM2mE= +NodeupConfigHash: GFs06Sn4Zf+FTafagmLEc5CduMWJlxuYlTeM3bkrupA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 31f267d70b..29653df9de 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -231,6 +231,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 5202edefb5..335f2f884e 100644 --- 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: o856vpKJ4KO3hTtshF0oJ7sqFn8i3xO0A7eg9SfBgyg= +NodeupConfigHash: 8cG85jAw4RMzjhjw9lP8ak7vWVFXfcWH/OBhvN1o/+w= __EOF_KUBE_ENV diff --git 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 index 03c3bd0356..e8ceaf8d3e 100644 --- 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: o856vpKJ4KO3hTtshF0oJ7sqFn8i3xO0A7eg9SfBgyg= +NodeupConfigHash: 8cG85jAw4RMzjhjw9lP8ak7vWVFXfcWH/OBhvN1o/+w= __EOF_KUBE_ENV diff --git 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 index 0ed904e3d9..a5f5aafb78 100644 --- 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: o856vpKJ4KO3hTtshF0oJ7sqFn8i3xO0A7eg9SfBgyg= +NodeupConfigHash: 8cG85jAw4RMzjhjw9lP8ak7vWVFXfcWH/OBhvN1o/+w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 6c4b934b06..1d632e6f38 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 6c4b934b06..1d632e6f38 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 6c4b934b06..1d632e6f38 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index 36d984f169..fddbba5e70 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -231,6 +231,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content index 36d984f169..fddbba5e70 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content @@ -231,6 +231,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content index 36d984f169..fddbba5e70 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content @@ -231,6 +231,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 0ce5b1ce6e..4b97486ceb 100644 --- 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: Ydh3ZWKyY/Oss/NeoX6MkT2Mf1Nz4dOdHik6MBGAA3k= +NodeupConfigHash: GSEicj0IKzSzbw+4ntsUo2JgaGjD0GqanMzFSl+u/7s= __EOF_KUBE_ENV diff --git 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 index 76b3e1ed92..7b98c54ab8 100644 --- 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: Ydh3ZWKyY/Oss/NeoX6MkT2Mf1Nz4dOdHik6MBGAA3k= +NodeupConfigHash: GSEicj0IKzSzbw+4ntsUo2JgaGjD0GqanMzFSl+u/7s= __EOF_KUBE_ENV diff --git 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 index ad6ce54507..968eba6c6d 100644 --- 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: Ydh3ZWKyY/Oss/NeoX6MkT2Mf1Nz4dOdHik6MBGAA3k= +NodeupConfigHash: GSEicj0IKzSzbw+4ntsUo2JgaGjD0GqanMzFSl+u/7s= __EOF_KUBE_ENV diff --git 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 index 95ab92ebd6..990a201058 100644 --- 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: zZcoS7xOvssEjnv0va4Q/5Ei7kKvK1R1zl7Rub2MZ0Q= +NodeupConfigHash: FqNTaGQgtdbRFT3KuMuy/xzAZjH77wJuhwtrbA4iknU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d04dc54bc0..7a74dbe9bf 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 85afd66f25..506cfaba07 100644 --- 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: b4czBcyhh8e+QVo86DZFF+jEFNvON38TeSDX3B79ZLQ= +NodeupConfigHash: lny1kVY4Uq5R9oMgqIEkY59vza7kGUALfmC6EMOdn9o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 495046bd8e..60e102cdce 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -230,6 +230,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml index d99d825d92..541bf8a34a 100644 --- 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: 4OPR2pfKjmU3DxEC6ySCECXDu6oyBBshFzw4FmTWirA= + NodeupConfigHash: hleqSCV8c4iMYzfgXzxfqQzrCmmadjYDKg9/hjx8X/o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml index 5262594a18..6510cc9dd8 100644 --- 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: sY7YT7oNfZCH3MZAUkAwnkHVsjYj39LYWaV6izdJDIk= + NodeupConfigHash: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4= __EOF_KUBE_ENV diff --git 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 index c81f049f2d..bef7ccf0ad 100644 --- 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: sY7YT7oNfZCH3MZAUkAwnkHVsjYj39LYWaV6izdJDIk= +NodeupConfigHash: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 9f7dba628d..c1c06006fd 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml index 063a2e0f72..25d5763daf 100644 --- 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: Mq2gv9q2Qs++FGA7FGxnHHJQFeXPi9NI9qqcsQxb1pY= + NodeupConfigHash: A+EPWGUJZsuzCG0OWRT0rMZ3R+jhaxI32Chs5cf3XUw= __EOF_KUBE_ENV diff --git 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 index dcf1a90d5a..6e073d2164 100644 --- 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: Mq2gv9q2Qs++FGA7FGxnHHJQFeXPi9NI9qqcsQxb1pY= +NodeupConfigHash: A+EPWGUJZsuzCG0OWRT0rMZ3R+jhaxI32Chs5cf3XUw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index eed059dc7f..262911341f 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 8c87bb9766..bf553d63d2 100644 --- 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: DeiG1lUK5d1cjz8zydAu7Mj+xmyNIPd+3AEGbTeEzkM= +NodeupConfigHash: UrMbwXonDY8oQCd4m/xziqHLBR2dja5C8cYPie5u2HA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index b14871061b..547662ce8b 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 10c94b8df2..bfba9b71c7 100644 --- 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: sC11y7PGqH5ecAi23Zyrys0oXvJw/EGZe49dobQnLS0= +NodeupConfigHash: ckbxixiF4BL4gW4LE3I4Xm50F6e60J2U+jR848JJRds= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 810d9c7f22..47b42d568f 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index aba4362235..643d600dcf 100644 --- 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: sY7YT7oNfZCH3MZAUkAwnkHVsjYj39LYWaV6izdJDIk= + NodeupConfigHash: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4= __EOF_KUBE_ENV diff --git 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 index d249da22fe..1f847a38b0 100644 --- 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: sY7YT7oNfZCH3MZAUkAwnkHVsjYj39LYWaV6izdJDIk= +NodeupConfigHash: OVHhBXXqwSidrUnaLkEpqE3WfZ8ek/sTrq/JKiEDY+4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 9f7dba628d..c1c06006fd 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index 3034e07b76..5ebbf6cf43 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -231,6 +231,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 6595dfa257..4809d03c24 100644 --- 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: P2zuZIPyo7xP6bYWFZ3pMqSqGH/i+zhY4quex2BLhh8= +NodeupConfigHash: kBG8FsBCVW908FrhYSsgqivB1X6XObUbaT2vclwOF9g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index 7ffe426d1e..c3f0d442d6 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -231,6 +231,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 53aca315f7..4e79461f46 100644 --- 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: 6GU2rt+VtLkQ+jRnI7rd2Jrc7YJl20WHoJC7u1S1aXY= +NodeupConfigHash: QUIwPAb5oBriyoHJmFZgFv0YcnSZceweh5I0xGOLSGQ= __EOF_KUBE_ENV diff --git 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 index 5b19d467ef..0010e56b45 100644 --- 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: 2FXtsHj4AWdDUEQAJYs9bK+mXjloHyaqa8zIHIHJh84= +NodeupConfigHash: KIjW3RB2evhF7DwQHvDR+lo7LoxYBZUGfexCfRWjdRM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 30f2d8b503..51a7bb6ac7 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index e0c50bcbe2..16d8011f0d 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= + NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= + NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= + NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git 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 index c6deed4fc4..e33949c5d4 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= +NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git 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 index f8ef585e2c..6fc9f4ee3a 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= +NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git 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 index c73125c2f5..69fd204a0c 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= +NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 20237b43c1..648dd1b5d2 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 20237b43c1..648dd1b5d2 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 20237b43c1..648dd1b5d2 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index e0c50bcbe2..16d8011f0d 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= + NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= + NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= + NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git 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 index c6deed4fc4..e33949c5d4 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= +NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git 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 index f8ef585e2c..6fc9f4ee3a 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= +NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git 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 index c73125c2f5..69fd204a0c 100644 --- 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: xfKJbRK+H/1oht3+wOLssBmsDGIleyI5Osm3XXWeOjs= +NodeupConfigHash: LnWRtlLC1JrdQ0wg4CmWFu4UArV7M64uU1GXJrHtEW4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 20237b43c1..648dd1b5d2 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 20237b43c1..648dd1b5d2 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 20237b43c1..648dd1b5d2 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml index f180fe1412..d8e7b2bb71 100644 --- 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: /r7NfxdVVmw9Iw2yugduecq8S/p+vAaPIdD/ksGepoY= + NodeupConfigHash: A0V/0S0ExDiD+2G9kWE6kyZXWSak4Fni+f8Qqf/dlxo= __EOF_KUBE_ENV diff --git 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 index 500b6cd863..de81f23b84 100644 --- 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: /r7NfxdVVmw9Iw2yugduecq8S/p+vAaPIdD/ksGepoY= +NodeupConfigHash: A0V/0S0ExDiD+2G9kWE6kyZXWSak4Fni+f8Qqf/dlxo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 9af7bb71eb..5fd2a3d28d 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml index 0c32267440..406a24d3fc 100644 --- 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: 4X2KZ5gyOFEKOn13zhYxHwRZimcd5dCLXgI0H+tRvcE= + NodeupConfigHash: +SWDBYzm026ggzLwCYm1zMOhE91Rlp/K6aMEcj9W3zM= __EOF_KUBE_ENV diff --git 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 index 464d8c74eb..8453b98911 100644 --- 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: 4X2KZ5gyOFEKOn13zhYxHwRZimcd5dCLXgI0H+tRvcE= +NodeupConfigHash: +SWDBYzm026ggzLwCYm1zMOhE91Rlp/K6aMEcj9W3zM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 65035b7ded..c6e051fd81 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 3f6f192126..d6c17df0b4 100644 --- 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: pqcIuER42bGUpYsYvKXSeScU0MXYqHPOSsMUJtLO6rk= +NodeupConfigHash: y87LU4NVhGC4YcpFm6UzYLM6OKg4O7djitAlcjOgMtA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 26cf7d27e9..86b890f472 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 2410541ac8..d1c7006496 100644 --- 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: LxY8AytaEJmDw24EgojhbfJOhPJko6n5TmLSpTx8VGQ= + NodeupConfigHash: gKgUwJ+RQNPAVLD3XgIyTWosf8dnDmPYqCoqVzZ3wnk= __EOF_KUBE_ENV diff --git 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 index 56b9bc495a..403cb4d915 100644 --- 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: LxY8AytaEJmDw24EgojhbfJOhPJko6n5TmLSpTx8VGQ= +NodeupConfigHash: gKgUwJ+RQNPAVLD3XgIyTWosf8dnDmPYqCoqVzZ3wnk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 2dbcbcf045..139e30c013 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index aa14519abe..de614103bc 100644 --- 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: fhTWkOQbgIzHj3m4CWspYdaolDkeBsiRO90HXhHj8EM= +NodeupConfigHash: V8vIBHQVrq41jhW9K5ElwpfpElFKUrNnxB1FwubaUlc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 5a10371ae8..6312ae62fc 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index d7001858ea..d904d49b05 100644 --- 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: SSgadHFKJvHWHkP/z81TkBQPbCXQ66eocqjRpTysIwg= + NodeupConfigHash: ONpabp7ponuuYAjTZF0tRCDarGxgI7h7qTVxCVVsSig= __EOF_KUBE_ENV diff --git 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 index 2c03053ebd..f13410bc2b 100644 --- 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: SSgadHFKJvHWHkP/z81TkBQPbCXQ66eocqjRpTysIwg= +NodeupConfigHash: ONpabp7ponuuYAjTZF0tRCDarGxgI7h7qTVxCVVsSig= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 7c50da7903..c9bc1433f9 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index 8052582782..bf1a790ec5 100644 --- 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: iohQ1QIamqfoodJf/URhnG3dhsf4v1GCL/G0BL0fnGA= + NodeupConfigHash: fzKSSDkcSRSSWmPxFuRuL41Bdn3SNeGIFIseKfPxweE= __EOF_KUBE_ENV diff --git 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 index cea56efd52..ce76b4d613 100644 --- 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: iohQ1QIamqfoodJf/URhnG3dhsf4v1GCL/G0BL0fnGA= +NodeupConfigHash: fzKSSDkcSRSSWmPxFuRuL41Bdn3SNeGIFIseKfPxweE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 6c62f62b94..9b17a874f6 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -225,6 +225,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupRoot: / diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index aa63c5a317..20454a0623 100644 --- 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: 89OS6foatM23+MD5pC7rT51vJpxM0MLwPnmJwDTBFWQ= + NodeupConfigHash: dg9QOK8hpPVFIoh0PFGaXYvuc83uhD5fdvHyjb7/A1o= __EOF_KUBE_ENV diff --git 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 index 3afdfebe3e..19c006e6af 100644 --- 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: 89OS6foatM23+MD5pC7rT51vJpxM0MLwPnmJwDTBFWQ= +NodeupConfigHash: dg9QOK8hpPVFIoh0PFGaXYvuc83uhD5fdvHyjb7/A1o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 44704c63c5..fabf82490d 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -299,6 +299,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index a14e125167..912faa25fd 100644 --- 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: FdFz4KoIPromdbbRsVdT7XYNBSiEIcRTfaAVzVEbMuE= +NodeupConfigHash: 7bi6H5jIY0CqkgjHGVmO8w2E1w0f+rsZR6FxToXAL9Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f66631f7a8..ac32dd2de4 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 55a5ea27a6..f2f0ee9931 100644 --- 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: 4ePjfpIHne0aHGTySD4wco/xf8oIIyQlXzr8kz8vZAo= +NodeupConfigHash: v6lomoJMO2aAuVIn7w5t2UUU2XKbl89JIEor72IUL7g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d5be8c290d..50110be473 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 498b77542f..a8fd2d9f25 100644 --- 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: md8v1FmEj5z+1yU5uMwQbcMcg0v392EvAotN/kVaVgo= +NodeupConfigHash: MlKLVrRG89LhQDbit7brv6c93O255xNf5U4u5KPB5+g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 4fa2c99a91..801bcf6f1a 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index d277254775..17b7cc57e5 100644 --- 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: nM6K9n/emgWIcnuCC8uFO6KZb/FGXxGUiHr7m76HGYw= +NodeupConfigHash: ReI54XwGfJUr2NgsNziv7Em2jSs7hm1Fo6PrfDKpabw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 58d3ffcb69..87a382ebf7 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index aacd932f30..edd7a1e57f 100644 --- 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: IV1E8doXATWhkueLSQNYJoyia3dfIwJX9p0jeJJoB3c= +NodeupConfigHash: zC1Ncik/AuBXeshnVjaQrc9Q27QBmTYh4XZC9fSAoGY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 262d5091be..b1dbc8e26c 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index eb870609c7..e328c06e15 100644 --- 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: ZjEly3BkypXB0KpRvCd8OhJYaGEg+XekRsoJf5u+3/8= +NodeupConfigHash: yKRi+ZgdkWMqNoG+c9u6a2SmxWL7VjB3Cm/3HxMuBc4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index af470c82db..0b96e13b75 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -231,6 +231,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupRoot: / diff --git 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 index 18abd3e40c..33451cf506 100644 --- 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: brgsBmxH0fjZWrrjeaNej8LuH+DVk/xay5lXibLPBNk= +NodeupConfigHash: Yi+E4i5zlkDvXvobYyGE2wc23+bdt9czxidIqEq4dfs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index fcaba20f88..acbefd287d 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 3b79398bbf..d4c76269d4 100644 --- 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: JY8om7lPcnTS8RdSP4/pzKq3BxNOzx/G2xAb9reOgz0= +NodeupConfigHash: g5sO7Zqtt2JasAjHSWlUn8XqVtf4+/d7vIPPrvxJcAs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 07bb2d842a..0c302bd276 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 6ca001467f..271aa094ba 100644 --- 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: knpMSWCREM7ejD6rWONmBbeuwZBF/kueukJgYz/L7JE= +NodeupConfigHash: qSa7ujSyOqmmCOV+M4f3CBNSCNMw1OG9Bp5sE4S12Ig= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 4f44d99251..b23abf7fcc 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git 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 index 69a60e8137..3d0d619fa6 100644 --- 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: eTB2DBfNtMJN6u7mVWuc7LBvrNLKT1TZRHERRX43VLk= +NodeupConfigHash: 3m0TihmabfHydii80nmac7Irnyfk+xv26p+62zf+H20= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 5f9dc2c910..0ca8f793f9 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ KeypairIDs: etcd-peers-ca-events: "6982279353999767935825892873" etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" + service-account: "2" KubeletConfig: anonymousAuth: false cgroupDriver: systemd