Skip to content

Commit 68a9ee6

Browse files
authored
Merge pull request #1330 from jichenjc/k8s_124
update k8s to 1.25
2 parents 058f560 + 3d588bc commit 68a9ee6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ This provider's versions are compatible with the following versions of Cluster A
4848

4949
This provider's versions are able to install and manage the following versions of Kubernetes:
5050

51-
| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 |
52-
|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
53-
| OpenStack Provider v1alpha3 (v0.3) |||||| | | | |
54-
| OpenStack Provider v1alpha4 (v0.4) | | | | || | | | |
55-
| OpenStack Provider v1alpha4 (v0.5) | | | | ||| + | + | + |
56-
| OpenStack Provider v1alpha5 (v0.6) | | | | | || + |||
57-
| OpenStack Provider v1alpha6 | | | | | || + |||
51+
| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 |
52+
|------------------------------------| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
53+
| OpenStack Provider v1alpha3 (v0.3) |||||| | | | | |
54+
| OpenStack Provider v1alpha4 (v0.4) | | | | || | | | | |
55+
| OpenStack Provider v1alpha4 (v0.5) | | | | ||| + | + | + | + |
56+
| OpenStack Provider v1alpha5 (v0.6) | | | | | || + ||||
57+
| OpenStack Provider v1alpha6 | | | | | || + ||||
5858

5959
This provider's versions are able to install Kubernetes to the following versions of OpenStack:
6060

test/e2e/data/e2e_conf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ providers:
9595
variables:
9696
# used to ensure we deploy to the correct management cluster
9797
KUBE_CONTEXT: "kind-capo-e2e"
98-
KUBERNETES_VERSION: "v1.24.2"
98+
KUBERNETES_VERSION: "v1.25.0"
9999
CNI: "../../data/cni/calico.yaml"
100100
CCM: "../../data/ccm/cloud-controller-manager.yaml"
101101
EXP_CLUSTER_RESOURCE_SET: "true"

0 commit comments

Comments
 (0)