Merge pull request #1872 from rancher/e2e_bump_k8s_v1-34

alexander-demicev · web-flow · commit 85d33ac1ca6a · 2025-11-07T12:04:15.000+01:00
ci: Bump e2e to k8s 1.34
diff --git a/.github/workflows/run-e2e-suite.yaml b/.github/workflows/run-e2e-suite.yaml
@@ -47,9 +47,7 @@ env:
   AWS_SSH_KEY_NAME: ${{ secrets.AWS_SSH_KEY_NAME }}
   # GCP Credentials and Configuration
   GCP_PROJECT: ${{ secrets.GCP_PROJECT }}
-  GCP_REGION: ${{ secrets.GCP_REGION }}
   GCP_NETWORK_NAME: ${{ secrets.GCP_NETWORK_NAME }}
-  GCP_IMAGE_ID: ${{ secrets.GCP_IMAGE_ID }}
   CAPG_ENCODED_CREDS: ${{ secrets.CAPG_ENCODED_CREDS }}
   # Azure Credentials
   AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
diff --git a/.github/workflows/run-vsphere-tests.yaml b/.github/workflows/run-vsphere-tests.yaml
@@ -12,7 +12,6 @@ env:
   VSPHERE_DATACENTER: ${{ secrets.VSPHERE_DATACENTER }}
   VSPHERE_DATASTORE: ${{ secrets.VSPHERE_DATASTORE }}
   VSPHERE_FOLDER: ${{ secrets.VSPHERE_FOLDER }}
-  VSPHERE_TEMPLATE: ${{ secrets.VSPHERE_TEMPLATE }}
   VSPHERE_NETWORK: ${{ secrets.VSPHERE_NETWORK }}
   VSPHERE_RESOURCE_POOL: ${{ secrets.VSPHERE_RESOURCE_POOL }}
   VSPHERE_USERNAME: ${{ secrets.VSPHERE_USERNAME }}
diff --git a/charts/rancher-turtles/Chart.yaml b/charts/rancher-turtles/Chart.yaml
@@ -14,7 +14,7 @@ keywords:
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Turtles
-  catalog.cattle.io/kube-version: ">= 1.31.4-0 < 1.34.0-0"
+  catalog.cattle.io/kube-version: ">= 1.31.4-0 < 1.35.0-0"
   catalog.cattle.io/namespace: cattle-turtles-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux
diff --git a/charts/rancher-turtles/questions.yml b/charts/rancher-turtles/questions.yml
@@ -32,7 +32,7 @@ questions:
     label: Remove cert-manager
     group: "Rancher Turtles Features Settings"
   - variable: kubectlImage
-    default: "registry.k8s.io/kubernetes/kubectl:v1.32.3"
+    default: "registry.k8s.io/kubernetes/kubectl:v1.34.1"
     description: "Specify the image to use when running kubectl in jobs."
     type: string
     label: Kubectl Image
diff --git a/charts/rancher-turtles/values.yaml b/charts/rancher-turtles/values.yaml
@@ -28,7 +28,7 @@ imagePullSecrets: []
 # rancherInstalled: True if Rancher already installed is in the cluster, this is the preferred installation way.
 rancherInstalled: true
 # kubectlImage: Image for kubectl tasks.
-kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.32.3
+kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.34.1
 # shellImage: Image for shell tasks.
 shellImage: rancher/kuberlr-kubectl:v5.0.0
 # features: Optional and experimental features.
diff --git a/examples/clusterclasses/aws/eks/clusterclass-eks-example.yaml b/examples/clusterclasses/aws/eks/clusterclass-eks-example.yaml
@@ -72,7 +72,6 @@ spec:
             controlPlane: true
         jsonPatches:
           - op: add
-            enabledIf: '{{ ne .eksClusterName }}'
             path: /spec/template/spec/eksClusterName
             valueFrom:
               variable: eksClusterName
@@ -81,7 +80,6 @@ spec:
             valueFrom:
               variable: region
           - op: add
-            enabledIf: '{{ ne .sshKeyName }}'
             path: /spec/template/spec/sshKeyName
             valueFrom:
               variable: sshKeyName
@@ -105,7 +103,6 @@ spec:
               - default-worker
         jsonPatches:
           - op: add
