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.

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

Update supported Kubernetes version to 1.25+ #10490

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .azure/scripts/setup-helm.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
set -x

TEST_HELM3_VERSION=${TEST_HELM3_VERSION:-'v3.15.1'}
TEST_HELM_UNITTEST_VERSION=${TEST_HELM_UNITTEST_VERSION:-'v0.5.1'}
TEST_HELM3_VERSION=${TEST_HELM3_VERSION:-'v3.15.4'}
TEST_HELM_UNITTEST_VERSION=${TEST_HELM_UNITTEST_VERSION:-'v0.5.2'}

function install_helm3 {
export HELM_INSTALL_DIR=/usr/bin
Expand Down
2 changes: 1 addition & 1 deletion .azure/scripts/setup-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -xe

rm -rf ~/.kube

KUBE_VERSION=${KUBE_VERSION:-1.23.0}
KUBE_VERSION=${KUBE_VERSION:-1.25.0}
COPY_DOCKER_LOGIN=${COPY_DOCKER_LOGIN:-"false"}

DEFAULT_CLUSTER_MEMORY=$(free -m | grep "Mem" | awk '{print $2}')
Expand Down
2 changes: 1 addition & 1 deletion .azure/scripts/setup-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -xe

rm -rf ~/.kube

KUBE_VERSION=${KUBE_VERSION:-1.23.0}
KUBE_VERSION=${KUBE_VERSION:-1.25.0}
MINIKUBE_REGISTRY_IMAGE=${REGISTRY_IMAGE:-"registry"}
COPY_DOCKER_LOGIN=${COPY_DOCKER_LOGIN:-"false"}

Expand Down
3 changes: 1 addition & 2 deletions .azure/templates/steps/default_variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ variables:
repo_slug: $(Build.Repository.Name)
commit_message: $(Build.SourceVersionMessage)
test_cluster: minikube
test_kubectl_version: v1.23.0
test_helm_version: v2.17.0
test_kubectl_version: v1.25.0
strimzi_default_log_level: DEBUG
operator_image_pull_policy: IfNotPresent
components_image_pull_policy: IfNotPresent
Expand Down
4 changes: 2 additions & 2 deletions .azure/templates/steps/prerequisites/install_helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ steps:
- bash: ".azure/scripts/setup-helm.sh"
displayName: "Install Helm"
env:
TEST_HELM3_VERSION: v3.15.1
TEST_HELM_UNITTEST_VERSION: v0.5.1
TEST_HELM3_VERSION: v3.15.4
TEST_HELM_UNITTEST_VERSION: v0.5.2
4 changes: 2 additions & 2 deletions .azure/templates/steps/prerequisites/install_minikube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ steps:
displayName: "Setup Minikube cluster"
env:
TEST_CLUSTER: minikube
TEST_KUBECTL_VERSION: v1.23.0
TEST_MINIKUBE_VERSION: v1.32.0
TEST_KUBECTL_VERSION: v1.25.0
TEST_MINIKUBE_VERSION: v1.33.1
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Changes, deprecations and removals

* **From Strimzi 0.44.0 on, we support only Kubernetes 1.25 and newer.**
Kubernetes 1.23 and 1.24 are not supported anymore.
* When finalizers are enabled (default), the Topic Operator will no longer restore finalizers on unmanaged `KafkaTopic` resources if they are removed, aligning the behavior with paused topics, where finalizers are also not restored.
This change matches user expectations.

Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
<argument>io.strimzi.crdgenerator.DocGenerator</argument>
<argument>--linker</argument>
<argument>io.strimzi.crdgenerator.KubeLinker</argument>
<argument>https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/</argument>
<argument>https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/</argument>
<argument>modules/appendix_crds.adoc</argument>
<argument>io.strimzi.api.kafka.model.kafka.Kafka</argument>
<argument>io.strimzi.api.kafka.model.connect.KafkaConnect</argument>
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/io/strimzi/platform/KubernetesVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public class KubernetesVersion implements Comparable<KubernetesVersion> {

// Notable Kubernetes versions => this includes the minimal supported version and for example also any Kubernetes
// versions from some features are supported.
public static final KubernetesVersion V1_23 = new KubernetesVersion(1, 23);
public static final KubernetesVersion V1_25 = new KubernetesVersion(1, 25);

public static final KubernetesVersion MINIMAL_SUPPORTED_VERSION = V1_23;
public static final KubernetesVersion MINIMAL_SUPPORTED_VERSION = V1_25;
public static final int MINIMAL_SUPPORTED_MAJOR = MINIMAL_SUPPORTED_VERSION.major;
public static final int MINIMAL_SUPPORTED_MINOR = MINIMAL_SUPPORTED_VERSION.minor;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Subresources subresources() default @Subresources(

/**
* The scale subresource of a custom resources that this is the definition for.
* @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#customresourcesubresourcescale-v1beta1-apiextensions-k8s-io">Kubernetes 1.23 API documtation</a>
* @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#customresourcesubresourcescale-v1-apiextensions-k8s-io">Kubernetes 1.25 API documtation</a>
*/
@interface Scale {
/**
Expand Down
70 changes: 35 additions & 35 deletions documentation/modules/appendix_crds.adoc

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions documentation/shared/attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
:UpgradeGuide: link:https://strimzi.io/docs/operators/0.24.0/deploying.html#assembly-upgrade-resources-str[Strimzi 0.24.0 upgrade documentation^]

// Kubernetes versions
:KubernetesVersion: 1.23 and later
:KubernetesVersion: 1.25 and later

// Kafka upgrade attributes used in kafka upgrades section
:DefaultKafkaVersion: 3.8.0
Expand Down Expand Up @@ -80,7 +80,7 @@
:K8sMeaningOfMemory: link:https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory[Meaning of memory^]
:K8sManagingComputingResources: link:https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[Managing Compute Resources for Containers^]
:K8sLivenessReadinessProbes: link:https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/[Configure Liveness and Readiness Probes^]
:K8sNetworkPolicyPeerAPI: link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#networkpolicypeer-v1-networking-k8s-io[NetworkPolicyPeer API reference^]
:K8sNetworkPolicyPeerAPI: link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#networkpolicypeer-v1-networking-k8s-io[NetworkPolicyPeer API reference^]
:K8sImagePullPolicies: link:https://kubernetes.io/docs/concepts/containers/images/#updating-images[Disruptions^]
:K8sCRDs: link:https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/[Extend the Kubernetes API with CustomResourceDefinitions^]
:K8sResizingPersistentVolumesUsingKubernetes: link:https://kubernetes.io/blog/2018/07/12/resizing-persistent-volumes-using-kubernetes/[Resizing Persistent Volumes using Kubernetes^]
Expand Down
6 changes: 3 additions & 3 deletions packaging/helm-charts/helm3/strimzi-kafka-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Upgrading to Strimzi 0.32 and newer directly from Strimzi 0.22 and earlier is no
Please follow the [documentation](https://strimzi.io/docs/operators/latest/full/deploying.html#assembly-upgrade-str) for more details.

**!!! IMPORTANT !!!**
Strimzi 0.43.0 (and any of its patch releases) is the last Strimzi version with support for Kubernetes 1.23 and 1.24.
From Strimzi 0.44.0 on, Strimzi will support only Kubernetes 1.25 and newer.
From Strimzi 0.44.0 on, we support only Kubernetes 1.25 and newer.
Kubernetes 1.23 and 1.24 are not supported anymore.

## Introduction

Expand Down Expand Up @@ -60,7 +60,7 @@ Strimzi is licensed under the [Apache License, Version 2.0](https://github.com/s

## Prerequisites

- Kubernetes 1.23+
- Kubernetes 1.25+

## Installing the Chart

Expand Down
2 changes: 1 addition & 1 deletion systemtest/scripts/results_info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RESULTS_PATH=${1}
TEST_CASE=${2}
TEST_PROFILE=${3}
BUILD_ID=${4:-0}
KUBE_VERSION=${5:-1.23.0}
KUBE_VERSION=${5:-1.25.0}
TEST_ONLY=${6:-''}
TEST_COUNT_RUNNING_IN_PARALLEL=${7:-''}
EXCLUDED_GROUPS=${8:-''}
Expand Down
Loading