Skip to content

Commit 18e1663

Browse files
damdodamdo
committed
update e2e testing versions
1 parent 66eecc0 commit 18e1663

File tree

5 files changed

+46
-43
lines changed

5 files changed

+46
-43
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.30.2
152-
SETUP_ENVTEST_VER := v0.0.0-20240923090159-236e448db12c
151+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
152+
SETUP_ENVTEST_VER := release-0.19
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

‎test/e2e/data/e2e_conf.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ 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.15.1
23+
- name: quay.io/jetstack/cert-manager-cainjector:v1.16.1
2424
loadBehavior: tryLoad
25-
- name: quay.io/jetstack/cert-manager-webhook:v1.15.1
25+
- name: quay.io/jetstack/cert-manager-webhook:v1.16.1
2626
loadBehavior: tryLoad
27-
- name: quay.io/jetstack/cert-manager-controller:v1.15.1
27+
- name: quay.io/jetstack/cert-manager-controller:v1.16.1
2828
loadBehavior: tryLoad
29-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
29+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.9.0-beta.0
3030
loadBehavior: tryLoad
31-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
31+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.0-beta.0
3232
loadBehavior: tryLoad
33-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
33+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.0-beta.0
3434
loadBehavior: tryLoad
3535

3636
providers:
@@ -48,8 +48,8 @@ providers:
4848
new: "imagePullPolicy: IfNotPresent"
4949
- old: --metrics-bind-addr=127.0.0.1:8080
5050
new: --metrics-bind-addr=:8080
51-
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml"
51+
- name: v1.9.0-beta.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/core-components.yaml"
5353
type: "url"
5454
contract: v1beta1
5555
files:
@@ -75,8 +75,8 @@ providers:
7575
new: "imagePullPolicy: IfNotPresent"
7676
- old: --metrics-bind-addr=127.0.0.1:8080
7777
new: --metrics-bind-addr=:8080
78-
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml"
78+
- name: v1.9.0-beta.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -102,8 +102,8 @@ providers:
102102
new: "imagePullPolicy: IfNotPresent"
103103
- old: --metrics-bind-addr=127.0.0.1:8080
104104
new: --metrics-bind-addr=:8080
105-
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/control-plane-components.yaml"
105+
- name: v1.9.0-beta.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/control-plane-components.yaml"
107107
type: "url"
108108
contract: v1beta1
109109
files:
@@ -176,22 +176,22 @@ variables:
176176
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
177177
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
178178
# This avoids building node images in the default case which improves the test duration significantly.
179-
KUBERNETES_VERSION_MANAGEMENT: "v1.29.8"
180-
KUBERNETES_VERSION: "v1.29.9"
181-
KUBERNETES_VERSION_UPGRADE_TO: "v1.29.9"
182-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.8"
179+
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0"
180+
KUBERNETES_VERSION: "v1.31.0"
181+
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0"
182+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.8"
183183
CNI: "../../data/cni/calico.yaml"
184184
KUBETEST_CONFIGURATION: "../../data/kubetest/conformance.yaml"
185185
EVENT_BRIDGE_INSTANCE_STATE: "true"
186186
AWS_CONTROL_PLANE_MACHINE_TYPE: t3.large
187187
AWS_NODE_MACHINE_TYPE: t3.large
188188
AWS_MACHINE_TYPE_VCPU_USAGE: 2
189189
AWS_SSH_KEY_NAME: "cluster-api-provider-aws-sigs-k8s-io"
190-
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.29.9"
190+
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.31.0"
191191
CONFORMANCE_WORKER_MACHINE_COUNT: "5"
192192
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "3"
193-
ETCD_VERSION_UPGRADE_TO: "3.5.11-0"
194-
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
193+
ETCD_VERSION_UPGRADE_TO: "3.5.14-0"
194+
COREDNS_VERSION_UPGRADE_TO: "v1.11.3"
195195
MULTI_TENANCY_ROLE_NAME: "multi-tenancy-role"
196196
MULTI_TENANCY_NESTED_ROLE_NAME: "multi-tenancy-nested-role"
197197
IP_FAMILY: "IPv4"
@@ -203,7 +203,7 @@ variables:
203203
INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/clusterctl-{OS}-{ARCH}"
204204
# INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
205205
# the management cluster to be upgraded.
206-
INIT_WITH_KUBERNETES_VERSION: "v1.29.8"
206+
INIT_WITH_KUBERNETES_VERSION: "v1.30.8"
207207
EXP_BOOTSTRAP_FORMAT_IGNITION: "true"
208208
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
209209
EXP_EXTERNAL_RESOURCE_GC: "true"

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ images:
1616
- name: gcr.io/k8s-staging-cluster-api/capa-manager:e2e
1717
loadBehavior: mustLoad
1818

