Skip to content

Commit a52ab37

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #10454 from chrischdi/pr-1-30-ga-capd
🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30
2 parents dc17184 + 62b1faf commit a52ab37

File tree

7 files changed

+23
-26
lines changed

7 files changed

+23
-26
lines changed

‎docs/book/src/reference/versions.md‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ These diagrams show the relationships between components in a Cluster API releas
8585
| Kubernetes v1.27 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
8686
| Kubernetes v1.28 | | ✓ >= v1.5.1 | ✓ | ✓ |
8787
| Kubernetes v1.29 | | | ✓ >= v1.6.1 | ✓ |
88+
| Kubernetes v1.30 | | | | ✓ >= v1.7.1 |
8889

8990

9091
\* There is an issue with CRDs in Kubernetes v1.23.{0-2}. ClusterClass with patches is affected by that (for more details please see [this issue](https://github.com/kubernetes-sigs/cluster-api/issues/5990)). Therefore we recommend to use Kubernetes v1.23.3+ with ClusterClass.
@@ -105,6 +106,7 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
105106
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
106107
| Kubernetes v1.28 + kubeadm/v1beta3 | | ✓ >= v1.5.1 | ✓ | ✓ |
107108
| Kubernetes v1.29 + kubeadm/v1beta3 | | | ✓ >= v1.6.1 | ✓ |
109+
| Kubernetes v1.30 + kubeadm/v1beta3 | | | | ✓ >= v1.7.1 |
108110

109111
The Kubeadm Bootstrap Provider generates kubeadm configuration using the API version recommended for the target Kubernetes version.
110112

@@ -121,6 +123,7 @@ The Kubeadm Bootstrap Provider generates kubeadm configuration using the API ver
121123
| Kubernetes v1.27 + etcd/v3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
122124
| Kubernetes v1.28 + etcd/v3 | | ✓ >= v1.5.1 | ✓ | ✓ |
123125
| Kubernetes v1.29 + etcd/v3 | | | ✓ >= v1.6.1 | ✓ |
126+
| Kubernetes v1.30 + etcd/v3 | | | | ✓ >= v1.7.1 |
124127

125128
The Kubeadm Control Plane Provider talks to the API server and etcd members of every Workload Cluster whose control plane it owns. It uses the etcd v3 API.
126129

@@ -142,18 +145,6 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
142145
**1.29**:
143146
* In-tree cloud providers are now switched off by default. Please use DisableCloudProviders and DisableKubeletCloudCredentialProvider feature flags if you still need this functionality. (https://github.com/kubernetes/kubernetes/pull/117503)
144147

145-
**1.28**:
146-
* No specific notes
147-
148-
**1.27**:
149-
* No specific notes
150-
151-
**1.26**:
152-
* No specific notes
153-
154-
**1.25**:
155-
* No specific notes
156-
157148
**1.24**:
158149
* Kubeadm Bootstrap Provider:
159150
* `kubeadm` now sets both the `node-role.kubernetes.io/control-plane` and `node-role.kubernetes.io/master` taints on control plane nodes.

‎scripts/ci-e2e-lib.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,18 @@ capi:buildDockerImages () {
3434
fi
3535
}
3636

37-
# k8s::prepareKindestImagesVariables defaults the environment variables KUBERNETES_VERSION,
37+
# k8s::prepareKindestImagesVariables defaults the environment variables KUBERNETES_VERSION_MANAGEMENT, KUBERNETES_VERSION,
3838
# KUBERNETES_VERSION_UPGRADE_TO, KUBERNETES_VERSION_UPGRADE_FROM and KUBERNETES_VERSION_LATEST_CI
3939
# depending on what is set in GINKGO_FOCUS.
4040
# Note: We do this to ensure that the kindest/node image gets built if it does
4141
# not already exist, e.g. for pre-releases, but only if necessary.
4242
k8s::prepareKindestImagesVariables() {
43+
# Always default KUBERNETES_VERSION_MANAGEMENT because we always create a management cluster out of it.
44+
if [[ -z "${KUBERNETES_VERSION_MANAGEMENT:-}" ]]; then
45+
KUBERNETES_VERSION_MANAGEMENT=$(grep KUBERNETES_VERSION_MANAGEMENT: < "$E2E_CONF_FILE" | awk -F'"' '{ print $2}')
46+
echo "Defaulting KUBERNETES_VERSION_MANAGEMENT to ${KUBERNETES_VERSION_MANAGEMENT} to trigger image build (because env var is not set)"
47+
fi
48+
4349
if [[ ${GINKGO_FOCUS:-} == *"K8s-Install-ci-latest"* ]]; then
4450
# If the test focuses on [K8s-Install-ci-latest], only default KUBERNETES_VERSION_LATEST_CI
4551
# to the value in the e2e config and only if it is not set.

‎test/e2e/config/docker.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@ variables:
314314
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
315315
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
316316
# This avoids building node images in the default case which improves the test duration significantly.
317-
KUBERNETES_VERSION_MANAGEMENT: "v1.29.2"
318-
KUBERNETES_VERSION: "v1.30.0-rc.1"
317+
KUBERNETES_VERSION_MANAGEMENT: "v1.30.0"
318+
KUBERNETES_VERSION: "v1.30.0"
319319
KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.2"
320-
KUBERNETES_VERSION_UPGRADE_TO: "v1.30.0-rc.1"
321-
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.30"
322-
ETCD_VERSION_UPGRADE_TO: "3.5.10-0"
320+
KUBERNETES_VERSION_UPGRADE_TO: "v1.30.0"
321+
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31"
322+
ETCD_VERSION_UPGRADE_TO: "3.5.12-0"
323323
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
324324
DOCKER_SERVICE_DOMAIN: "cluster.local"
325325
IP_FAMILY: "dual"

‎test/infrastructure/docker/examples/machine-pool.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.30.0-rc.1
38+
version: v1.30.0
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -77,7 +77,7 @@ spec:
7777
replicas: 2
7878
template:
7979
spec:
80-
version: v1.30.0-rc.1
80+
version: v1.30.0
8181
clusterName: my-cluster
8282
bootstrap:
8383
configRef:

‎test/infrastructure/docker/examples/simple-cluster-ipv6.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.30.0-rc.1
38+
version: v1.30.0
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -87,7 +87,7 @@ spec:
8787
cluster.x-k8s.io/cluster-name: my-cluster
8888
template:
8989
spec:
90-
version: v1.30.0-rc.1
90+
version: v1.30.0
9191
clusterName: my-cluster
9292
bootstrap:
9393
configRef:

‎test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ metadata:
3232
name: controlplane-0
3333
namespace: default
3434
spec:
35-
version: v1.30.0-rc.1
35+
version: v1.30.0
3636
clusterName: my-cluster
3737
bootstrap:
3838
configRef:
@@ -76,7 +76,7 @@ spec:
7676
cluster.x-k8s.io/cluster-name: my-cluster
7777
template:
7878
spec:
79-
version: v1.30.0-rc.1
79+
version: v1.30.0
8080
clusterName: my-cluster
8181
bootstrap:
8282
configRef:

‎test/infrastructure/docker/examples/simple-cluster.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.30.0-rc.1
38+
version: v1.30.0
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -80,7 +80,7 @@ spec:
8080
cluster.x-k8s.io/cluster-name: my-cluster
8181
template:
8282
spec:
83-
version: v1.30.0-rc.1
83+
version: v1.30.0
8484
clusterName: my-cluster
8585
bootstrap:
8686
configRef:

0 commit comments

Comments
 (0)