Skip to content

Commit 2668030

Browse files
committed
update config
Signed-off-by: Tamal Saha <[email protected]>
1 parent d9673ae commit 2668030

File tree

6 files changed

+29
-23
lines changed

6 files changed

+29
-23
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include $(ROOT_DIR_RELATIVE)/common.mk
2020
# https://suva.sh/posts/well-documented-makefiles
2121

2222
# Go
23-
GO_VERSION ?=1.23.7
23+
GO_VERSION ?=1.23.9
2424
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
2525

2626
# Directories.
@@ -148,8 +148,8 @@ E2E_SKIP_EKS_UPGRADE ?= "false"
148148
EKS_SOURCE_TEMPLATE ?= eks/cluster-template-eks-control-plane-only.yaml
149149

150150
# set up `setup-envtest` to install kubebuilder dependency
151-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
152-
SETUP_ENVTEST_VER := release-0.19
151+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
152+
SETUP_ENVTEST_VER := release-0.20
153153
SETUP_ENVTEST_BIN := setup-envtest
154154
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
155155
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest

metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,6 @@ releaseSeries:
6262
- major: 2
6363
minor: 8
6464
contract: v1beta1
65+
- major: 2
66+
minor: 9
67+
contract: v1beta1

test/e2e/data/e2e_conf.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ images:
2020
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
2121

2222
# Cluster API v1beta1 Preloads
23-
- name: quay.io/jetstack/cert-manager-cainjector:v1.16.1
23+
- name: quay.io/jetstack/cert-manager-cainjector:v1.17.2
2424
loadBehavior: tryLoad
25-
- name: quay.io/jetstack/cert-manager-webhook:v1.16.1
25+
- name: quay.io/jetstack/cert-manager-webhook:v1.17.2
2626
loadBehavior: tryLoad
27-
- name: quay.io/jetstack/cert-manager-controller:v1.16.1
27+
- name: quay.io/jetstack/cert-manager-controller:v1.17.2
2828
loadBehavior: tryLoad
2929
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
3030
loadBehavior: tryLoad
@@ -186,21 +186,21 @@ variables:
186186
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
187187
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
188188
# This avoids building node images in the default case which improves the test duration significantly.
189-
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0"
190-
KUBERNETES_VERSION: "v1.31.0"
191-
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0"
192-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.8"
189+
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0"
190+
KUBERNETES_VERSION: "v1.32.0"
191+
KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0"
192+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.31.0"
193193
CNI: "../../data/cni/calico.yaml"
194194
KUBETEST_CONFIGURATION: "../../data/kubetest/conformance.yaml"
195195
EVENT_BRIDGE_INSTANCE_STATE: "true"
196196
AWS_CONTROL_PLANE_MACHINE_TYPE: t3.large
197197
AWS_NODE_MACHINE_TYPE: t3.large
198198
AWS_MACHINE_TYPE_VCPU_USAGE: 2
199199
AWS_SSH_KEY_NAME: "cluster-api-provider-aws-sigs-k8s-io"
200-
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.31.5"
200+
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.32.0"
201201
CONFORMANCE_WORKER_MACHINE_COUNT: "5"
202202
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "3"
203-
ETCD_VERSION_UPGRADE_TO: "3.5.14-0"
203+
ETCD_VERSION_UPGRADE_TO: "3.5.16-0"
204204
COREDNS_VERSION_UPGRADE_TO: "v1.11.3"
205205
MULTI_TENANCY_ROLE_NAME: "multi-tenancy-role"
206206
MULTI_TENANCY_NESTED_ROLE_NAME: "multi-tenancy-nested-role"
@@ -213,12 +213,12 @@ variables:
213213
INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/clusterctl-{OS}-{ARCH}"
214214
# INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
215215
# the management cluster to be upgraded.
216-
INIT_WITH_KUBERNETES_VERSION: "v1.30.8"
216+
INIT_WITH_KUBERNETES_VERSION: "v1.31.0"
217217
EXP_BOOTSTRAP_FORMAT_IGNITION: "true"
218218
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
219219
GC_WORKLOAD: "../../data/gcworkload.yaml"
220220
CLASSICELB_TEST_KUBERNETES_VERSION_FROM: "v1.29.9"
221-
CLASSICELB_TEST_KUBERNETES_VERSION_TO: "v1.30.8"
221+
CLASSICELB_TEST_KUBERNETES_VERSION_TO: "v1.31.0"
222222

223223
intervals:
224224
default/wait-cluster: ["35m", "10s"]

test/e2e/data/e2e_eks_conf.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ images:
1717
loadBehavior: mustLoad
1818

1919
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
20-
- name: quay.io/jetstack/cert-manager-cainjector:v1.16.1
20+
- name: quay.io/jetstack/cert-manager-cainjector:v1.17.2
2121
loadBehavior: tryLoad
22-
- name: quay.io/jetstack/cert-manager-webhook:v1.16.1
22+
- name: quay.io/jetstack/cert-manager-webhook:v1.17.2
2323
loadBehavior: tryLoad
24-
- name: quay.io/jetstack/cert-manager-controller:v1.16.1
24+
- name: quay.io/jetstack/cert-manager-controller:v1.17.2
2525
loadBehavior: tryLoad
2626
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
2727
loadBehavior: tryLoad
@@ -118,10 +118,10 @@ providers:
118118
targetName: "cluster-template-eks-control-plane-bare-eks.yaml"
119119

120120
variables:
121-
KUBERNETES_VERSION: "v1.31.0"
122-
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0" # Kind bootstrap
123-
UPGRADE_TO_VERSION: "v1.31.0"
124-
UPGRADE_FROM_VERSION: "v1.30.8"
121+
KUBERNETES_VERSION: "v1.32.0"
122+
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0" # Kind bootstrap
123+
UPGRADE_TO_VERSION: "v1.32.0"
124+
UPGRADE_FROM_VERSION: "v1.31.0"
125125
EXP_MACHINE_POOL: "true"
126126
EXP_CLUSTER_RESOURCE_SET: "true"
127127
EVENT_BRIDGE_INSTANCE_STATE: "true"
@@ -131,7 +131,7 @@ variables:
131131
EXP_EKS_IAM: "false"
132132
EXP_EKS_ADD_ROLES: "false"
133133
VPC_ADDON_VERSION: "v1.18.3-eksbuild.2"
134-
KUBE_PROXY_ADDON_VERSION: "v1.31.0-eksbuild.5"
134+
KUBE_PROXY_ADDON_VERSION: "v1.32.0-eksbuild.2"
135135
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.31.5"
136136
IP_FAMILY: "IPv4"
137137
CAPA_LOGLEVEL: "4"

test/e2e/data/shared/v1beta1/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# update this file only when a new major or minor version is released
66
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
77
releaseSeries:
8+
- major: 1
9+
minor: 10
10+
contract: v1beta1
811
- major: 1
912
minor: 9
1013
contract: v1beta1

versions.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
17-
CERT_MANAGER_VERSION := v1.16.1
17+
CERT_MANAGER_VERSION := v1.17.2
1818
CAPI_VERSION := v1.10.1
1919
KPROMO_VERSION := v4.0.4
2020
YQ_VERSION := v4.25.2

0 commit comments

Comments
 (0)