19-
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
20-
- name: quay.io/jetstack/cert-manager-cainjector:v1.15.1
19+
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
20+
- name: quay.io/jetstack/cert-manager-cainjector:v1.16.1
2121
loadBehavior: tryLoad
22-
- name: quay.io/jetstack/cert-manager-webhook:v1.15.1
22+
- name: quay.io/jetstack/cert-manager-webhook:v1.16.1
2323
loadBehavior: tryLoad
24-
- name: quay.io/jetstack/cert-manager-controller:v1.15.1
24+
- name: quay.io/jetstack/cert-manager-controller:v1.16.1
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.9.0-beta.0
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.0-beta.0
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.0-beta.0
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.8.4
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml"
37+
- name: v1.9.0-beta.0
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.8.4
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml"
53+
- name: v1.9.0-beta.0
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.8.4
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/control-plane-components.yaml"
69+
- name: v1.9.0-beta.0
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:
@@ -116,10 +116,10 @@ providers:
116116
targetName: "cluster-template-eks-control-plane-only-legacy.yaml"
117117

118118
variables:
119-
KUBERNETES_VERSION: "v1.30.2"
120-
KUBERNETES_VERSION_MANAGEMENT: "v1.30.0" # Kind bootstrap
121-
UPGRADE_FROM_VERSION: "v1.30.0"
119+
KUBERNETES_VERSION: "v1.31.0"
120+
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0" # Kind bootstrap
122121
UPGRADE_TO_VERSION: "v1.31.0"
122+
UPGRADE_FROM_VERSION: "v1.30.8"
123123
EXP_MACHINE_POOL: "true"
124124
EXP_CLUSTER_RESOURCE_SET: "true"
125125
EVENT_BRIDGE_INSTANCE_STATE: "true"
@@ -128,9 +128,9 @@ variables:
128128
AWS_SSH_KEY_NAME: "cluster-api-provider-aws-sigs-k8s-io"
129129
EXP_EKS_IAM: "false"
130130
EXP_EKS_ADD_ROLES: "false"
131-
VPC_ADDON_VERSION: "v1.18.1-eksbuild.3"
132-
KUBE_PROXY_ADDON_VERSION: "v1.30.0-eksbuild.3"
133-
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "1.30.2"
131+
VPC_ADDON_VERSION: "v1.18.3-eksbuild.2"
132+
KUBE_PROXY_ADDON_VERSION: "v1.31.0-eksbuild.5"
133+
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "1.31.0"
134134
IP_FAMILY: "IPv4"
135135
CAPA_LOGLEVEL: "4"
136136
EXP_EXTERNAL_RESOURCE_GC: "true"

‎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: 9
10+
contract: v1beta1
811
- major: 1
912
minor: 8
1013
contract: v1beta1

‎versions.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
17-
CERT_MANAGER_VERSION := v1.15.1
18-
CAPI_VERSION := v1.8.4
17+
CERT_MANAGER_VERSION := v1.16.1
18+
CAPI_VERSION := v1.9.0-beta.0
1919
KPROMO_VERSION := v4.0.4
2020
YQ_VERSION := v4.25.2
2121
GOLANGCI_LINT_VERSION := v1.53.3

0 commit comments

Comments
 (0)