-            enabledIf: '{{ ne .sshKeyName }}'
             path: /spec/template/spec/sshKeyName
             valueFrom:
               variable: sshKeyName
diff --git a/examples/clusterclasses/aws/kubeadm/clusterclass-kubeadm-example.yaml b/examples/clusterclasses/aws/kubeadm/clusterclass-kubeadm-example.yaml
@@ -208,13 +208,6 @@ spec:
   template:
     spec:
       kubeadmConfigSpec:
-        clusterConfiguration:
-          apiServer:
-            extraArgs:
-              cloud-provider: external
-          controllerManager:
-            extraArgs:
-              cloud-provider: external
         initConfiguration:
           nodeRegistration:
             kubeletExtraArgs:
diff --git a/examples/clusterclasses/azure/kubeadm/clusterclass-kubeadm-example.yaml b/examples/clusterclasses/azure/kubeadm/clusterclass-kubeadm-example.yaml
@@ -265,12 +265,10 @@ spec:
       kubeadmConfigSpec:
         clusterConfiguration:
           apiServer:
-            extraArgs: {}
             timeoutForControlPlane: 20m
           controllerManager:
             extraArgs:
               allocate-node-cidrs: "false"
-              cloud-provider: external
               cluster-name: "TO_BE_REPLACED_BY_PATCH"
           etcd:
             local:
diff --git a/examples/clusterclasses/docker/rke2/clusterclass-docker-rke2.yaml b/examples/clusterclasses/docker/rke2/clusterclass-docker-rke2.yaml
@@ -172,7 +172,7 @@ metadata:
 spec:
   template:
     spec:
-      customImage: kindest/node:v1.32.8
+      customImage: kindest/node:v1.34.0
       bootstrapTimeout: 15m
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
diff --git a/examples/clusterclasses/gcp/kubeadm/clusterclass-kubeadm-example.yaml b/examples/clusterclasses/gcp/kubeadm/clusterclass-kubeadm-example.yaml
@@ -194,11 +194,8 @@ spec:
         clusterConfiguration:
           apiServer:
             timeoutForControlPlane: 20m
-            extraArgs:
-              cloud-provider: external
           controllerManager:
             extraArgs:
-              cloud-provider: external
               allocate-node-cidrs: "false"
         initConfiguration:
           nodeRegistration:
diff --git a/examples/clusters/docker/rke2/cluster.yaml b/examples/clusters/docker/rke2/cluster.yaml
@@ -24,8 +24,8 @@ spec:
     - name: rke2CNI
       value: none
     - name: dockerImage
-      value: kindest/node:v1.32.8
-    version: v1.32.9+rke2r1
+      value: kindest/node:v1.34.0
+    version: v1.34.1+rke2r1
     workers:
       machineDeployments:
       - class: default-worker
diff --git a/hack/ensure-kubectl.sh b/hack/ensure-kubectl.sh
@@ -26,7 +26,7 @@ fi
 source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KUBECTL_VERSION=v1.32.0
+MINIMUM_KUBECTL_VERSION=v1.34.1
 goarch="$(go env GOARCH)"
 goos="$(go env GOOS)"
 
diff --git a/scripts/kind-cluster-with-extramounts.yaml b/scripts/kind-cluster-with-extramounts.yaml
@@ -3,7 +3,7 @@ apiVersion: kind.x-k8s.io/v1alpha4
 name: capi-test
 nodes:
 - role: control-plane
-  image: kindest/node:v1.32.8
+  image: kindest/node:v1.34.0
   extraMounts:
     - hostPath: /var/run/docker.sock
       containerPath: /var/run/docker.sock
diff --git a/scripts/turtles-quickstart.sh b/scripts/turtles-quickstart.sh
@@ -23,7 +23,7 @@ RANCHER_IMAGE=${RANCHER_IMAGE:-rancher/rancher:$RANCHER_VERSION}
 RANCHER_CLUSTER_NAME=${RANCHER_CLUSTER_NAME:-rancher-cluster}
 RANCHER_TURTLES_VERSION=${RANCHER_TURTLES_VERSION:-v0.24.1}
 CAPI_CLUSTER_NAME=${CAPI_CLUSTER_NAME:-capi-cluster1}
