Skip to content

Commit 7b97938

Browse files
salasberryfinsalasberryfin
committed
test: update k8s versions in cluster templates
Signed-off-by: Carlos Salas <carlos.salas@suse.com>
1 parent f98924d commit 7b97938

14 files changed

Lines changed: 65 additions & 54 deletions

‎examples/applications/ccm/aws/helm-chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
- --use-service-account-credentials=true
1616
- --configure-cloud-routes=false
1717
image: |-
18-
tag: v1.35.0
18+
tag: v1.34.0
1919
nodeSelector: |-
2020
${- if contains "RKE2ControlPlane" ( .ClusterValues | quote ) }
2121
node-role.kubernetes.io/control-plane: "true"

‎examples/applications/ccm/azure/helm-chart.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ spec:
77
releaseName: cloud-provider-azure
88
repo: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo
99
chart: cloud-provider-azure
10+
version: v1.34.5
1011
templateValues:
1112
infra: |-
1213
clusterName: ${ .ClusterValues.Cluster.metadata.name }
@@ -22,10 +23,10 @@ spec:
2223
${- end }
2324
insecureSkipTLSVerify: true
2425
targets:
25-
- clusterSelector:
26-
matchLabels:
27-
cloud-provider: azure
28-
matchExpressions:
29-
- key: clusterclass-name.fleet.addons.cluster.x-k8s.io
30-
operator: In
31-
values: [azure-rke2-example, azure-kubeadm-example]
26+
- clusterSelector:
27+
matchLabels:
28+
cloud-provider: azure
29+
matchExpressions:
30+
- key: clusterclass-name.fleet.addons.cluster.x-k8s.io
31+
operator: In
32+
values: [azure-rke2-example, azure-kubeadm-example]

‎examples/clusterclasses/docker/rke2/clusterclass-docker-rke2.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ metadata:
172172
spec:
173173
template:
174174
spec:
175-
customImage: kindest/node:v1.34.0
175+
customImage: kindest/node:v1.35.0
176176
bootstrapTimeout: 15m
177177
---
178178
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2

‎test/e2e/config/operator.yaml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ variables:
4040
# Kubernetes Configuration
4141
KUBERNETES_VERSION: "v1.35.0" # Depends on kindest/node
4242
# Kubernetes version used for the Rancher/CAPI management cluster
43-
# - Use v1.34.0 for Rancher 2.13.2 compatibility (requires < v1.35.0)
4443
KUBERNETES_MANAGEMENT_VERSION: "v1.34.0"
4544
# The cluster used in chart_upgrade must run a Kubernetes version compatible with an older version of Rancher
45+
# - Use v1.34.0 for Rancher 2.13.2 compatibility (requires < v1.35.0)
4646
KUBERNETES_MANAGEMENT_VERSION_CHART_UPGRADE: "v1.34.0"
4747

4848
# RKE2 specifics
4949
RKE2_KUBERNETES_VERSION: "v1.35.0+rke2r1"
50+
# Kubernetes version used for v2prov until Rancher v2.14 officially supports v1.35
51+
V2PROV_RKE2_KUBERNETES_VERSION: "v1.34.1+rke2r1"
5052
RKE2_CNI: "none"
5153

5254
# These two values are used for provisioning a CAPI v1.10 cluster (`v1beta1`) in the chart_upgrade test -> Kubernetes <=v1.33
@@ -59,7 +61,12 @@ variables:
5961
# This is due to the limited availability of published AMIs.
6062
# For example: https://portal.azure.com/#view/Microsoft_Azure_ComputeHub/ComputeHubMenuBlade/~/communityImagesBrowse
6163
# Filter `capi-ubun2-2404` images. Beware: not all versions are published on all regions.
62-
AZURE_KUBERNETES_VERSION: "v1.35.0"
64+
# Azure CCM fails to install when using v1.35: the latest available version is v1.34.5
65+
# - https://github.com/kubernetes-sigs/cloud-provider-azure/releases
66+
# Use v1.34.3 for now as it is the latest Azure community image available
67+
AZURE_KUBERNETES_VERSION: "v1.34.3"
68+
# Use v1.34.3 for RKE2 clusters to align with Kubeadm
69+
AZURE_RKE2_KUBERNETES_VERSION: "v1.34.3+rke2r1"
6370
# For AKS available versions, run: az aks get-versions --location westeurope
6471
AZURE_AKS_KUBERNETES_VERSION: "v1.34.2"
6572

