Skip to content

Commit 397d13a

Browse files
authored
Remove support for Kubernetes 1.27, 1.28, and 1.29 (#12343)
Signed-off-by: Jakub Scholz <www@scholzj.com>
1 parent 646fc17 commit 397d13a

File tree

15 files changed

+67
-59
lines changed

15 files changed

+67
-59
lines changed

.azure/scripts/setup-helm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22
set -x
33

4-
TEST_HELM3_VERSION=${TEST_HELM3_VERSION:-'v3.15.4'}
5-
TEST_HELM_UNITTEST_VERSION=${TEST_HELM_UNITTEST_VERSION:-'v0.6.3'}
4+
TEST_HELM3_VERSION=${TEST_HELM3_VERSION:-'v3.20.0'}
5+
TEST_HELM_UNITTEST_VERSION=${TEST_HELM_UNITTEST_VERSION:-'v1.0.3'}
66

77
function install_helm3 {
88
export HELM_INSTALL_DIR=/usr/bin

.azure/scripts/setup-kind.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ set -xe
33

44
rm -rf ~/.kube
55

6-
KIND_VERSION=${KIND_VERSION:-"v0.29.0"}
7-
KIND_CLOUD_PROVIDER_VERSION=${KIND_CLOUD_PROVIDER_VERSION:-"v0.6.0"}
6+
KIND_VERSION=${KIND_VERSION:-"v0.31.0"}
7+
KIND_CLOUD_PROVIDER_VERSION=${KIND_CLOUD_PROVIDER_VERSION:-"v0.10.0"}
88
# To properly upgrade Kind version check the releases in github https://github.com/kubernetes-sigs/kind/releases and use proper image based on Kind version
9-
KIND_LATEST_DEFAULT_IMAGE="kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f"
10-
KIND_OLDEST_DEFAULT_IMAGE="kindest/node:v1.27.16@sha256:2d21a61643eafc439905e18705b8186f3296384750a835ad7a005dceb9546d20"
9+
KIND_LATEST_DEFAULT_IMAGE="kindest/node:v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f"
10+
KIND_OLDEST_DEFAULT_IMAGE="kindest/node:v1.30.13@sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648"
1111
KIND_NODE_IMAGE=${KIND_NODE_IMAGE:-$KIND_LATEST_DEFAULT_IMAGE}
1212
# Replace latest as one special version
1313
if [[ "${KIND_NODE_IMAGE}" == "latest" ]]; then

.azure/scripts/setup-kubernetes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -xe
33

44
rm -rf ~/.kube
55

6-
KUBE_VERSION=${KUBE_VERSION:-1.27.0}
6+
KUBE_VERSION=${KUBE_VERSION:-1.30.0}
77
MINIKUBE_REGISTRY_IMAGE=${REGISTRY_IMAGE:-"registry"}
88
COPY_DOCKER_LOGIN=${COPY_DOCKER_LOGIN:-"false"}
99

.azure/templates/steps/default_variables.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ variables:
2222
repo_slug: $(Build.Repository.Name)
2323
commit_message: $(Build.SourceVersionMessage)
2424
test_cluster: minikube
25-
test_kubectl_version: v1.27.0
25+
test_kubectl_version: v1.30.0
2626
strimzi_default_log_level: DEBUG
2727
operator_image_pull_policy: IfNotPresent
2828
components_image_pull_policy: IfNotPresent

.azure/templates/steps/prerequisites/install_helm.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ steps:
22
- bash: ".azure/scripts/setup-helm.sh"
33
displayName: "Install Helm"
44
env:
5-
TEST_HELM3_VERSION: v3.15.4
6-
TEST_HELM_UNITTEST_VERSION: v0.5.2
5+
TEST_HELM3_VERSION: v3.20.0
6+
TEST_HELM_UNITTEST_VERSION: v1.0.3

.azure/templates/steps/prerequisites/install_minikube.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ steps:
33
displayName: "Setup Minikube cluster"
44
env:
55
TEST_CLUSTER: minikube
6-
TEST_KUBECTL_VERSION: v1.27.0
7-
TEST_MINIKUBE_VERSION: v1.36.0
6+
TEST_KUBECTL_VERSION: v1.30.0
7+
TEST_MINIKUBE_VERSION: v1.37.0

.github/actions/dependencies/install-helm/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ runs:
99
run: "${{ github.action_path }}/../../../../.azure/scripts/setup-helm.sh"
1010
env:
1111
# TODO - update versions in the upcoming PRs
12-
TEST_HELM3_VERSION: v3.15.4
13-
TEST_HELM_UNITTEST_VERSION: v0.5.2
12+
TEST_HELM3_VERSION: v3.20.0
13+
TEST_HELM_UNITTEST_VERSION: v1.0.3

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
* Nothing here yet, but we will surely develop something new pretty soon 😉
66

7+
### Major changes, deprecations, and removals
8+
9+
* **From Strimzi 0.51 on, we support only Kubernetes 1.30 and newer.**
10+
Kubernetes 1.27, 1.28, and 1.29 are not supported anymore.
11+
712
## 0.50.0
813

914
* Use Java 21 as the runtime and language level

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
<argument>io.strimzi.crdgenerator.DocGenerator</argument>
351351
<argument>--linker</argument>
352352
<argument>io.strimzi.crdgenerator.KubeLinker</argument>
353-
<argument>https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/</argument>
353+
<argument>https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/</argument>
354354
<argument>modules/appendix_crds.adoc</argument>
355355
<argument>io.strimzi.api.kafka.model.kafka.Kafka</argument>
356356
<argument>io.strimzi.api.kafka.model.connect.KafkaConnect</argument>

crd-generator/src/main/java/io/strimzi/crdgenerator/annotations/Crd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Subresources subresources() default @Subresources(
190190

191191
/**
192192
* The scale subresource of a custom resources that this is the definition for.
193-
* @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#customresourcesubresourcescale-v1-apiextensions-k8s-io">Kubernetes 1.27 API documtation</a>
193+
* @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#customresourcesubresourcescale-v1-apiextensions-k8s-io">Kubernetes 1.30 API documetation</a>
194194
*/
195195
@interface Scale {
196196
/**

0 commit comments

Comments
 (0)