-KIND_IMAGE_VERSION=${KIND_IMAGE_VERSION:-v1.32.8}
+KIND_IMAGE_VERSION=${KIND_IMAGE_VERSION:-v1.34.0}
 
 CONFIG_DIR="/tmp/turtles"
 mkdir -p $CONFIG_DIR
@@ -416,7 +416,7 @@ EOF
     export NAMESPACE=capi-clusters
     export CONTROL_PLANE_MACHINE_COUNT=1
     export WORKER_MACHINE_COUNT=1
-    export KUBERNETES_VERSION=v1.32.3
+    export KUBERNETES_VERSION=v1.34.0
 
     curl -s https://raw.githubusercontent.com/rancher/turtles/refs/heads/main/test/e2e/data/cluster-templates/docker-kubeadm.yaml | envsubst > ${CONFIG_DIR}/${CAPI_CLUSTER_NAME}.yaml
 
diff --git a/test/e2e/config/operator.yaml b/test/e2e/config/operator.yaml
@@ -7,7 +7,7 @@ images:
 
 intervals:
   default/wait-controllers: ["15m", "10s"]
-  default/wait-rancher: ["15m", "30s"]
+  default/wait-rancher: ["25m", "30s"]
   default/wait-snapshot: ["20m", "30s"]
   default/wait-delete-cluster: ["30m", "30s"]
   default/wait-v2prov-create: ["25m", "30s"]
@@ -38,9 +38,9 @@ variables:
   SECRET_KEYS: "NGROK_AUTHTOKEN,NGROK_API_KEY,RANCHER_HOSTNAME,RANCHER_PASSWORD,CAPG_ENCODED_CREDS,AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AZURE_SUBSCRIPTION_ID,AZURE_CLIENT_ID,AZURE_CLIENT_SECRET,AZURE_TENANT_ID,GCP_PROJECT,GCP_NETWORK_NAME,GCP_IMAGE_ID,VSPHERE_TLS_THUMBPRINT,VSPHERE_SERVER,VSPHERE_DATACENTER,VSPHERE_DATASTORE,VSPHERE_FOLDER,VSPHERE_TEMPLATE,VSPHERE_NETWORK,VSPHERE_RESOURCE_POOL,VSPHERE_USERNAME,VSPHERE_PASSWORD,VSPHERE_KUBE_VIP_IP_KUBEADM,VSPHERE_KUBE_VIP_IP_RKE2,DOCKER_REGISTRY_TOKEN,DOCKER_REGISTRY_USERNAME,DOCKER_REGISTRY_CONFIG"
 
   # Kubernetes Configuration
-  KUBERNETES_VERSION: "v1.32.3"
-  KUBERNETES_MANAGEMENT_VERSION: "v1.32.3"
-  RKE2_VERSION: "v1.32.9+rke2r1"
+  KUBERNETES_VERSION: "v1.34.0" # Depends on kindest/node
+  KUBERNETES_MANAGEMENT_VERSION: "v1.34.0" # Depends on kindest/node for kind environments.
+  RKE2_VERSION: "v1.34.1+rke2r1"
   RKE2_CNI: "none"
 
   # Azure Configuration
@@ -50,26 +50,32 @@ variables:
   # For example: https://portal.azure.com/#view/Microsoft_Azure_ComputeHub/ComputeHubMenuBlade/~/communityImagesBrowse
   #              Filter `capi-ubun2-2404` images. Beware: not all versions are published on all regions.
   AZURE_KUBERNETES_VERSION: "v1.34.1"
-  AZURE_RKE2_VERSION: "v1.34.1+rke2r1"
   # For AKS available versions, run: az aks get-versions --location westeurope
   AZURE_AKS_VERSION: "v1.33.3"
 
   # AWS Configuration
   #
   # AWS Kubeadm tests need specific k8s version.