@@ -71,21 +78,23 @@ variables:
7178
# EKS also needs versioned images, that may not be available for recent versions of k8s.
7279
# 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
7380
# Recent versions will return a 'ParameterNotFound' error, preventing EKS from deploying.
74-
AWS_EKS_VERSION: "v1.35.0" #See: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/docs/proposal/20250922-nodeadm-bootstrap.md
81+
# NOTE: EKS does not support versions >v1.32 because there's a bug when using Amazon Linux 2023, see https://github.com/kubernetes-sigs/cluster-api-provider-aws/pull/5700
82+
AWS_EKS_KUBERNETES_VERSION: "v1.32.0" #See: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/docs/proposal/20250922-nodeadm-bootstrap.md
7583
AWS_REGION: "eu-west-2"
7684
KUBERNETES_MANAGEMENT_AWS_REGION: "eu-west-2"
7785
AWS_CONTROL_PLANE_MACHINE_TYPE: "t3.large"
7886
AWS_NODE_MACHINE_TYPE: "t3.large"
7987
AWS_RKE2_CONTROL_PLANE_MACHINE_TYPE: "t3.xlarge"
8088
AWS_RKE2_NODE_MACHINE_TYPE: "t3.xlarge"
81-
AWS_AMI_ID: "ami-0f19b6377d50fa855" # Private image. See docs/image-builder
89+
AWS_AMI_ID: "ami-0bb0dc2c3c4dbf68f" # Private image. See docs/image-builder
8290

8391
# GCP Configuration
8492
# Images are self-built and need versioned kubernetes components. See docs/image-builder
85-
GCP_KUBERNETES_VERSION: "v1.35.0"
93+
GCP_KUBERNETES_VERSION: "v1.34.1"
94+
GCP_GKE_KUBERNETES_VERSION: "v1.35.0"
8695
GCP_MACHINE_TYPE: "n1-standard-2"
8796
GCP_REGION: "europe-west2"
88-
GCP_IMAGE_ID: "cluster-api-ubuntu-2404-v1-35-0-1770652401" # Private image. See docs/image-builder
97+
GCP_IMAGE_ID: "cluster-api-ubuntu-2404-v1-34-1-1762253907" # Private image. See docs/image-builder
8998
GCP_IMAGE_ID_FORMATTED: "" #Calculated at runtime: https://www.googleapis.com/compute/v1/projects/${GCP_PROJECT_ID}/global/images/${GCP_IMAGE_ID}"
9099

91100
# CLI Tool Paths

