Merge pull request #1571 from Nordix/lentzi90/e2e-k8s-v1.26.5

🌱 Bump Kubernetes version used in e2e tests

Author: k8s-ci-robot

.gitignore

@@ -176,3 +176,6 @@ docs/book/book/
 
 # venv
 .venv
+
+# Development container files (https://containers.dev/)
+.devcontainer

hack/ci/cloud-init/controller.yaml.tpl

@@ -138,7 +138,7 @@
     # https://docs.openstack.org/glance/latest/admin/quotas.html
     /opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img
     /opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2023-01-14/focal-server-cloudimg-amd64.img
-    /opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3510.2.0-kube-v1.25.8.img
+    /opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3510.2.1-kube-v1.26.5.img
 
     # Add the controller to its own host aggregate and availability zone
     aggregateid=$(openstack aggregate create --zone "${PRIMARY_AZ}" "${PRIMARY_AZ}" -f value -c id)

test/e2e/data/e2e_conf.yaml

@@ -128,10 +128,10 @@ providers:
 variables:
   # used to ensure we deploy to the correct management cluster
   KUBE_CONTEXT: "kind-capo-e2e"
-  KUBERNETES_VERSION: "v1.25.0"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.9"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.25.0"
-  ETCD_VERSION_UPGRADE_TO: "3.5.4-0"
+  KUBERNETES_VERSION: "v1.26.5"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.10"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.26.5"
+  ETCD_VERSION_UPGRADE_TO: "3.5.6-0"
   COREDNS_VERSION_UPGRADE_TO: "v1.9.3"
   CNI: "../../data/cni/calico.yaml"
   CCM: "../../data/ccm/cloud-controller-manager.yaml"
@@ -153,12 +153,12 @@ variables:
   OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
-  INIT_WITH_KUBERNETES_VERSION: "v1.25.0"
+  INIT_WITH_KUBERNETES_VERSION: "v1.26.5"
   E2E_IMAGE_URL: "http://10.0.3.15/capo-e2e-image.tar"
   # The default user for SSH connections from bastion to machines
   SSH_USER_MACHINE: "ubuntu"
   EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
-  OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3510.2.0-kube-v1.25.8"
+  OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3510.2.1-kube-v1.26.5"
 
 intervals:
   conformance/wait-control-plane: ["30m", "10s"]

test/e2e/data/kustomize/default/ccm.yaml renamed to test/e2e/data/kustomize/common-patches/ccm/ccm.yaml

@@ -3,6 +3,9 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
+resources:
+- ccm.yaml
+
 patchesStrategicMerge:
 - patch-ccm.yaml
 

test/e2e/data/kustomize/common-patches/ccm/kustomization.yaml

@@ -20,18 +20,6 @@
       apt update -qq
       echo "Installing containerd"
       apt-get install -y containerd
-      # TODO(lentzi90): This adds cri-tools from the kubernetes repository, since we need to make sure it is a specific version
-      # When pulled in as a dependency of kubeadm, we just get the latest version.
-      # After upgrading to v1.26 we should be able to drop this.
-      mkdir -p /etc/apt/keyrings
-      curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /etc/apt/keyrings/kubernetes.gpg
-      echo 'deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] https://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list
-      apt-get update
-      VERSION_WITHOUT_PREFIX="${KUBERNETES_VERSION#v}"
-      # replace . with \.
-      VERSION_REGEX="$${VERSION_WITHOUT_PREFIX//./\\.}"
-      PACKAGE_VERSION="$(apt-cache madison kubelet | grep "$${VERSION_REGEX}-" | head -n1 | cut -d '|' -f 2 | tr -d '[:space:]')"
-      apt-get install -y cri-tools="$${PACKAGE_VERSION}"
     owner: root:root
     path: /usr/local/bin/ci-pre-kubeadm.sh
     permissions: "0750"

test/e2e/data/kustomize/common-patches/containerd/containerd-kcp.yaml

@@ -20,18 +20,6 @@
       apt update -qq
       echo "Installing containerd"
       apt-get install -y containerd
-      # TODO(lentzi90): This adds cri-tools from the kubernetes repository, since we need to make sure it is a specific version
-      # When pulled in as a dependency of kubeadm, we just get the latest version.
-      # After upgrading to v1.26 we should be able to drop this.
-      mkdir -p /etc/apt/keyrings
-      curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /etc/apt/keyrings/kubernetes.gpg
-      echo 'deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] https://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list
-      apt-get update
-      VERSION_WITHOUT_PREFIX="${KUBERNETES_VERSION#v}"
-      # replace . with \.
-      VERSION_REGEX="$${VERSION_WITHOUT_PREFIX//./\\.}"
-      PACKAGE_VERSION="$(apt-cache madison kubelet | grep "$${VERSION_REGEX}-" | head -n1 | cut -d '|' -f 2 | tr -d '[:space:]')"
-      apt-get install -y cri-tools="$${PACKAGE_VERSION}"
     owner: root:root
     path: /usr/local/bin/ci-pre-kubeadm.sh
     permissions: "0750"

test/e2e/data/kustomize/common-patches/containerd/containerd-kct.yaml

@@ -1,7 +1,6 @@
 ---
 resources:
 - ../../../../../kustomize/v1alpha7/default
-- ccm.yaml
 
 components:
 - ../common-patches/cni

test/e2e/data/kustomize/default/kustomization.yaml

@@ -1,7 +1,6 @@
 ---
 resources:
 - ../../../../../kustomize/v1alpha7/flatcar
-- ccm.yaml
 
 components:
 - ../common-patches/cni