-  # This is due to the limited availability of published AMIs.
-  # For a complete list, run: clusterawsadm ami list
-  AWS_KUBERNETES_VERSION: "v1.32.0"
+  # Images are self-built and need versioned kubernetes components. See docs/image-builder
+  AWS_KUBERNETES_VERSION: "v1.34.1"
+  # EKS also needs versioned images, that may not be available for recent versions of k8s.
+  # To verify availability, you can run: aws ssm get-parameter --name /aws/service/eks/optimized-ami/1.34/amazon-linux-2023/x86_64/standard/recommended/image_id
+  # Recent versions will return a 'ParameterNotFound' error, preventing EKS from deploying.
+  AWS_EKS_VERSION: "v1.32.0" #See: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/docs/proposal/20250922-nodeadm-bootstrap.md
   AWS_REGION: "eu-west-2"
   KUBERNETES_MANAGEMENT_AWS_REGION: "eu-west-2"
   AWS_CONTROL_PLANE_MACHINE_TYPE: "t3.large"
   AWS_NODE_MACHINE_TYPE: "t3.large"
   AWS_RKE2_CONTROL_PLANE_MACHINE_TYPE: "t3.xlarge"
   AWS_RKE2_NODE_MACHINE_TYPE: "t3.xlarge"
-  AWS_AMI_ID: "ami-096c298c2ab1493d7" # Public upstream AMI
+  AWS_AMI_ID: "ami-055123d49b91c2827" # Private image. See docs/image-builder
 
   # GCP Configuration
+  GCP_KUBERNETES_VERSION: "v1.34.1"
   GCP_MACHINE_TYPE: "n1-standard-2"
+  GCP_REGION: "europe-west2"
+  GCP_IMAGE_ID: "cluster-api-ubuntu-2404-v1-34-1-1762253907" # Private image. See docs/image-builder
+  GCP_IMAGE_ID_FORMATTED: "" #Calculated at runtime: https://www.googleapis.com/compute/v1/projects/${GCP_PROJECT_ID}/global/images/${GCP_IMAGE_ID}"
   
   # CLI Tool Paths
   CLUSTERCTL_BINARY_PATH: ""
@@ -128,3 +134,5 @@ variables:
   # See: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials
   # This can be used to configure a downstream cluster with a imagePullSecret.
   DOCKER_REGISTRY_CONFIG: ""
