Skip to content

Commit 371455a

Browse files
committed
ci: use k8s v1.33 for testing
Signed-off-by: Andrea Mazzotti <[email protected]>
1 parent e349443 commit 371455a

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

charts/rancher-turtles/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ keywords:
1414
annotations:
1515
catalog.cattle.io/certified: rancher
1616
catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension
17-
catalog.cattle.io/kube-version: '>= 1.31.4-0 < 1.32.0-0'
17+
catalog.cattle.io/kube-version: '>= 1.31.4-0 < 1.34.0-0'
1818
catalog.cattle.io/namespace: rancher-turtles-system
1919
catalog.cattle.io/os: linux
2020
catalog.cattle.io/permits-os: linux

test/e2e/config/operator.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,33 @@ variables:
3838
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"
3939

4040
# Kubernetes Configuration
41-
KUBERNETES_VERSION: "v1.31.4"
42-
KUBERNETES_MANAGEMENT_VERSION: "v1.31.4"
43-
RKE2_VERSION: "v1.31.7+rke2r1"
41+
KUBERNETES_VERSION: "v1.33.5"
42+
KUBERNETES_MANAGEMENT_VERSION: "v1.33.5"
43+
RKE2_VERSION: "v1.33.5+rke2r1"
4444
RKE2_CNI: "none"
4545

4646
# Azure Configuration
4747
#
4848
# Azure Kubeadm tests need specific k8s version.
4949
# This is due to the limited availability of published AMIs.
50-
# For example: https://portal.azure.com/#@suseazuredev.onmicrosoft.com/resource/providers/Microsoft.Compute/locations/FranceCentral/CommunityGalleries/ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019/Images/capi-ubun2-2204/overview
51-
AZURE_KUBERNETES_VERSION: "v1.31.1"
50+
# For example: https://portal.azure.com/#view/Microsoft_Azure_ComputeHub/ComputeHubMenuBlade/~/communityImagesBrowse
51+
# Filter `capi-ubun2-2404` images. Beware: not all versions are published on all regions.
52+
AZURE_KUBERNETES_VERSION: "v1.33.5"
5253

5354
# AWS Configuration
5455
#
5556
# AWS Kubeadm tests need specific k8s version.
5657
# This is due to the limited availability of published AMIs.
5758
# For a complete list, run: clusterawsadm ami list
58-
AWS_KUBERNETES_VERSION: "v1.31.0"
59+
# Alternatively, seach for `capa-ami` in https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#AMICatalog:
60+
AWS_KUBERNETES_VERSION: "v1.32.6"
5961
AWS_REGION: "eu-west-2"
6062
KUBERNETES_MANAGEMENT_AWS_REGION: "eu-west-2"
6163
AWS_CONTROL_PLANE_MACHINE_TYPE: "t3.large"
6264
AWS_NODE_MACHINE_TYPE: "t3.large"
6365
AWS_RKE2_CONTROL_PLANE_MACHINE_TYPE: "t3.xlarge"
6466
AWS_RKE2_NODE_MACHINE_TYPE: "t3.xlarge"
65-
AWS_AMI_ID: "ami-012e88f0aa221423a" # Public upstream AMI
67+
AWS_AMI_ID: "ami-0e0464240725c0f6b" # Public upstream AMI
6668

6769
# GCP Configuration
6870
GCP_MACHINE_TYPE: "n1-standard-2"
@@ -97,7 +99,6 @@ variables:
9799
CERT_MANAGER_REPO_NAME: "jetstack"
98100
CERT_MANAGER_URL: "https://charts.jetstack.io"
99101
CERT_MANAGER_PATH: "jetstack/cert-manager"
100-
CPI_IMAGE_K8S_VERSION: "v1.31.0"
101102

102103
# Ingress Configuration (Ngrok)
103104
NGROK_REPO_NAME: "ngrok"

0 commit comments

Comments
 (0)