diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml index d76f0a3813..761b4422aa 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -119,6 +119,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml index 43bba3d525..c6040a030c 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml @@ -118,6 +118,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml index 43bba3d525..c6040a030c 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml @@ -118,6 +118,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml index 0d0d154e2e..40eb98d42f 100644 --- a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml @@ -117,6 +117,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml index ad0d9921d3..b127772743 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml @@ -560,6 +560,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml index c015ed7f63..12779a1cca 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml @@ -535,6 +535,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml index 170388124a..a3ae1eed8d 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml @@ -572,6 +572,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml index 95310f2577..7673620113 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml @@ -494,6 +494,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml index a5aaefef3a..6dc604fb62 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml @@ -265,6 +265,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml index d61c1e6635..22deaf57c3 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml @@ -291,6 +291,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml index cd150e3635..031de8583e 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml @@ -196,6 +196,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml index e79d08674b..eb18566fdf 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -222,6 +222,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml index 94ca9acb9e..2b0abe1223 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml @@ -119,6 +119,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml index 293664e76f..b6b52cb2a5 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml @@ -119,6 +119,36 @@ subject: cn=etcd-peers-ca-main type: ca --- Lifecycle: "" +Name: kube-proxy +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kube-proxy +type: client +--- +Lifecycle: "" +Name: kubelet +Signer: + Lifecycle: "" + Name: kubernetes-ca + Signer: null + alternateNames: null + oldFormat: false + subject: cn=kubernetes + type: ca +alternateNames: null +oldFormat: false +subject: cn=kubelet +type: client +--- +Lifecycle: "" Name: kubernetes-ca Signer: null alternateNames: null diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content index 12f0acc776..93ab68985d 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content @@ -9,34 +9,12 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz -CAs: - kubernetes-ca: | - -----BEGIN CERTIFICATE----- - MIIBbjCCARigAwIBAgIMFpANqBD8NSD82AUSMA0GCSqGSIb3DQEBCwUAMBgxFjAU - BgNVBAMTDWt1YmVybmV0ZXMtY2EwHhcNMjEwNzA3MDcwODAwWhcNMzEwNzA3MDcw - ODAwWjAYMRYwFAYDVQQDEw1rdWJlcm5ldGVzLWNhMFwwDQYJKoZIhvcNAQEBBQAD - SwAwSAJBANFI3zr0Tk8krsW8vwjfMpzJOlWQ8616vG3YPa2qAgI7V4oKwfV0yIg1 - jt+H6f4P/wkPAPTPTfRp9Iy8oHEEFw0CAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEG - MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNG3zVjTcLlJwDsJ4/K9DV7KohUA - MA0GCSqGSIb3DQEBCwUAA0EAB8d03fY2w7WKpfO29qI295pu2C4ca9AiVGOpgSc8 - tmQsq6rcxt3T+rb589PVtz0mw/cKTxOk6gH2CCC+yHfy2w== - -----END CERTIFICATE----- - -----BEGIN CERTIFICATE----- - MIIBbjCCARigAwIBAgIMFpANvmSa0OAlYmXKMA0GCSqGSIb3DQEBCwUAMBgxFjAU - BgNVBAMTDWt1YmVybmV0ZXMtY2EwHhcNMjEwNzA3MDcwOTM2WhcNMzEwNzA3MDcw - OTM2WjAYMRYwFAYDVQQDEw1rdWJlcm5ldGVzLWNhMFwwDQYJKoZIhvcNAQEBBQAD - SwAwSAJBAMF6F4aZdpe0RUpyykaBpWwZCnwbffhYGOw+fs6RdLuUq7QCNmJm/Eq7 - WWOziMYDiI9SbclpD+6QiJ0N3EqppVUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEG - MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLImp6ARjPDAH6nhI+scWVt3Q9bn - MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA - 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== - -----END CERTIFICATE----- +CAs: {} ClusterName: bastionuserdata.example.com Hooks: - null - null -KeypairIDs: - kubernetes-ca: "6982820025135291416230495506" +KeypairIDs: {} KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 49a4731154..ddb228d0c8 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -38,6 +38,8 @@ Hooks: - null - null KeypairIDs: + kube-proxy: "6986354184403674830529235586" + kubelet: "6986354184404014133128804066" kubernetes-ca: "6982820025135291416230495506" KubeletConfig: anonymousAuth: false diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index 2807bdcbfb..8f0405a760 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: KjcIhj3Z1G5c3A+/QV9HTJTWk4JeSiCaTX3I91Q97ZY= +NodeupConfigHash: ZEB7fzVriu6fpqTrLQqLaLi/4xDmKlkaSYhNs3GGaac= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content index e1b353d1e8..dfd7d2737b 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -38,6 +38,8 @@ Hooks: - null - null KeypairIDs: + kube-proxy: "6986354184403674830529235586" + kubelet: "6986354184404014133128804066" kubernetes-ca: "6982820025135291416230495506" KubeletConfig: anonymousAuth: false diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index c839509924..8e8500e045 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: oVXw5XN4cMP2Teqe3ZUv7TO/81lePlNiur1Ge1NhVrA= +NodeupConfigHash: IE+fF5I4YRf3fzWVe9DdLrJPpWx09wmpatw09fxBGeA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 1a65a65513..213940e9db 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -38,6 +38,8 @@ Hooks: - null - null KeypairIDs: + kube-proxy: "6986354184403674830529235586" + kubelet: "6986354184404014133128804066" kubernetes-ca: "6982820025135291416230495506" KubeletConfig: anonymousAuth: false diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index e234668399..ffbe5399e2 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: l7fPJ5CpjpaBcyQTiKOjrDgN03hDD+vff1Ut1carYEc= +NodeupConfigHash: LNexRwBtiCUmbVGo0+v4lmzZJCyQcxYhmgGofuPjSEo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index 305cd74076..9fc4e853fe 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -431,7 +431,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: cRVyEga1NwlrdI+7931ppAijC4EcmfTUBfaprxlwZgk= + NodeupConfigHash: DrFkwuDHjb1qUzCfQQSr/T+ehBCIId4LZ2MRWbibsm4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index f607fe8b13..95bd3b1a1e 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -171,7 +171,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cRVyEga1NwlrdI+7931ppAijC4EcmfTUBfaprxlwZgk= +NodeupConfigHash: DrFkwuDHjb1qUzCfQQSr/T+ehBCIId4LZ2MRWbibsm4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 7692e721ef..32af7b9a9d 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -36,6 +36,8 @@ Hooks: - null - null KeypairIDs: + kube-proxy: "6986354184403674830529235586" + kubelet: "6986354184404014133128804066" kubernetes-ca: "6982820025135291416230495506" KubeletConfig: anonymousAuth: false