‎test/e2e/const.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ const (
184184

185185
KubernetesVersionChartUpgradeVar = "KUBERNETES_MANAGEMENT_VERSION_CHART_UPGRADE"
186186

187-
RKE2VersionVar = "RKE2_KUBERNETES_VERSION"
187+
RKE2VersionVar = "RKE2_KUBERNETES_VERSION"
188+
RKE2V2ProvVersionVar = "V2PROV_RKE2_KUBERNETES_VERSION"
188189

189190
AzureSubIDVar = "AZURE_SUBSCRIPTION_ID"
190191
AzureClientIDVar = "AZURE_CLIENT_ID"

‎test/e2e/data/cluster-templates/aws-ec2-rke2-topology.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
value: none
4040
- name: awsClusterIdentityName
4141
value: cluster-identity
42-
version: ${RKE2_VERSION}
42+
version: ${RKE2_KUBERNETES_VERSION}
4343
workers:
4444
machineDeployments:
4545
- class: default-worker

‎test/e2e/data/cluster-templates/aws-eks-topology.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
classRef:
2323
name: aws-eks-example
2424
namespace: ${TOPOLOGY_NAMESPACE}
25-
version: ${AWS_EKS_VERSION}
25+
version: ${AWS_EKS_KUBERNETES_VERSION}
2626
variables:
2727
- name: region
2828
value: ${AWS_REGION}

‎test/e2e/data/cluster-templates/azure-aks-topology.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@ spec:
2525
clusterNetwork:
2626
pods:
2727
cidrBlocks:
28-
- 192.168.0.0/16
28+
- 192.168.0.0/16
2929
topology:
3030
classRef:
3131
name: azure-aks-example
3232
namespace: ${TOPOLOGY_NAMESPACE}
3333
variables:
34-
- name: subscriptionID
35-
value: ${AZURE_SUBSCRIPTION_ID}
36-
- name: location
37-
value: germanywestcentral
38-
- name: resourceGroup
39-
value: highlander-e2e-azure-aks
40-
- name: azureClusterIdentityName
41-
value: cluster-identity
42-
version: ${KUBERNETES_VERSION}
34+
- name: subscriptionID
35+
value: ${AZURE_SUBSCRIPTION_ID}
36+
- name: location
37+
value: germanywestcentral
38+
- name: resourceGroup
39+
value: highlander-e2e-azure-aks
40+
- name: azureClusterIdentityName
41+
value: cluster-identity
42+
version: ${AZURE_AKS_KUBERNETES_VERSION}
4343
workers:
4444
machinePools:
45-
- class: default-system
46-
name: system-1
47-
replicas: 1
48-
- class: default-worker
49-
name: worker-1
50-
replicas: 1
45+
- class: default-system
46+
name: system-1
47+
replicas: 1
48+
- class: default-worker
49+
name: worker-1
50+
replicas: 1

‎test/e2e/data/cluster-templates/azure-rke2-topology.yaml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,25 @@ spec:
2929
clusterNetwork:
3030
pods:
3131
cidrBlocks:
32-
- 192.168.0.0/16
32+
- 192.168.0.0/16
3333
topology:
3434
classRef:
3535
name: azure-rke2-example
3636
namespace: ${TOPOLOGY_NAMESPACE}
3737
controlPlane:
38-
replicas: 3
38+
replicas: 1
3939
variables:
40-
- name: subscriptionID
41-
value: ${AZURE_SUBSCRIPTION_ID}
42-
- name: location
43-
value: germanywestcentral
44-
- name: resourceGroup
45-
value: highlander-e2e-azure-rke2
46-
- name: azureClusterIdentityName
47-
value: cluster-identity
48-
version: ${RKE2_VERSION}
40+
- name: subscriptionID
41+
value: ${AZURE_SUBSCRIPTION_ID}
42+
- name: location
43+
value: germanywestcentral
44+
- name: resourceGroup
45+
value: highlander-e2e-azure-rke2
46+
- name: azureClusterIdentityName
47+
value: cluster-identity
48+
version: ${AZURE_RKE2_KUBERNETES_VERSION}
4949
workers:
5050
machineDeployments:
51-
- class: rke2-default-worker
52-
name: md-0
53-
replicas: 3
54-
51+
- class: rke2-default-worker
52+
name: md-0
53+
replicas: 1

‎test/e2e/data/cluster-templates/docker-rke2-topology.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
value: kindest/node:${KUBERNETES_VERSION}
3030
- name: dockerAuthSecret
3131
value: '${CLUSTER_NAME}-docker-token'
32-
version: ${RKE2_VERSION}
32+
version: ${RKE2_KUBERNETES_VERSION}
3333
workers:
3434
machineDeployments:
3535
- class: default-worker

0 commit comments

Comments
 (0)