Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30 #10454

Merged
merged 1 commit into from
Apr 18, 2024
Merged

🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30 #10454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions docs/book/src/reference/versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ These diagrams show the relationships between components in a Cluster API releas
| Kubernetes v1.27 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 | | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 | | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 | | | | ✓ >= v1.7.1 |
chrischdi marked this conversation as resolved.
Show resolved Hide resolved


\* 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.
chrischdi marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -105,6 +106,7 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 + kubeadm/v1beta3 | | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 + kubeadm/v1beta3 | | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 + kubeadm/v1beta3 | | | | ✓ >= v1.7.1 |

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

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

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.

Expand All @@ -142,18 +145,6 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
**1.29**:
* 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)

**1.28**:
* No specific notes

**1.27**:
* No specific notes

**1.26**:
* No specific notes

**1.25**:
* No specific notes

**1.24**:
* Kubeadm Bootstrap Provider:
* `kubeadm` now sets both the `node-role.kubernetes.io/control-plane` and `node-role.kubernetes.io/master` taints on control plane nodes.
Expand Down
8 changes: 7 additions & 1 deletion scripts/ci-e2e-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,18 @@ capi:buildDockerImages () {
fi
}

# k8s::prepareKindestImagesVariables defaults the environment variables KUBERNETES_VERSION,
# k8s::prepareKindestImagesVariables defaults the environment variables KUBERNETES_VERSION_MANAGEMENT, KUBERNETES_VERSION,
# KUBERNETES_VERSION_UPGRADE_TO, KUBERNETES_VERSION_UPGRADE_FROM and KUBERNETES_VERSION_LATEST_CI
# depending on what is set in GINKGO_FOCUS.
# Note: We do this to ensure that the kindest/node image gets built if it does
# not already exist, e.g. for pre-releases, but only if necessary.
k8s::prepareKindestImagesVariables() {
# Always default KUBERNETES_VERSION_MANAGEMENT because we always create a management cluster out of it.
if [[ -z "${KUBERNETES_VERSION_MANAGEMENT:-}" ]]; then
KUBERNETES_VERSION_MANAGEMENT=$(grep KUBERNETES_VERSION_MANAGEMENT: < "$E2E_CONF_FILE" | awk -F'"' '{ print $2}')
echo "Defaulting KUBERNETES_VERSION_MANAGEMENT to ${KUBERNETES_VERSION_MANAGEMENT} to trigger image build (because env var is not set)"
fi

if [[ ${GINKGO_FOCUS:-} == *"K8s-Install-ci-latest"* ]]; then
# If the test focuses on [K8s-Install-ci-latest], only default KUBERNETES_VERSION_LATEST_CI
# to the value in the e2e config and only if it is not set.
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/config/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,12 @@ variables:
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
# This avoids building node images in the default case which improves the test duration significantly.
KUBERNETES_VERSION_MANAGEMENT: "v1.29.2"
KUBERNETES_VERSION: "v1.30.0-rc.1"
KUBERNETES_VERSION_MANAGEMENT: "v1.30.0"
chrischdi marked this conversation as resolved.
Show resolved Hide resolved
KUBERNETES_VERSION: "v1.30.0"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.2"
KUBERNETES_VERSION_UPGRADE_TO: "v1.30.0-rc.1"
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.30"
ETCD_VERSION_UPGRADE_TO: "3.5.10-0"
KUBERNETES_VERSION_UPGRADE_TO: "v1.30.0"
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31"
ETCD_VERSION_UPGRADE_TO: "3.5.12-0"
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
DOCKER_SERVICE_DOMAIN: "cluster.local"
IP_FAMILY: "dual"
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/machine-pool.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.30.0-rc.1
version: v1.30.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -77,7 +77,7 @@ spec:
replicas: 2
template:
spec:
version: v1.30.0-rc.1
version: v1.30.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.30.0-rc.1
version: v1.30.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -87,7 +87,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.30.0-rc.1
version: v1.30.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
name: controlplane-0
namespace: default
spec:
version: v1.30.0-rc.1
version: v1.30.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.30.0-rc.1
version: v1.30.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.30.0-rc.1
version: v1.30.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.30.0-rc.1
version: v1.30.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
Loading