Skip to content

Commit 9782d97

Browse files
committed
Drop support for Kube 1.25 and 1.26
Signed-off-by: Jakub Scholz <www@scholzj.com>
1 parent ff3155b commit 9782d97

File tree

12 files changed

+57
-51
lines changed

12 files changed

+57
-51
lines changed

.azure/scripts/setup-kubernetes.sh

Lines changed: 2 additions & 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.25.0}
6+
KUBE_VERSION=${KUBE_VERSION:-1.27.0}
77
MINIKUBE_REGISTRY_IMAGE=${REGISTRY_IMAGE:-"registry"}
88
COPY_DOCKER_LOGIN=${COPY_DOCKER_LOGIN:-"false"}
99

@@ -66,6 +66,7 @@ if [ "$TEST_CLUSTER" = "minikube" ]; then
6666
export KUBECONFIG=$HOME/.kube/config
6767
# We can turn on network polices support by adding the following options --cni=calico
6868
# However, it seems not working properly with kube 1.25, we should revisit it once we drop it
69+
# Covered by https://github.com/strimzi/strimzi-kafka-operator/issues/11639
6970
minikube start --driver=docker --kubernetes-version=${KUBE_VERSION} \
7071
--insecure-registry=localhost:5000 --extra-config=apiserver.authorization-mode=Node,RBAC \
7172
--cpus=${MINIKUBE_CPU} --memory=${MINIKUBE_MEMORY} --force

.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.25.0
25+
test_kubectl_version: v1.27.0
2626
strimzi_default_log_level: DEBUG
2727
operator_image_pull_policy: IfNotPresent
2828
components_image_pull_policy: IfNotPresent

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

Lines changed: 1 addition & 1 deletion
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.25.0
6+
TEST_KUBECTL_VERSION: v1.27.0
77
TEST_MINIKUBE_VERSION: v1.36.0

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ body:
4646
attributes:
4747
label: Kubernetes version
4848
description: Kubernetes version where the bug occurred
49-
placeholder: e.g. Kubernetes 1.25, OpenShift 4.11
49+
placeholder: e.g. Kubernetes 1.27, OpenShift 4.11
5050
validations:
5151
required: true
5252
- type: input

CHANGELOG.md

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

55
* n/a
66

7+
### Changes, deprecations and removals
8+
9+
* **From Strimzi 0.48.0 on, we support only Kubernetes 1.27 and newer.**
10+
Kubernetes 1.25 and 1.26 are not supported anymore.
11+
712
## 0.47.0
813

914
* Adding progress tracking for Cruise Control rebalances

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<argument>io.strimzi.crdgenerator.DocGenerator</argument>
226226
<argument>--linker</argument>
227227
<argument>io.strimzi.crdgenerator.KubeLinker</argument>
228-
<argument>https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/</argument>
228+
<argument>https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/</argument>
229229
<argument>modules/appendix_crds.adoc</argument>
230230
<argument>io.strimzi.api.kafka.model.kafka.Kafka</argument>
231231
<argument>io.strimzi.api.kafka.model.connect.KafkaConnect</argument>

api/src/main/java/io/strimzi/platform/KubernetesVersion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public class KubernetesVersion implements Comparable<KubernetesVersion> {
1313

1414
// Notable Kubernetes versions => this includes the minimal supported version and for example also any Kubernetes
1515
// versions from some features are supported.
16-
public static final KubernetesVersion V1_25 = new KubernetesVersion(1, 25);
16+
public static final KubernetesVersion V1_27 = new KubernetesVersion(1, 27);
1717

18-
public static final KubernetesVersion MINIMAL_SUPPORTED_VERSION = V1_25;
18+
public static final KubernetesVersion MINIMAL_SUPPORTED_VERSION = V1_27;
1919
public static final int MINIMAL_SUPPORTED_MAJOR = MINIMAL_SUPPORTED_VERSION.major;
2020
public static final int MINIMAL_SUPPORTED_MINOR = MINIMAL_SUPPORTED_VERSION.minor;
2121

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
@@ -142,7 +142,7 @@ Subresources subresources() default @Subresources(
142142

143143
/**
144144
* The scale subresource of a custom resources that this is the definition for.
145-
* @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#customresourcesubresourcescale-v1-apiextensions-k8s-io">Kubernetes 1.25 API documtation</a>
145+
* @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#customresourcesubresourcescale-v1-apiextensions-k8s-io">Kubernetes 1.27 API documtation</a>
146146
*/
147147
@interface Scale {
148148
/**

documentation/modules/appendix_crds.adoc

Lines changed: 39 additions & 39 deletions
Large diffs are not rendered by default.

documentation/shared/attributes.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
:ProductVersionPrevious: 0.47.0
1919

2020
// Kubernetes versions
21-
:KubernetesVersion: 1.25 and later
21+
:KubernetesVersion: 1.27 and later
2222

2323
// Kafka upgrade attributes used in kafka upgrades section
2424
:DefaultKafkaVersion: 4.0.0
@@ -75,7 +75,7 @@
7575
:K8sMeaningOfMemory: link:https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory[Meaning of memory^]
7676
:K8sManagingComputingResources: link:https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[Managing Compute Resources for Containers^]
7777
:K8sLivenessReadinessProbes: link:https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/[Configure Liveness and Readiness Probes^]
78-
:K8sNetworkPolicyPeerAPI: link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#networkpolicypeer-v1-networking-k8s-io[NetworkPolicyPeer API reference^]
78+
:K8sNetworkPolicyPeerAPI: link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#networkpolicypeer-v1-networking-k8s-io[NetworkPolicyPeer API reference^]
7979
:K8sImagePullPolicies: link:https://kubernetes.io/docs/concepts/containers/images/#updating-images[Disruptions^]
8080
:K8sCRDs: link:https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/[Extend the Kubernetes API with CustomResourceDefinitions^]
8181
:K8sResizingPersistentVolumesUsingKubernetes: link:https://kubernetes.io/blog/2018/07/12/resizing-persistent-volumes-using-kubernetes/[Resizing Persistent Volumes using Kubernetes^]

0 commit comments

Comments
 (0)