+
+  VSPHERE_TEMPLATE: "turtles-ci/ubuntu-2404-kube-v1.34.1"
diff --git a/test/e2e/const.go b/test/e2e/const.go
@@ -204,6 +204,10 @@ const (
 	GiteaChartVersionVar = "GITEA_CHART_VERSION"
 	GiteaUserNameVar     = "GITEA_USER_NAME"
 	GiteaUserPasswordVar = "GITEA_USER_PWD"
+
+	GCPImageIDVar          = "GCP_IMAGE_ID"
+	GCPImageIDFormattedVar = "GCP_IMAGE_ID_FORMATTED"
+	GCPProjectIDVar        = "GCP_PROJECT"
 )
 
 const (
diff --git a/test/e2e/data/cluster-templates/aws-eks-topology.yaml b/test/e2e/data/cluster-templates/aws-eks-topology.yaml
@@ -21,7 +21,7 @@ spec:
   topology:
     class: aws-eks-example
     classNamespace: ${TOPOLOGY_NAMESPACE}
-    version: ${AWS_KUBERNETES_VERSION}
+    version: ${AWS_EKS_VERSION}
     variables:
       - name: region
         value: ${AWS_REGION}
diff --git a/test/e2e/data/cluster-templates/aws-kubeadm-topology.yaml b/test/e2e/data/cluster-templates/aws-kubeadm-topology.yaml
@@ -36,6 +36,8 @@ spec:
       value: ${AWS_NODE_MACHINE_TYPE}
     - name: awsClusterIdentityName
       value: cluster-identity
+    - name: amiID
+      value: ${AWS_AMI_ID}
     version: ${AWS_KUBERNETES_VERSION}
     workers:
       machineDeployments:
diff --git a/test/e2e/data/cluster-templates/azure-rke2-topology.yaml b/test/e2e/data/cluster-templates/azure-rke2-topology.yaml
@@ -44,7 +44,7 @@ spec:
       value: highlander-e2e-azure-rke2
     - name: azureClusterIdentityName
       value: cluster-identity
-    version: ${AZURE_RKE2_VERSION}
+    version: ${RKE2_VERSION}
     workers:
       machineDeployments:
       - class: rke2-default-worker
diff --git a/test/e2e/data/cluster-templates/gcp-kubeadm-topology.yaml b/test/e2e/data/cluster-templates/gcp-kubeadm-topology.yaml
@@ -32,7 +32,7 @@ spec:
         value:
           - "${GCP_REGION}-a"
       - name: imageId
-        value: ${GCP_IMAGE_ID}
+        value: ${GCP_IMAGE_ID_FORMATTED}
       - name: machineType
         value: ${GCP_MACHINE_TYPE}
-    version: ${KUBERNETES_VERSION}
+    version: ${GCP_KUBERNETES_VERSION}
diff --git a/test/e2e/suites/import-gitops/import_gitops_test.go b/test/e2e/suites/import-gitops/import_gitops_test.go
@@ -20,6 +20,8 @@ limitations under the License.
 package import_gitops
 
 import (
+	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/rancher/turtles/test/e2e"
 	"github.com/rancher/turtles/test/e2e/specs"
@@ -183,9 +185,6 @@ var _ = Describe("[Azure] [Kubeadm] Create and delete CAPI cluster from cluster
 			CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel,
 			OwnedLabelName:                 e2e.OwnedLabelName,
 			TopologyNamespace:              topologyNamespace,
-			AdditionalTemplateVariables: map[string]string{
-				e2e.KubernetesVersionVar: e2e.LoadE2EConfig().GetVariableOrEmpty(e2e.AzureKubernetesVersionVar), // override the default k8s version
-			},
 			AdditionalFleetGitRepos: []turtlesframework.FleetCreateGitRepoInput{
 				{
 					Name:            "azure-cluster-class-kubeadm",
@@ -287,9 +286,6 @@ var _ = Describe("[AWS] [EKS] Create and delete CAPI cluster from cluster class"
 			CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel,
 			OwnedLabelName:                 e2e.OwnedLabelName,
 			TopologyNamespace:              topologyNamespace,
-			AdditionalTemplateVariables: map[string]string{
-				e2e.KubernetesVersionVar: e2e.LoadE2EConfig().GetVariableOrEmpty(e2e.AWSKubernetesVersionVar), // override the default k8s version
-			},
 			AdditionalFleetGitRepos: []turtlesframework.FleetCreateGitRepoInput{
 				{
 					Name:            "aws-cluster-classes-eks",
@@ -328,10 +324,7 @@ var _ = Describe("[AWS] [EC2 Kubeadm] Create and delete CAPI cluster functionali
 			CapiClusterOwnerLabel:          e2e.CapiClusterOwnerLabel,
 			CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel,
 			OwnedLabelName:                 e2e.OwnedLabelName,
-			AdditionalTemplateVariables: map[string]string{
-				e2e.KubernetesVersionVar: e2e.LoadE2EConfig().GetVariableOrEmpty(e2e.AWSKubernetesVersionVar), // override the default k8s version
-			},
-			TopologyNamespace: topologyNamespace,
+			TopologyNamespace:              topologyNamespace,
 			AdditionalFleetGitRepos: []turtlesframework.FleetCreateGitRepoInput{
 				{
 					Name:            "aws-cluster-classes-regular",
@@ -429,6 +422,8 @@ var _ = Describe("[GCP] [Kubeadm] Create and delete CAPI cluster functionality s
 	})
 
 	specs.CreateUsingGitOpsSpec(ctx, func() specs.CreateUsingGitOpsSpecInput {
+		const gcpImageFormat = "https://www.googleapis.com/compute/v1/projects/%s/global/images/%s"
+		gcpImageFormatted := fmt.Sprintf(gcpImageFormat, e2e.LoadE2EConfig().MustGetVariable(e2e.GCPProjectIDVar), e2e.LoadE2EConfig().MustGetVariable(e2e.GCPImageIDVar))
 		return specs.CreateUsingGitOpsSpecInput{
 			E2EConfig:                      e2e.LoadE2EConfig(),
 			BootstrapClusterProxy:          bootstrapClusterProxy,
@@ -444,6 +439,9 @@ var _ = Describe("[GCP] [Kubeadm] Create and delete CAPI cluster functionality s
 			CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel,
 			OwnedLabelName:                 e2e.OwnedLabelName,
 			TopologyNamespace:              topologyNamespace,
+			AdditionalTemplateVariables: map[string]string{
+				e2e.GCPImageIDFormattedVar: gcpImageFormatted,
+			},
 			AdditionalFleetGitRepos: []turtlesframework.FleetCreateGitRepoInput{
 				{
 					Name:            "gcp-cluster-class-kubeadm",
