From 7ac25d4fed38fb3a8254f7dfcedbbd53dfe65dbb Mon Sep 17 00:00:00 2001 From: justinsb Date: Fri, 29 Mar 2024 08:26:34 -0400 Subject: [PATCH 1/2] chore: update testdata to stop using alpha versions For released versions, we should stop "using" the alphas/release-candidates. --- .../in-v1alpha2.yaml | 2 +- .../cluster-autoscaler-priority-expander/in-v1alpha2.yaml | 2 +- .../update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml | 2 +- .../update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml | 2 +- tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml | 2 +- tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml | 2 +- tests/integration/update_cluster/minimal-1.29/in-v1alpha2.yaml | 2 +- .../update_cluster/minimal-dns-none/in-v1alpha2.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml index 650fb35fad2a9..92982f09e131f 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml @@ -30,7 +30,7 @@ spec: - instanceGroup: master-us-test-1a name: us-test-1a name: events - kubernetesVersion: v1.26.0-alpha.2 + kubernetesVersion: v1.26.0 masterInternalName: api.internal.cas-priority-expander-custom.example.com masterPublicName: api.cas-priority-expander-custom.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml index e0e03c9c69b7d..215df88e6f77b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml @@ -23,7 +23,7 @@ spec: - instanceGroup: master-us-test-1a name: us-test-1a name: events - kubernetesVersion: v1.26.0-alpha.2 + kubernetesVersion: v1.26.0 masterInternalName: api.internal.cas-priority-expander.example.com masterPublicName: api.cas-priority-expander.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml index 9bf4e51b4bc13..f5b46c3c27eda 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml @@ -35,7 +35,7 @@ spec: useServiceAccountExternalPermissions: true kubelet: anonymousAuth: false - kubernetesVersion: v1.25.0-rc.1 + kubernetesVersion: v1.25.0 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml index 2f972f4af56cc..706327e30f4d5 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml @@ -43,7 +43,7 @@ spec: bind 169.254.20.10 forward . 10.238.1.130 } - kubernetesVersion: v1.26.0-alpha.0 + kubernetesVersion: v1.26.0 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml index 419493e194aea..ef3d6a12e7ecf 100644 --- a/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml @@ -34,7 +34,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: v1.25.0-rc.1 + kubernetesVersion: v1.25.0 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml index 00ea190731ae6..3ab7810141985 100644 --- a/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml @@ -34,7 +34,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: v1.26.0-alpha.0 + kubernetesVersion: v1.26.0 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-1.29/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.29/in-v1alpha2.yaml index 83523ca7c1016..2311ba3b59111 100644 --- a/tests/integration/update_cluster/minimal-1.29/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.29/in-v1alpha2.yaml @@ -34,7 +34,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: v1.29.0-alpha.0 + kubernetesVersion: v1.29.0 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml index 1437d6a3123d4..32577c96018d0 100644 --- a/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml @@ -36,7 +36,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: v1.26.0-alpha.0 + kubernetesVersion: v1.26.0 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: From 52f43affd1159915c2a30099118b7af62a43c56e Mon Sep 17 00:00:00 2001 From: justinsb Date: Fri, 29 Mar 2024 08:27:33 -0400 Subject: [PATCH 2/2] chore: update generated testdata Updating after switching away from alphas/RCs. --- ...ority-expander-custom.example.com_user_data | 2 +- ...ority-expander-custom.example.com_user_data | 2 +- ...ority-expander-custom.example.com_user_data | 2 +- ...ority-expander-custom.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- ...ct_nodeupconfig-nodes-high-priority_content | 12 ++++++------ ...ect_nodeupconfig-nodes-low-priority_content | 12 ++++++------ .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ ...cas-priority-expander.example.com_user_data | 2 +- ...cas-priority-expander.example.com_user_data | 2 +- ...cas-priority-expander.example.com_user_data | 2 +- ...cas-priority-expander.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- ...ct_nodeupconfig-nodes-high-priority_content | 12 ++++++------ ...ect_nodeupconfig-nodes-low-priority_content | 12 ++++++------ .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ ...st-1a.masters.minimal.example.com_user_data | 2 +- ...emplate_nodes.minimal.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ ...st-1a.masters.minimal.example.com_user_data | 2 +- ...emplate_nodes.minimal.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ ...st-1a.masters.minimal.example.com_user_data | 2 +- ...emplate_nodes.minimal.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ ...st-1a.masters.minimal.example.com_user_data | 2 +- ...emplate_nodes.minimal.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ ...st-1a.masters.minimal.example.com_user_data | 2 +- ...emplate_nodes.minimal.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ ...st-1a.masters.minimal.example.com_user_data | 2 +- ...emplate_nodes.minimal.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 +++++----- ...ject_nodeupconfig-master-us-test-1a_content | 18 +++++++++--------- .../aws_s3_object_nodeupconfig-nodes_content | 12 ++++++------ 48 files changed, 204 insertions(+), 204 deletions(-) diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data index 0a1caa29c0cb8..6ceca85aeda85 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: cas-priority-expander-custom.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tBSQ8EPWSZ0kO+D46zaIMFLscyIHeWYneHX10/QSn88= +NodeupConfigHash: Z/nsjs22YBtSUWQ1CMwTElKHmXfO/ATmd5Ro9DbzlDk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data index f9f7141acaf70..8959097d0faab 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node -NodeupConfigHash: yri1CW5U/CNTaCMUE37E17TPlj1rE1s+LmJGIOkumB4= +NodeupConfigHash: K6RjdqHmaOxViLym3QULk/KOs/kBJsRALTj/PhPxn78= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data index dc1908b4c344c..91e1af4b2785e 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node -NodeupConfigHash: yri1CW5U/CNTaCMUE37E17TPlj1rE1s+LmJGIOkumB4= +NodeupConfigHash: K6RjdqHmaOxViLym3QULk/KOs/kBJsRALTj/PhPxn78= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data index ccc700e435e73..0a632dff7be3a 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: yri1CW5U/CNTaCMUE37E17TPlj1rE1s+LmJGIOkumB4= +NodeupConfigHash: K6RjdqHmaOxViLym3QULk/KOs/kBJsRALTj/PhPxn78= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content index 9cd4f156d68a4..8c63bf55fabe2 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -103,7 +103,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.2 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -132,7 +132,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.2 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -154,13 +154,13 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.2 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -185,7 +185,7 @@ spec: shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.26.0-alpha.2 + kubernetesVersion: 1.26.0 masterKubelet: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index aca8f66fa17b4..692e48eb62542 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -29,7 +29,7 @@ APIServerConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.2 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -59,8 +59,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 @@ -69,8 +69,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -242,7 +242,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.2 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -251,7 +251,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.2 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -281,7 +281,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -308,7 +308,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content index c48d9ada39ce3..5a8093b418677 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content @@ -1,15 +1,15 @@ Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -48,7 +48,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content index c48d9ada39ce3..5a8093b418677 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content @@ -1,15 +1,15 @@ Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -48,7 +48,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content index c48d9ada39ce3..5a8093b418677 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,15 +1,15 @@ Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -48,7 +48,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data index ef951abe813be..091440c1a2e9d 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: cas-priority-expander.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Qo7sH7G5mTQIzZXe9cvGHClC8hl6me/rM1p/jquTn7g= +NodeupConfigHash: GzKqTmyHRh08iOmIz5MvoUE5zXIW9NTpf/j/2yDobc4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data index 171a41ffa74bd..b14bff0dbdafb 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node -NodeupConfigHash: k/xKqSqM7KYnxe47DORHvUG9BpEortskgqaioRUb6Nw= +NodeupConfigHash: LA4P1gWgpRPvuYGONsc0GVm8uaxs18YzyLaMfBllHkQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data index a4b5af0437377..3e6fea180ea1f 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node -NodeupConfigHash: k/xKqSqM7KYnxe47DORHvUG9BpEortskgqaioRUb6Nw= +NodeupConfigHash: LA4P1gWgpRPvuYGONsc0GVm8uaxs18YzyLaMfBllHkQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data index 72037694022b8..09ecf2f226585 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: k/xKqSqM7KYnxe47DORHvUG9BpEortskgqaioRUb6Nw= +NodeupConfigHash: LA4P1gWgpRPvuYGONsc0GVm8uaxs18YzyLaMfBllHkQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content index d58c469716261..ef2086313096a 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -96,7 +96,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.2 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -125,7 +125,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.2 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -147,13 +147,13 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.2 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -178,7 +178,7 @@ spec: shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.26.0-alpha.2 + kubernetesVersion: 1.26.0 masterKubelet: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 17f7073a9bb59..999b2bc2ba680 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -29,7 +29,7 @@ APIServerConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.2 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -59,8 +59,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 @@ -69,8 +69,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -242,7 +242,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.2 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -251,7 +251,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.2 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -281,7 +281,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -308,7 +308,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content index efea1e7c1f8db..52d6a3ba82a8d 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content @@ -1,15 +1,15 @@ Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -48,7 +48,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content index efea1e7c1f8db..52d6a3ba82a8d 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content @@ -1,15 +1,15 @@ Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -48,7 +48,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content index efea1e7c1f8db..52d6a3ba82a8d 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,15 +1,15 @@ Assets: amd64: - - 1208ebac31d91df9bbb8f57cfa0a41eb4b194497c0e27b3bbad4686e5342db8f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubelet - - d044a23ec5bfe9cce9618d003d8e382345ba3c5f03340b087c79fa0de5d96304@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - ca0451394c1ae9d3c170f52d30d094a3fbeacd987f1a7ab0dec7c62a60bf567f@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubelet - - d5e23c682928d2f4657e23d87ff59cda3a3498d7981b3c544c607efbe7f41822@https://dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.2/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.2 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -48,7 +48,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.2 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e1d74a412ed0e..482adcc5faa24 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: b1QRQZXFf6ncwQXoZpyLXfyZSA6AORZk6Ka5cQg3Qns= +NodeupConfigHash: oMih5oCE0nGCUn7C5mkPLqVlCRlqXTwj/2QroFEHXx0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data index c88d6d965cea4..f01b7612c2d8a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Thn5Dt0OXLJGbrqHrUfib/BXZ9E8+DqK2GU1MZNCl1E= +NodeupConfigHash: mCPrUxOIsCQ1KSVx/pXAO+C5URJrWKrldXLJWawlp3g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index e44519a939dde..4ed3613b69999 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -103,7 +103,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0-rc.1 + image: registry.k8s.io/kube-apiserver:v1.25.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -132,7 +132,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0-rc.1 + image: registry.k8s.io/kube-controller-manager:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -153,13 +153,13 @@ spec: serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + image: registry.k8s.io/kube-proxy:v1.25.0 logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0-rc.1 + image: registry.k8s.io/kube-scheduler:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -185,7 +185,7 @@ spec: shutdownGracePeriodCriticalPods: 0s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.25.0-rc.1 + kubernetesVersion: 1.25.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a18a055562b8a..ef8da462fc936 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -30,7 +30,7 @@ APIServerConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0-rc.1 + image: registry.k8s.io/kube-apiserver:v1.25.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -60,8 +60,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 367e3fbdf67d3c51d0d6790c606420ae7d063daa7c274f74d496dbaf7c2c7346@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet - - 07898c9f3e8bd94c6ee3211f3de4adab38a0c6900130206ff685ee632076393b@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl + - 7f9183fce12606818612ce80b6c09757452c4fb50aefea5fc5843951c5020e24@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet + - e23cc7092218c95c22d8ee36fb9499194a36ac5b5349ca476886b7edc0203885@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 @@ -70,8 +70,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - 4c77e4c466761d26431fe3292577b102477dee20c4c3267a014d1bc0913cd742@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet - - e0c15a7b7e0086b459587ce472caf7282becfd4423d3c71226ac350fadf2fa8f@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl + - 69572a7b3d179d4a479aa2e0f90e2f091d8d84ef33a35422fc89975dc137a590@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet + - 24db547bbae294c5c44f2b4a777e45f0e2f3d6295eace0d0c4be2b2dfa45330d@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -243,7 +243,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0-rc.1 + image: registry.k8s.io/kube-controller-manager:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -252,7 +252,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0-rc.1 + image: registry.k8s.io/kube-scheduler:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -282,7 +282,7 @@ KeypairIDs: service-account: "2" KubeProxy: cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + image: registry.k8s.io/kube-proxy:v1.25.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -310,7 +310,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 0s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.25.0-rc.1 +KubernetesVersion: 1.25.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content index ac957adae89ac..888482ea225d3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,15 +1,15 @@ Assets: amd64: - - 367e3fbdf67d3c51d0d6790c606420ae7d063daa7c274f74d496dbaf7c2c7346@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet - - 07898c9f3e8bd94c6ee3211f3de4adab38a0c6900130206ff685ee632076393b@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl + - 7f9183fce12606818612ce80b6c09757452c4fb50aefea5fc5843951c5020e24@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet + - e23cc7092218c95c22d8ee36fb9499194a36ac5b5349ca476886b7edc0203885@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - 4c77e4c466761d26431fe3292577b102477dee20c4c3267a014d1bc0913cd742@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet - - e0c15a7b7e0086b459587ce472caf7282becfd4423d3c71226ac350fadf2fa8f@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl + - 69572a7b3d179d4a479aa2e0f90e2f091d8d84ef33a35422fc89975dc137a590@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet + - 24db547bbae294c5c44f2b4a777e45f0e2f3d6295eace0d0c4be2b2dfa45330d@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + image: registry.k8s.io/kube-proxy:v1.25.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -49,7 +49,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 0s shutdownGracePeriodCriticalPods: 0s -KubernetesVersion: 1.25.0-rc.1 +KubernetesVersion: 1.25.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index de66982eb28d3..661eb45d8fee1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: FKC6mAhrhU1l5nqiViz8mCM9nuofbTN/hS/EOMsgcnQ= +NodeupConfigHash: N70vwNKsb7OoS2SsarT7WeliecPI24iYTOxq0/5oPmc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data index 1b4fdf1ac73c2..c6452370f3b38 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: nC+Cw+778sryXdb/JSK8/xmaOKsP6sEuD4D8I4dFTtI= +NodeupConfigHash: k06Vm8rMe1oGr5wV2JyxztM19INqHCy5DN6eHKIO+pg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 8c4fb197bbc9b..753b94f0d44bd 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -103,7 +103,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -132,7 +132,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -160,13 +160,13 @@ spec: serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -192,7 +192,7 @@ spec: shutdownGracePeriodCriticalPods: 0s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.26.0-alpha.0 + kubernetesVersion: 1.26.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 35a4e20c0887b..465bc9d86100d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -30,7 +30,7 @@ APIServerConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -60,8 +60,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0eeb400fd028f5848c6d63c88b63148867bc36773e80ff9a9509c59e41859f51@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet - - 908abb954a0d131e5b702f4faecaa310d19ca217c09bb90a340f24a2b5e2a567@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 @@ -70,8 +70,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - c01a2ce56a4484354a7db11abac8166fa45215855662726b43639072608ecbfa@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet - - de553916b8607682b10cd6f6c333204b5f0186a10e2007a44528542845ffb28c@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -243,7 +243,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -252,7 +252,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -282,7 +282,7 @@ KeypairIDs: service-account: "2" KubeProxy: cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -310,7 +310,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 0s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.26.0-alpha.0 +KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content index 7a75d6acb3225..c015f0e57b1af 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,15 +1,15 @@ Assets: amd64: - - 0eeb400fd028f5848c6d63c88b63148867bc36773e80ff9a9509c59e41859f51@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet - - 908abb954a0d131e5b702f4faecaa310d19ca217c09bb90a340f24a2b5e2a567@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - c01a2ce56a4484354a7db11abac8166fa45215855662726b43639072608ecbfa@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet - - de553916b8607682b10cd6f6c333204b5f0186a10e2007a44528542845ffb28c@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -49,7 +49,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 0s shutdownGracePeriodCriticalPods: 0s -KubernetesVersion: 1.26.0-alpha.0 +KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 7715b81f1c7ca..d1ec144c6b635 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: /ON/O2PlZc10xVEsLuvmXrnSXHz/wNiqRXQBw5hRoys= +NodeupConfigHash: x3jxVaE+NZHbLpWckFGe/oAfrCzax2m9GlqBrTtLDcA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data index a16c25fb203dd..820a775bc3b65 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: w3JZnU4OvbkIqa+ke5ijNk0u0xTsTxw2BREmVWNXJCo= +NodeupConfigHash: r9Aw4Is/JImEHEjQjkHOEJR8G0tLMJYo7beeOfXruNs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index 0d7cf6c3f8e81..274e9b4e0bc55 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -87,7 +87,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0-rc.1 + image: registry.k8s.io/kube-apiserver:v1.25.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -116,7 +116,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0-rc.1 + image: registry.k8s.io/kube-controller-manager:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -138,13 +138,13 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + image: registry.k8s.io/kube-proxy:v1.25.0 logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0-rc.1 + image: registry.k8s.io/kube-scheduler:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -171,7 +171,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: 1.25.0-rc.1 + kubernetesVersion: 1.25.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e3d5ce45891e5..2aea3d7507fad 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -29,7 +29,7 @@ APIServerConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0-rc.1 + image: registry.k8s.io/kube-apiserver:v1.25.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -59,8 +59,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 367e3fbdf67d3c51d0d6790c606420ae7d063daa7c274f74d496dbaf7c2c7346@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet - - 07898c9f3e8bd94c6ee3211f3de4adab38a0c6900130206ff685ee632076393b@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl + - 7f9183fce12606818612ce80b6c09757452c4fb50aefea5fc5843951c5020e24@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet + - e23cc7092218c95c22d8ee36fb9499194a36ac5b5349ca476886b7edc0203885@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 @@ -69,8 +69,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - 4c77e4c466761d26431fe3292577b102477dee20c4c3267a014d1bc0913cd742@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet - - e0c15a7b7e0086b459587ce472caf7282becfd4423d3c71226ac350fadf2fa8f@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl + - 69572a7b3d179d4a479aa2e0f90e2f091d8d84ef33a35422fc89975dc137a590@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet + - 24db547bbae294c5c44f2b4a777e45f0e2f3d6295eace0d0c4be2b2dfa45330d@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -242,7 +242,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0-rc.1 + image: registry.k8s.io/kube-controller-manager:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -251,7 +251,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0-rc.1 + image: registry.k8s.io/kube-scheduler:v1.25.0 leaderElection: leaderElect: true logLevel: 2 @@ -281,7 +281,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + image: registry.k8s.io/kube-proxy:v1.25.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -310,7 +310,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.25.0-rc.1 +KubernetesVersion: 1.25.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content index 3e84b9bbe80f2..6d15e9a77082f 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,15 +1,15 @@ Assets: amd64: - - 367e3fbdf67d3c51d0d6790c606420ae7d063daa7c274f74d496dbaf7c2c7346@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubelet - - 07898c9f3e8bd94c6ee3211f3de4adab38a0c6900130206ff685ee632076393b@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/amd64/kubectl + - 7f9183fce12606818612ce80b6c09757452c4fb50aefea5fc5843951c5020e24@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubelet + - e23cc7092218c95c22d8ee36fb9499194a36ac5b5349ca476886b7edc0203885@https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - 4c77e4c466761d26431fe3292577b102477dee20c4c3267a014d1bc0913cd742@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubelet - - e0c15a7b7e0086b459587ce472caf7282becfd4423d3c71226ac350fadf2fa8f@https://dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0-rc.1/bin/linux/arm64/kubectl + - 69572a7b3d179d4a479aa2e0f90e2f091d8d84ef33a35422fc89975dc137a590@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubelet + - 24db547bbae294c5c44f2b4a777e45f0e2f3d6295eace0d0c4be2b2dfa45330d@https://dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.25.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + image: registry.k8s.io/kube-proxy:v1.25.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -50,7 +50,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.25.0-rc.1 +KubernetesVersion: 1.25.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5a59946c6899d..ca2fb3884ea9d 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: OiVi4XO7C2ZP7JrJNvsSrUu/rw42X8A8alEbjC2mDLU= +NodeupConfigHash: XWq88mXIY6RK1jwwkJnSaNWlmyUbNKfi5Yvy3od16Vs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data index 2f7df87970b6d..45f8837072b20 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: nyKvhF/djoMpAKLWvu8A5vwy7gwzhIvULJFvGSlTtu4= +NodeupConfigHash: Z3tssuQCMwTHq7oJOMFQFHSQu+4t/RMGzqXFhCINaoc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index 9535f14873b7b..75d901d3b84c4 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -87,7 +87,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -116,7 +116,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -138,13 +138,13 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -171,7 +171,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: 1.26.0-alpha.0 + kubernetesVersion: 1.26.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 44b055a69cb1d..480e9bc1715c1 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -29,7 +29,7 @@ APIServerConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -59,8 +59,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0eeb400fd028f5848c6d63c88b63148867bc36773e80ff9a9509c59e41859f51@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet - - 908abb954a0d131e5b702f4faecaa310d19ca217c09bb90a340f24a2b5e2a567@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 @@ -69,8 +69,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - c01a2ce56a4484354a7db11abac8166fa45215855662726b43639072608ecbfa@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet - - de553916b8607682b10cd6f6c333204b5f0186a10e2007a44528542845ffb28c@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -242,7 +242,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -251,7 +251,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -281,7 +281,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -310,7 +310,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.26.0-alpha.0 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content index a4a52255eae2d..63b114daf504a 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,15 +1,15 @@ Assets: amd64: - - 0eeb400fd028f5848c6d63c88b63148867bc36773e80ff9a9509c59e41859f51@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet - - 908abb954a0d131e5b702f4faecaa310d19ca217c09bb90a340f24a2b5e2a567@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - c01a2ce56a4484354a7db11abac8166fa45215855662726b43639072608ecbfa@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet - - de553916b8607682b10cd6f6c333204b5f0186a10e2007a44528542845ffb28c@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -50,7 +50,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.0 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index f0a539316f2a1..ec78d2c7095a4 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: +A4VAYDV9+NMePNci724sX4+YXiuTRKSRxkbOyU7kz8= +NodeupConfigHash: wleXf89hNQun/rYhntfMukV4JXWlHMKZnGNDb+9RyYk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data index 18fff8c563c56..7bf839e08b2b9 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Df/z9p+VQqiNiKlE8GCTcgk4bBgU+Ida2TtB0jh14fE= +NodeupConfigHash: Fg4nrIkPHMNFsDqZdx2rpeXr5dTcpkOSIZ+KAQZo+oQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content index 3bb3c8c3aeb1c..40582d4b7266b 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content @@ -86,7 +86,7 @@ spec: - /events#https://127.0.0.1:4002 featureGates: InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.29.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.29.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -114,7 +114,7 @@ spec: configureCloudRoutes: false featureGates: InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.29.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.29.0 leaderElection: leaderElect: true logLevel: 2 @@ -136,12 +136,12 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.29.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.29.0 logLevel: 2 kubeScheduler: featureGates: InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.29.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.29.0 leaderElection: leaderElect: true logLevel: 2 @@ -167,7 +167,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: 1.29.0-alpha.0 + kubernetesVersion: 1.29.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index fedce6aae7faf..62219b1b9e258 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -28,7 +28,7 @@ APIServerConfig: - /events#https://127.0.0.1:4002 featureGates: InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.29.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.29.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -58,8 +58,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 15448fe9b6464e3faec1fc8273b4c9c4c6bb17d5f2df116420ef6df6cb8ab3f6@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubelet - - bea582731cd9585b838d60fe63c5e6e9f74616eaea09982497a636f618e8d3a3@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubectl + - e1c38137db8d8777eed8813646b59bf4d22d19b9011ab11dc28e2e34f6b80a05@https://dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubelet + - 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5@https://dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubectl - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64 - f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz - c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz @@ -69,8 +69,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - d7db0c24157cd20b8625665cdf9e4f97f193f83bbe0cdb787e1a79175eb854a2@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubelet - - 247a1b42dbdbba49be382759f7561c56ce1a41da8b0b7a731b979c5c8024013a@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubectl + - 0e0e4544c2a0a3475529154b7534d0d58683466efa04a2bb2e763b476db0bb16@https://dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubelet + - 8f7a4bd6bae900a4ddab12bd1399aa652c0d59ea508f39b910e111d248893ff7@https://dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubectl - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64 - 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz - 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz @@ -242,7 +242,7 @@ ControlPlaneConfig: configureCloudRoutes: false featureGates: InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.29.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.29.0 leaderElection: leaderElect: true logLevel: 2 @@ -250,7 +250,7 @@ ControlPlaneConfig: KubeScheduler: featureGates: InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.29.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.29.0 leaderElection: leaderElect: true logLevel: 2 @@ -280,7 +280,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.29.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.29.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -308,7 +308,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.29.0-alpha.0 +KubernetesVersion: 1.29.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content index 3c1bdeb814b20..dac10630e4923 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,7 +1,7 @@ Assets: amd64: - - 15448fe9b6464e3faec1fc8273b4c9c4c6bb17d5f2df116420ef6df6cb8ab3f6@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubelet - - bea582731cd9585b838d60fe63c5e6e9f74616eaea09982497a636f618e8d3a3@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/amd64/kubectl + - e1c38137db8d8777eed8813646b59bf4d22d19b9011ab11dc28e2e34f6b80a05@https://dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubelet + - 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5@https://dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/amd64/kubectl - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64 - f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz - c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz @@ -9,8 +9,8 @@ Assets: - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - d7db0c24157cd20b8625665cdf9e4f97f193f83bbe0cdb787e1a79175eb854a2@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubelet - - 247a1b42dbdbba49be382759f7561c56ce1a41da8b0b7a731b979c5c8024013a@https://dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0-alpha.0/bin/linux/arm64/kubectl + - 0e0e4544c2a0a3475529154b7534d0d58683466efa04a2bb2e763b476db0bb16@https://dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubelet + - 8f7a4bd6bae900a4ddab12bd1399aa652c0d59ea508f39b910e111d248893ff7@https://dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.29.0/bin/linux/arm64/kubectl - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64 - 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz - 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz @@ -27,7 +27,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.29.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.29.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -51,7 +51,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.29.0-alpha.0 +KubernetesVersion: 1.29.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ea9b42e586ea4..470ef7345f064 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: mqFEeuDc96Rck5faSS1Nxy8nMvrLj4RsQqx84EWYxcM= +NodeupConfigHash: 5sesXbeGE9XMAABr7HjIide2ZfBEm/jwv39JpPA9L0c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data index 703cb4046a0ec..e68d6b701b51a 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: IyrtGpwgOs5l+A39vHkQQcm7tD8tTaHaXgDSvGJPI0Y= +NodeupConfigHash: v4PA1h1tDo5lWhCzOHjOtB+OzGwW4hKy6emkdB41csw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index c48a8986a0341..432c426298dc7 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -86,7 +86,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -115,7 +115,7 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -137,13 +137,13 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -170,7 +170,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: 1.26.0-alpha.0 + kubernetesVersion: 1.26.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 85be9f26391f6..21ccf7c9bb928 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -28,7 +28,7 @@ APIServerConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 + image: registry.k8s.io/kube-apiserver:v1.26.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -58,8 +58,8 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0eeb400fd028f5848c6d63c88b63148867bc36773e80ff9a9509c59e41859f51@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet - - 908abb954a0d131e5b702f4faecaa310d19ca217c09bb90a340f24a2b5e2a567@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 @@ -68,8 +68,8 @@ Assets: - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - c01a2ce56a4484354a7db11abac8166fa45215855662726b43639072608ecbfa@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet - - de553916b8607682b10cd6f6c333204b5f0186a10e2007a44528542845ffb28c@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -241,7 +241,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 + image: registry.k8s.io/kube-controller-manager:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -250,7 +250,7 @@ ControlPlaneConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 + image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: leaderElect: true logLevel: 2 @@ -279,7 +279,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -308,7 +308,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.26.0-alpha.0 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content index 8138070d5513c..6d1e7f71c4176 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,15 +1,15 @@ Assets: amd64: - - 0eeb400fd028f5848c6d63c88b63148867bc36773e80ff9a9509c59e41859f51@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubelet - - 908abb954a0d131e5b702f4faecaa310d19ca217c09bb90a340f24a2b5e2a567@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/amd64/kubectl + - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet + - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz arm64: - - c01a2ce56a4484354a7db11abac8166fa45215855662726b43639072608ecbfa@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubelet - - de553916b8607682b10cd6f6c333204b5f0186a10e2007a44528542845ffb28c@https://dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0-alpha.0/bin/linux/arm64/kubectl + - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet + - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 @@ -25,7 +25,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + image: registry.k8s.io/kube-proxy:v1.26.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -50,7 +50,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0-alpha.0 +KubernetesVersion: 1.26.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13