From 092073eb0c03ef0db3140ae3c17e05fb082738cd Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 30 Aug 2025 15:37:49 +0300 Subject: [PATCH] hack/update-expected.sh Signed-off-by: Ciprian Hacman --- .../golden/awsiam/tasks-kube-apiserver.yaml | 2 +- .../tasks-kube-apiserver.yaml | 2 +- .../tasks-kube-apiserver.yaml | 2 +- .../tests/kubelet/featuregates/tasks.yaml | 2 +- .../model/tests/kubelet/warmpool/tasks.yaml | 2 +- .../ha_encrypt/expected-v1alpha2.yaml | 15 --- .../ipv6/expected-v1alpha2.yaml | 5 - .../karpenter/expected-v1alpha2.yaml | 5 - ...rs.additionalobjects.example.com_user_data | 2 +- ...es.additionalobjects.example.com_user_data | 2 +- ...-controller.addons.k8s.io-k8s-1.18_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 33 ------ ...jects.example.com-addons-bootstrap_content | 4 +- ...s_s3_object_cluster-completed.spec_content | 27 ++--- ...cdmanager-events-master-us-test-1a_content | 102 ++++++------------ ...etcdmanager-main-master-us-test-1a_content | 102 ++++++------------ ...ect_nodeupconfig-master-us-test-1a_content | 38 +++---- .../aws_s3_object_nodeupconfig-nodes_content | 25 ++--- .../additionalobjects/in-v1alpha2.yaml | 2 +- ...r.apiservers.minimal.example.com_user_data | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...mplate_nodes.minimal.example.com_user_data | 2 +- ...s_s3_object_cluster-completed.spec_content | 29 ++--- ...cdmanager-events-master-us-test-1a_content | 102 ++++++------------ ...etcdmanager-main-master-us-test-1a_content | 102 ++++++------------ ...-controller.addons.k8s.io-k8s-1.18_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 33 ------ ...nimal.example.com-addons-bootstrap_content | 4 +- ...s_s3_object_nodeupconfig-apiserver_content | 36 +++---- ...ect_nodeupconfig-master-us-test-1a_content | 44 ++++---- .../aws_s3_object_nodeupconfig-nodes_content | 31 +++--- .../apiservernodes/in-v1alpha2.yaml | 2 +- ....masters.minimal-aws.example.com_user_data | 2 +- ...te_nodes.minimal-aws.example.com_user_data | 2 +- ...s_s3_object_cluster-completed.spec_content | 29 ++--- ...cdmanager-events-master-us-test-1a_content | 102 ++++++------------ ...etcdmanager-main-master-us-test-1a_content | 102 ++++++------------ ...-controller.addons.k8s.io-k8s-1.18_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 33 ------ ...l-aws.example.com-addons-bootstrap_content | 4 +- ...ect_nodeupconfig-master-us-test-1a_content | 44 ++++---- .../aws_s3_object_nodeupconfig-nodes_content | 31 +++--- .../minimal-aws/in-v1alpha2.yaml | 2 +- ....masters.privatedns1.example.com_user_data | 2 +- ...te_nodes.privatedns1.example.com_user_data | 2 +- ...s_s3_object_cluster-completed.spec_content | 29 ++--- ...cdmanager-events-master-us-test-1a_content | 102 ++++++------------ ...etcdmanager-main-master-us-test-1a_content | 102 ++++++------------ ...ect_nodeupconfig-master-us-test-1a_content | 44 ++++---- .../aws_s3_object_nodeupconfig-nodes_content | 31 +++--- ...-controller.addons.k8s.io-k8s-1.18_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 33 ------ ...edns1.example.com-addons-bootstrap_content | 4 +- .../privatedns1/in-v1alpha2.yaml | 2 +- ...sters.privateflannel.example.com_user_data | 2 +- ...nodes.privateflannel.example.com_user_data | 2 +- ...s_s3_object_cluster-completed.spec_content | 29 ++--- ...cdmanager-events-master-us-test-1a_content | 102 ++++++------------ ...etcdmanager-main-master-us-test-1a_content | 102 ++++++------------ ...ect_nodeupconfig-master-us-test-1a_content | 44 ++++---- .../aws_s3_object_nodeupconfig-nodes_content | 31 +++--- ...-controller.addons.k8s.io-k8s-1.18_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 33 ------ ...annel.example.com-addons-bootstrap_content | 4 +- .../privateflannel/in-v1alpha2.yaml | 2 +- 65 files changed, 569 insertions(+), 1255 deletions(-) diff --git a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml index 2b39d08926..bd1f5fab9e 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml @@ -54,7 +54,7 @@ contents: | - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key - --etcd-servers-overrides=/events#https://127.0.0.1:4002 - --etcd-servers=https://127.0.0.1:4001 - - --feature-gates=CSIMigrationAWS=true,InTreePluginAWSUnregister=true + - --feature-gates=InTreePluginAWSUnregister=true - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml index 6e6521b702..471293da66 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml @@ -32,7 +32,7 @@ contents: | - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key - --etcd-servers-overrides=/events#https://events.etcd.internal.minimal.example.com:4002 - --etcd-servers=https://main.etcd.internal.minimal.example.com:4001 - - --feature-gates=CSIMigrationAWS=true,InTreePluginAWSUnregister=true + - --feature-gates=InTreePluginAWSUnregister=true - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml index 03f9fbfa9a..ce1465c78b 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml @@ -31,7 +31,7 @@ contents: | - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key - --etcd-servers=https://127.0.0.1:4001 - - --feature-gates=CSIMigrationAWS=true,InTreePluginAWSUnregister=true + - --feature-gates=InTreePluginAWSUnregister=true - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml index 357bc707ab..bcb2f8dab0 100644 --- a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml +++ b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml @@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests type: directory --- contents: | - DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=AllowExtTrafficLocalEndpoints=false,CSIMigrationAWS=true,ExperimentalCriticalPodAnnotation=true,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --resolv-conf=/run/systemd/resolve/resolv.conf --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf" + DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --resolv-conf=/run/systemd/resolve/resolv.conf --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf --image-credential-provider-config=/var/lib/kubelet/credential-provider.conf --image-credential-provider-bin-dir=/usr/local/bin" HOME="/root" path: /etc/sysconfig/kubelet type: file diff --git a/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml b/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml index 8a18a91899..655c2b9543 100644 --- a/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml +++ b/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml @@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests type: directory --- contents: | - DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=CSIMigrationAWS=true,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --resolv-conf=/run/systemd/resolve/resolv.conf --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf" + DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --resolv-conf=/run/systemd/resolve/resolv.conf --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf --image-credential-provider-config=/var/lib/kubelet/credential-provider.conf --image-credential-provider-bin-dir=/usr/local/bin" HOME="/root" path: /etc/sysconfig/kubelet type: file diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index 0acef5592b..7378218f69 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -88,8 +88,6 @@ metadata: name: control-plane-us-test-1a spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpTokens: required machineType: m3.medium maxSize: 1 minSize: 1 @@ -108,8 +106,6 @@ metadata: name: control-plane-us-test-1b spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpTokens: required machineType: m3.medium maxSize: 1 minSize: 1 @@ -128,8 +124,6 @@ metadata: name: control-plane-us-test-1c spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpTokens: required machineType: m3.medium maxSize: 1 minSize: 1 @@ -148,9 +142,6 @@ metadata: name: nodes-us-test-1a spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpPutResponseHopLimit: 1 - httpTokens: required machineType: t2.medium maxSize: 1 minSize: 1 @@ -169,9 +160,6 @@ metadata: name: nodes-us-test-1b spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpPutResponseHopLimit: 1 - httpTokens: required machineType: t2.medium maxSize: 1 minSize: 1 @@ -190,9 +178,6 @@ metadata: name: nodes-us-test-1c spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpPutResponseHopLimit: 1 - httpTokens: required machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index fa356cb70f..c30ab406b0 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -79,8 +79,6 @@ metadata: name: control-plane-us-test-1a spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpTokens: required machineType: m3.medium maxSize: 1 minSize: 1 @@ -99,9 +97,6 @@ metadata: name: nodes-us-test-1a spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpPutResponseHopLimit: 1 - httpTokens: required machineType: t2.medium maxSize: 1 minSize: 1 diff --git a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml index 78d47b71ee..b493b0d5b2 100644 --- a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml @@ -82,8 +82,6 @@ metadata: name: control-plane-us-test-1a spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpTokens: required machineType: m3.medium maxSize: 1 minSize: 1 @@ -102,9 +100,6 @@ metadata: name: nodes spec: image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250429 - instanceMetadata: - httpPutResponseHopLimit: 1 - httpTokens: required manager: Karpenter role: Node subnets: diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data index 78039d812d..7867fe7661 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data @@ -126,7 +126,7 @@ ClusterName: additionalobjects.example.com ConfigBase: memfs://tests/additionalobjects.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 2YJcSocHqsNZ1XBehq6eS7Phdn0DBKmJDd5O+OD5nEU= +NodeupConfigHash: g+QHBp1D/MxT/Z0S3z7blr63E0j87FIIaxBh1+cvv7Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data index e33391bbac..30c326bf0d 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data @@ -149,7 +149,7 @@ ConfigServer: - https://kops-controller.internal.additionalobjects.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: yLeo8FyF2cA/6O0kMRB5qy2R8xoCN8A/rKbQkyHAvRw= +NodeupConfigHash: aBwfUIsJ9yxEnd4525307LnhqJgtSA6tWv9hu1G4v4o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index a01a3206ff..be300018dc 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 9fee77c4e7..dd00e2018e 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -1017,39 +1017,6 @@ spec: volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ name: socket-dir - - args: - - --timeout=60s - - --csi-address=$(ADDRESS) - - --v=5 - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:v0.7.0 - imagePullPolicy: IfNotPresent - name: volumemodifier - resources: - limits: - memory: 256Mi - requests: - cpu: 10m - memory: 40Mi - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - seccompProfile: - type: RuntimeDefault - volumeMounts: - - mountPath: /var/lib/csi/sockets/pluginproxy/ - name: socket-dir - args: - --timeout=60s - --extra-modify-metadata diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content index defe41bbc2..7a9ab3d9b5 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content @@ -99,14 +99,14 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: a5cbfee0e2928f3fdec8d2b6d3d9b51dd08a2aa38ea4545456031496bedab663 + manifestHash: b0283fac5664254767431ceaaeb8dc995b3deb2f763de20ecc31a9a4b62af6db name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 753d95ab57230d78182a8b84c4839dcc4429d2c55dfb212b76a67039493b66c1 + manifestHash: 0ca3a0855b9799bff720aab4698661d8d3aa2afb0d85e36bda361f97c5e9e828 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index 694f497175..510ac1cf1a 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content @@ -18,7 +18,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: additionalobjects.example.com configureCloudRoutes: false - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 leaderElection: leaderElect: true cloudProvider: aws @@ -28,7 +28,7 @@ spec: logLevel: info runc: version: 1.3.0 - version: 1.7.28 + version: 2.1.4 dnsZone: Z1AFAKE1ZON3YO etcdClusters: - backups: @@ -69,7 +69,6 @@ spec: apiServerCount: 1 authorizationMode: Node,RBAC bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -86,9 +85,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.28.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -114,9 +111,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: additionalobjects.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.28.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -138,12 +133,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.28.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.28.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -156,20 +149,17 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: 1.28.0 + kubernetesVersion: 1.34.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,13 +170,12 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s masterPublicName: api.additionalobjects.example.com diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e85206e9c9..b1aa49cb1b 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 19c69d7921..e89643b394 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2b9f5e3d0a..b54a00000c 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -11,7 +11,6 @@ APIServerConfig: apiServerCount: 1 authorizationMode: Node,RBAC bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -28,9 +27,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.28.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -60,20 +57,20 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - bfb6b977100963f2879a33e5fbaa59a5276ba829a957a6819c936e9c1465f981@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet - - 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz - - 7a8c262deb63becc877e82d23749e4f99f4a17e8e660f9b8c257ca87a5c056b6@https://github.com/containerd/containerd/releases/download/v1.7.28/containerd-1.7.28-linux-amd64.tar.gz + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 - 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: - - 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet - - f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz - - 97457594ff8549cb82d664306593cafd3d2c781c706f9fffed885a46d8919bec@https://github.com/containerd/containerd/releases/download/v1.7.28/containerd-1.7.28-linux-arm64.tar.gz + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 @@ -238,17 +235,13 @@ ControlPlaneConfig: clusterCIDR: 100.96.0.0/11 clusterName: additionalobjects.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.28.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 useServiceAccountCredentials: true KubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.28.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -281,7 +274,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.28.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -293,7 +286,7 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -304,12 +297,11 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.28.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -323,7 +315,7 @@ containerdConfig: logLevel: info runc: version: 1.3.0 - version: 1.7.28 + version: 2.1.4 etcdManifests: - memfs://tests/additionalobjects.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://tests/additionalobjects.example.com/manifests/etcd/events-master-us-test-1a.yaml diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content index 64bab0b060..c42d360acf 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,17 +1,17 @@ Assets: amd64: - - bfb6b977100963f2879a33e5fbaa59a5276ba829a957a6819c936e9c1465f981@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet - - 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz - - 7a8c262deb63becc877e82d23749e4f99f4a17e8e660f9b8c257ca87a5c056b6@https://github.com/containerd/containerd/releases/download/v1.7.28/containerd-1.7.28-linux-amd64.tar.gz + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 arm64: - - 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet - - f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz - - 97457594ff8549cb82d664306593cafd3d2c781c706f9fffed885a46d8919bec@https://github.com/containerd/containerd/releases/download/v1.7.28/containerd-1.7.28-linux-arm64.tar.gz + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 CAs: {} ClusterName: additionalobjects.example.com @@ -24,7 +24,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.28.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -35,8 +35,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -45,10 +43,9 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.28.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -57,6 +54,6 @@ containerdConfig: logLevel: info runc: version: 1.3.0 - version: 1.7.28 + version: 2.1.4 usesLegacyGossip: false usesNoneDNS: false diff --git a/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml b/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml index 876a415db0..d6dd0717ca 100644 --- a/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml @@ -34,7 +34,7 @@ spec: kubernetesApiAccess: - 0.0.0.0/0 - ::/0 - kubernetesVersion: v1.28.0 + kubernetesVersion: v1.34.0 masterPublicName: api.additionalobjects.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data index 6c4644f6d2..3db02b837a 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data @@ -126,7 +126,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer -NodeupConfigHash: A+fS3YgoCWPMpS6veQ/qAWrBmX64NhDMWXgkVe4dzoI= +NodeupConfigHash: BT7FMLBtkdX59X3m/fdY5QY2tb6a8irNtI1Gb+UYzDk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index bafb86cec6..b0ac11773e 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -126,7 +126,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: OuZzJU+c4fQRU4nX5hK7IwUiYtB9B0uFx2ZEbir1ko0= +NodeupConfigHash: g3y7rcvlRtw+TeVxbLy47rbW05hfsvvCsdpJg8IFLGY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data index b54c1632b6..7450d98c76 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -149,7 +149,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: IM+gqlrtrGmmPpf8t6ECtUXAZlVREu4v7tOAEMJV2q8= +NodeupConfigHash: hRhofECwIusj1nVOj29GfEw25rZbQEB1UZic5KAWycs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index 5a2e971c35..0a048c6dc2 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -18,7 +18,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: minimal.example.com configureCloudRoutes: false - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 leaderElection: leaderElect: true cloudProvider: aws @@ -27,8 +27,8 @@ spec: containerd: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 dnsZone: Z1AFAKE1ZON3YO etcdClusters: - backups: @@ -62,7 +62,6 @@ spec: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -79,9 +78,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -107,9 +104,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: minimal.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -131,12 +126,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -149,19 +142,16 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.27.0 + kubernetesVersion: 1.34.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -172,13 +162,12 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s masterPublicName: api.minimal.example.com diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 00f05acc4d..59a4e55c8e 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -41,80 +41,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -134,6 +88,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index f146518a14..b8d6681f2b 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -41,80 +41,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -134,6 +88,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index b7e62c8d98..adc407bc80 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ff7ee9d06e..c4a96c42b1 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -1017,39 +1017,6 @@ spec: volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ name: socket-dir - - args: - - --timeout=60s - - --csi-address=$(ADDRESS) - - --v=5 - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:v0.7.0 - imagePullPolicy: IfNotPresent - name: volumemodifier - resources: - limits: - memory: 256Mi - requests: - cpu: 10m - memory: 40Mi - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - seccompProfile: - type: RuntimeDefault - volumeMounts: - - mountPath: /var/lib/csi/sockets/pluginproxy/ - name: socket-dir - args: - --timeout=60s - --extra-modify-metadata diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 06973fb72f..c0108852c9 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -99,14 +99,14 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: fdcbb173585218f08cf29f1fe3ca94cdc47b8b85a0f722db8f16eb25dccc7e97 + manifestHash: 60e82d4f6ecd2c3b7d0a7d8d72ec78dae235dd75cd0711db0cd6a5c811466993 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 93c7269843ed2f8acef3f95774cf1f1d9851d88d157e0b0da04336741694393f + manifestHash: 5a4abbf941e522632a68daf3fe3d2db1ed47a4d69d082cea723f30f794387be6 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content index 5e118750ef..fbd9150e25 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content @@ -11,7 +11,6 @@ APIServerConfig: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -28,9 +27,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -60,19 +57,19 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 arm64: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 CAs: apiserver-aggregator-ca: | -----BEGIN CERTIFICATE----- @@ -159,7 +156,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -170,8 +167,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -179,12 +174,11 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/api-server=:NoSchedule -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -195,8 +189,8 @@ configStore: containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 staticManifests: - key: kube-apiserver-healthcheck path: manifests/static/kube-apiserver-healthcheck.yaml diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a1316ae46f..f7f6fd5974 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -11,7 +11,6 @@ APIServerConfig: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -28,9 +27,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -60,21 +57,21 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 - 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: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -238,17 +235,13 @@ ControlPlaneConfig: clusterCIDR: 100.96.0.0/11 clusterName: minimal.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 useServiceAccountCredentials: true KubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -279,7 +272,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -291,7 +284,7 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -302,12 +295,11 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -320,8 +312,8 @@ configStore: containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content index 25e6259a31..e327492b4d 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,18 +1,18 @@ Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 arm64: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 CAs: {} ClusterName: minimal.example.com Hooks: @@ -24,7 +24,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -35,8 +35,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -44,10 +42,9 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -55,7 +52,7 @@ UpdatePolicy: automatic containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 usesLegacyGossip: false usesNoneDNS: false diff --git a/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml b/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml index 705a5c1604..919c0d7d38 100644 --- a/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml @@ -21,7 +21,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.27.0 + kubernetesVersion: v1.34.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data index 4c0b2693af..0392c64832 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data +++ b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data @@ -126,7 +126,7 @@ ClusterName: minimal-aws.example.com ConfigBase: memfs://clusters.example.com/minimal-aws.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LbLpKnSxXk8Lb4A0WtgcJkU+S7NHiMZbQg9sYmRYocQ= +NodeupConfigHash: Hr4M+T3zAYyVuT8TBBtOA1pvd2sio/cnNRzO8IgFIeE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data index 425e5d5ffd..0b6ca680e5 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data +++ b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data @@ -149,7 +149,7 @@ ConfigServer: - https://kops-controller.internal.minimal-aws.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: sJovxsjaEzC7snWupUAhymZMSHXRf91VnIehX9lyt40= +NodeupConfigHash: ZkICFcYJV6pPjoTuVrsd756NXXyzGPQ97fMuqXt2hhk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content index 641a6bbe32..d977f97b7b 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content @@ -18,7 +18,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: minimal-aws.example.com configureCloudRoutes: false - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 leaderElection: leaderElect: true cloudProvider: aws @@ -27,8 +27,8 @@ spec: containerd: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 dnsZone: Z1AFAKE1ZON3YO etcdClusters: - backups: @@ -60,7 +60,6 @@ spec: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -77,9 +76,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -105,9 +102,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: minimal-aws.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -129,12 +124,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -146,19 +139,16 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.27.0 + kubernetesVersion: 1.34.0 masterKubelet: cgroupDriver: systemd cgroupRoot: / @@ -168,13 +158,12 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s masterPublicName: api.minimal-aws.example.com diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3c880bcf88..dd3b38237c 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c8051e2a97..d143202913 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index 9599b09f60..97f2a91172 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 6b3f0cc913..635386d6c7 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -1017,39 +1017,6 @@ spec: volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ name: socket-dir - - args: - - --timeout=60s - - --csi-address=$(ADDRESS) - - --v=5 - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:v0.7.0 - imagePullPolicy: IfNotPresent - name: volumemodifier - resources: - limits: - memory: 256Mi - requests: - cpu: 10m - memory: 40Mi - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - seccompProfile: - type: RuntimeDefault - volumeMounts: - - mountPath: /var/lib/csi/sockets/pluginproxy/ - name: socket-dir - args: - --timeout=60s - --extra-modify-metadata diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content index ce839b7b8c..853de0ad45 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content @@ -99,14 +99,14 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 0fedea9a031f9c984aca952ab861b5c491afd935b204c4087b1bb292d0692a3f + manifestHash: 6f21ae22de925af980b27104037b18f95bb34a28052b8254ed7637552eb82654 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 1d0b9d35c1d355f6e0010359614ece56c84f2309153d64be3f111a480aaf07f1 + manifestHash: 3bf35e7ed8c2a346511fa5a7458775267c3829297481643a8da282c0c9876a1c name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 3e11c41d3c..398ab2c23e 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -11,7 +11,6 @@ APIServerConfig: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -28,9 +27,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -60,21 +57,21 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 - 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: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -238,17 +235,13 @@ ControlPlaneConfig: clusterCIDR: 100.96.0.0/11 clusterName: minimal-aws.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 useServiceAccountCredentials: true KubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -279,7 +272,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -290,7 +283,7 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -300,12 +293,11 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -318,8 +310,8 @@ configStore: containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 etcdManifests: - memfs://clusters.example.com/minimal-aws.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://clusters.example.com/minimal-aws.example.com/manifests/etcd/events-master-us-test-1a.yaml diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content index 585c20be60..ab0efc7466 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,18 +1,18 @@ Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 arm64: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 CAs: {} ClusterName: minimal-aws.example.com Hooks: @@ -24,7 +24,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -34,8 +34,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -43,10 +41,9 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -54,7 +51,7 @@ UpdatePolicy: automatic containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 usesLegacyGossip: false usesNoneDNS: false diff --git a/tests/integration/update_cluster/minimal-aws/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-aws/in-v1alpha2.yaml index 09e664ddef..67cbc66c92 100644 --- a/tests/integration/update_cluster/minimal-aws/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-aws/in-v1alpha2.yaml @@ -18,7 +18,7 @@ spec: - instanceGroup: master-us-test-1a name: us-test-1a name: events - kubernetesVersion: v1.27.0 + kubernetesVersion: v1.34.0 masterPublicName: api.minimal-aws.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 69a88cfde8..a68af1a1af 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -126,7 +126,7 @@ ClusterName: privatedns1.example.com ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: G78R/GLpwjyr2FE02fQ1t2lick4Z5cBpvLR3TBgQ9w4= +NodeupConfigHash: /ab+P9wzpHbxURR+EqjrnWYNTkWqAbFAmrhUpmCZC5g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index 87dd851be0..985766a7fa 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -149,7 +149,7 @@ ConfigServer: - https://kops-controller.internal.privatedns1.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ehJPcHIEi/nKPhvKjga/Wlf5A3sjAj9kmImoWhmHWqs= +NodeupConfigHash: K6AJVAKBsSY2Orfj4HbKI7N6D5OKj40+U96u6V7TksE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 03ebbbd44e..7ea29e9947 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: privatedns1.example.com configureCloudRoutes: false - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 leaderElection: leaderElect: true cloudLabels: @@ -32,8 +32,8 @@ spec: containerd: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 dnsZone: internal.example.com etcdClusters: - backups: @@ -67,7 +67,6 @@ spec: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -84,9 +83,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -112,9 +109,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: privatedns1.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -136,12 +131,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -154,19 +147,16 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.27.0 + kubernetesVersion: 1.34.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,13 +167,12 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s masterPublicName: api.privatedns1.example.com diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index b5c57406b0..628cff366c 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5ff0aae024..edb81e0e0e 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 1f4dc51745..529f6d928d 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -10,7 +10,6 @@ APIServerConfig: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -27,9 +26,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -59,21 +56,21 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 - 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: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -237,17 +234,13 @@ ControlPlaneConfig: clusterCIDR: 100.96.0.0/11 clusterName: privatedns1.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 useServiceAccountCredentials: true KubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -278,7 +271,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -290,7 +283,7 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -300,12 +293,11 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -318,8 +310,8 @@ configStore: containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 etcdManifests: - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/events-master-us-test-1a.yaml diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content index 609349fe1f..a5f6d8e7c5 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,18 +1,18 @@ Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 arm64: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 CAs: {} ClusterName: privatedns1.example.com Hooks: @@ -24,7 +24,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -35,8 +35,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -44,10 +42,9 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 @@ -55,7 +52,7 @@ UpdatePolicy: automatic containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 usesLegacyGossip: false usesNoneDNS: false diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index d129cdd404..99974d57cd 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 9504ac5921..df9c65ea2a 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -1017,39 +1017,6 @@ spec: volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ name: socket-dir - - args: - - --timeout=60s - - --csi-address=$(ADDRESS) - - --v=5 - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:v0.7.0 - imagePullPolicy: IfNotPresent - name: volumemodifier - resources: - limits: - memory: 256Mi - requests: - cpu: 10m - memory: 40Mi - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - seccompProfile: - type: RuntimeDefault - volumeMounts: - - mountPath: /var/lib/csi/sockets/pluginproxy/ - name: socket-dir - args: - --timeout=60s - --extra-modify-metadata diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content index 1b01628198..a0321709da 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content @@ -99,14 +99,14 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 0d92f352f7586bbb5054e9fefe9f86d245be7e2a1f78fe2964d4fe25303ae522 + manifestHash: 28213bf23b00f19760812fbd7ecc1fa9b7edb00f5316a46a228b84a8a1537a89 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 59c9234a5e484afbb7b2087968cb7e12b550042089f5aace2c2228f0e3e73a9c + manifestHash: 2a94b6abd5cb04efaa7a9164d35de0347d63561e19c51e5043bfedfce84bd7c0 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml index 0353d48d63..377e7e0f8f 100644 --- a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml @@ -25,7 +25,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.27.0 + kubernetesVersion: v1.34.0 masterPublicName: api.privatedns1.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index 75060f5a35..87086d9108 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -126,7 +126,7 @@ ClusterName: privateflannel.example.com ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 3Mv5Wt9gBQ7Uq6z+1w8cJ9JRm4OYZph34faUD9HKwTo= +NodeupConfigHash: zfUiRT11tBbFU+hzd/o0mBV43vaFBlDLnj7daYNVlU8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index 3559b51b6b..9c2a995aff 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -149,7 +149,7 @@ ConfigServer: - https://kops-controller.internal.privateflannel.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: kxLL+zcnJFDIEUjW+iLD9nTxitxZi3QoJULc7nkXkzY= +NodeupConfigHash: 9UlbjAcl291If3bA+TcE0BMMhoOz4kaN92cQdbqezXU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index fd05b2c272..f1947523de 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: privateflannel.example.com configureCloudRoutes: false - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 leaderElection: leaderElect: true cloudProvider: aws @@ -29,8 +29,8 @@ spec: containerd: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 dnsZone: Z1AFAKE1ZON3YO etcdClusters: - backups: @@ -64,7 +64,6 @@ spec: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -81,9 +80,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -109,9 +106,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: privateflannel.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -133,12 +128,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -151,19 +144,16 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.27.0 + kubernetesVersion: 1.34.0 masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -174,13 +164,12 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s masterPublicName: api.privateflannel.example.com diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c0a08dc7de..7b64613eed 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 2e2ea1c676..a50e54f84c 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -39,80 +39,34 @@ spec: name: pki - mountPath: /opt name: opt + - mountPath: /opt/etcd-v3.4.13 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.4.3 + name: etcd-v3-4-13 + - mountPath: /opt/etcd-v3.5.0 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.1 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.13 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.17 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.21 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.3 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.4 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.6 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.7 + name: etcd-v3-5-21 + - mountPath: /opt/etcd-v3.5.9 + name: etcd-v3-5-21 - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true - initContainers: - - args: - - --target-dir=/opt/kops-utils/ - - --src=/ko-app/kops-utils-cp - command: - - /ko-app/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: kops-utils-cp - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.4.13 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.4.13 - name: init-etcd-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --target-dir=/opt/etcd-v3.5.21 - - --src=/usr/local/bin/etcd - - --src=/usr/local/bin/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:v3.5.21 - name: init-etcd-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.4.3 - - --src=/opt/etcd-v3.4.13/etcd - - --src=/opt/etcd-v3.4.13/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-4-13 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt - - args: - - --symlink - - --target-dir=/opt/etcd-v3.5.0 - - --target-dir=/opt/etcd-v3.5.1 - - --target-dir=/opt/etcd-v3.5.13 - - --target-dir=/opt/etcd-v3.5.17 - - --target-dir=/opt/etcd-v3.5.3 - - --target-dir=/opt/etcd-v3.5.4 - - --target-dir=/opt/etcd-v3.5.6 - - --target-dir=/opt/etcd-v3.5.7 - - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.21/etcd - - --src=/opt/etcd-v3.5.21/etcdctl - command: - - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1 - name: init-etcd-symlinks-3-5-21 - resources: {} - volumeMounts: - - mountPath: /opt - name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -132,6 +86,14 @@ spec: name: pki - emptyDir: {} name: opt + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.4.13 + name: etcd-v3-4-13 + - image: + pullPolicy: IfNotPresent + reference: registry.k8s.io/etcd:v3.5.21 + name: etcd-v3-5-21 - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index de90cfafcf..ba01de4026 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -10,7 +10,6 @@ APIServerConfig: apiServerCount: 1 authorizationMode: AlwaysAllow bindAddress: 0.0.0.0 - cloudProvider: external enableAdmissionPlugins: - DefaultStorageClass - DefaultTolerationSeconds @@ -27,9 +26,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 + image: registry.k8s.io/kube-apiserver:v1.34.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -59,21 +56,21 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 - 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: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -237,17 +234,13 @@ ControlPlaneConfig: clusterCIDR: 100.96.0.0/11 clusterName: privateflannel.example.com configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 + image: registry.k8s.io/kube-controller-manager:v1.34.0 leaderElection: leaderElect: true logLevel: 2 useServiceAccountCredentials: true KubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 + image: registry.k8s.io/kube-scheduler:v1.34.0 leaderElection: leaderElect: true logLevel: 2 @@ -278,7 +271,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -290,7 +283,7 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% featureGates: - InTreePluginAWSUnregister: "true" + ImageVolume: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -300,12 +293,11 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: flannel: {} nonMasqueradeCIDR: 100.64.0.0/10 @@ -319,8 +311,8 @@ configStore: containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 etcdManifests: - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/events-master-us-test-1a.yaml diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content index 097726de47..f790c256c2 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,18 +1,18 @@ Assets: amd64: - - 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet - - 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + - 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet + - cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl - 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.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 + - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz + - 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-amd64.tar.gz + - 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.amd64 arm64: - - 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet - - f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl + - e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet + - 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl - 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/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,https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.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 + - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz + - 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e@https://github.com/containerd/containerd/releases/download/v2.1.4/containerd-2.1.4-linux-arm64.tar.gz + - 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9@https://github.com/opencontainers/runc/releases/download/v1.3.0/runc.arm64 CAs: {} ClusterName: privateflannel.example.com Hooks: @@ -24,7 +24,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.27.0 + image: registry.k8s.io/kube-proxy:v1.34.0 logLevel: 2 KubeletConfig: anonymousAuth: false @@ -35,8 +35,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: @@ -44,10 +42,9 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true - registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.27.0 +KubernetesVersion: 1.34.0 Networking: flannel: {} nonMasqueradeCIDR: 100.64.0.0/10 @@ -56,7 +53,7 @@ UpdatePolicy: automatic containerdConfig: logLevel: info runc: - version: 1.1.5 - version: 1.6.20 + version: 1.3.0 + version: 2.1.4 usesLegacyGossip: false usesNoneDNS: false diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index 2c02bc0a3d..e7aad20c16 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index de795a9b98..90e68b4eea 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -1017,39 +1017,6 @@ spec: volumeMounts: - mountPath: /var/lib/csi/sockets/pluginproxy/ name: socket-dir - - args: - - --timeout=60s - - --csi-address=$(ADDRESS) - - --v=5 - - --leader-election=true - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:v0.7.0 - imagePullPolicy: IfNotPresent - name: volumemodifier - resources: - limits: - memory: 256Mi - requests: - cpu: 10m - memory: 40Mi - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - seccompProfile: - type: RuntimeDefault - volumeMounts: - - mountPath: /var/lib/csi/sockets/pluginproxy/ - name: socket-dir - args: - --timeout=60s - --extra-modify-metadata diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content index 437da24220..eaf6605af1 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content @@ -150,14 +150,14 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 8f54dad8b0e9f198bcd6ce418ee9d4426bf18180ec35c73ce5a728602e87c5de + manifestHash: 36c16ed416aecdfc0fbed629570fb26694b476813030b7b624c32cb3d2947a67 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 59258feaeb12a00dc6766d2d00ade7b3b82552e7c0388ccf8a4b22b1b72af30d + manifestHash: 3028c5ef8d209174b8526415d59369c99043e5ba856e828d48686399168dbd2f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml index 129f5ba767..46d2b968f9 100644 --- a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml @@ -21,7 +21,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.27.0 + kubernetesVersion: v1.34.0 masterPublicName: api.privateflannel.example.com networkCIDR: 172.20.0.0/16 networking: