From 501cef1554f20d89b6dc2f956654bbf7cbb63d1c Mon Sep 17 00:00:00 2001 From: Jakub Scholz Date: Sun, 17 Dec 2023 21:18:10 +0100 Subject: [PATCH] Update supported Kubernetes version to 1.23+ Signed-off-by: Jakub Scholz --- .azure/scripts/setup-helm.sh | 2 +- .azure/scripts/setup-kind.sh | 2 +- .azure/scripts/setup-kubernetes.sh | 2 +- .azure/templates/steps/default_variables.yaml | 2 +- .../steps/prerequisites/install_helm.yaml | 2 +- .../steps/prerequisites/install_minikube.yaml | 4 +-- CHANGELOG.md | 5 +++ .../strimzi/platform/KubernetesVersion.java | 13 ++------ .../platform/KubernetesVersionTest.java | 32 +++++++++++-------- .../PlatformFeaturesAvailabilityTest.java | 22 +++++++------ .../assembly/KafkaAssemblyOperatorTest.java | 2 +- .../KafkaBridgeAssemblyOperatorTest.java | 2 +- ...afkaConnectAssemblyOperatorPodSetTest.java | 2 +- .../operator/assembly/KafkaConnectorIT.java | 10 +++--- ...irrorMaker2AssemblyOperatorPodSetTest.java | 2 +- .../KafkaMirrorMakerAssemblyOperatorTest.java | 2 +- .../assembly/KafkaReconcilerStatusTest.java | 2 +- .../KafkaReconcilerUpgradeDowngradeTest.java | 2 +- .../KubernetesRestartEventsMockTest.java | 2 +- documentation/shared/attributes.adoc | 2 +- .../helm3/strimzi-kafka-operator/README.md | 6 ++-- systemtest/scripts/results_info.sh | 2 +- 22 files changed, 64 insertions(+), 58 deletions(-) diff --git a/.azure/scripts/setup-helm.sh b/.azure/scripts/setup-helm.sh index 65a6f5b48d9..28184e80730 100755 --- a/.azure/scripts/setup-helm.sh +++ b/.azure/scripts/setup-helm.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -x -TEST_HELM3_VERSION=${TEST_HELM3_VERSION:-'v3.12.0'} +TEST_HELM3_VERSION=${TEST_HELM3_VERSION:-'v3.13.3'} function install_helm3 { export HELM_INSTALL_DIR=/usr/bin diff --git a/.azure/scripts/setup-kind.sh b/.azure/scripts/setup-kind.sh index 12399480734..6fb51aa0012 100755 --- a/.azure/scripts/setup-kind.sh +++ b/.azure/scripts/setup-kind.sh @@ -3,7 +3,7 @@ set -xe rm -rf ~/.kube -KUBE_VERSION=${KUBE_VERSION:-1.21.0} +KUBE_VERSION=${KUBE_VERSION:-1.23.0} COPY_DOCKER_LOGIN=${COPY_DOCKER_LOGIN:-"false"} DEFAULT_CLUSTER_MEMORY=$(free -m | grep "Mem" | awk '{print $2}') diff --git a/.azure/scripts/setup-kubernetes.sh b/.azure/scripts/setup-kubernetes.sh index 4b0bd2d7c9b..55f28056044 100755 --- a/.azure/scripts/setup-kubernetes.sh +++ b/.azure/scripts/setup-kubernetes.sh @@ -3,7 +3,7 @@ set -xe rm -rf ~/.kube -KUBE_VERSION=${KUBE_VERSION:-1.21.0} +KUBE_VERSION=${KUBE_VERSION:-1.23.0} MINIKUBE_REGISTRY_IMAGE=${REGISTRY_IMAGE:-"registry"} COPY_DOCKER_LOGIN=${COPY_DOCKER_LOGIN:-"false"} diff --git a/.azure/templates/steps/default_variables.yaml b/.azure/templates/steps/default_variables.yaml index d20b24cdfea..744062a0186 100644 --- a/.azure/templates/steps/default_variables.yaml +++ b/.azure/templates/steps/default_variables.yaml @@ -22,7 +22,7 @@ variables: repo_slug: $(Build.Repository.Name) commit_message: $(Build.SourceVersionMessage) test_cluster: minikube - test_kubectl_version: v1.21.0 + test_kubectl_version: v1.23.0 test_helm_version: v2.17.0 strimzi_default_log_level: DEBUG operator_image_pull_policy: IfNotPresent diff --git a/.azure/templates/steps/prerequisites/install_helm.yaml b/.azure/templates/steps/prerequisites/install_helm.yaml index e7073330d87..33bfa6b0cf3 100644 --- a/.azure/templates/steps/prerequisites/install_helm.yaml +++ b/.azure/templates/steps/prerequisites/install_helm.yaml @@ -2,4 +2,4 @@ steps: - bash: ".azure/scripts/setup-helm.sh" displayName: "Install Helm" env: - TEST_HELM3_VERSION: 'v3.12.0' \ No newline at end of file + TEST_HELM3_VERSION: v3.13.3 \ No newline at end of file diff --git a/.azure/templates/steps/prerequisites/install_minikube.yaml b/.azure/templates/steps/prerequisites/install_minikube.yaml index 337e8b767c9..4861e72d512 100644 --- a/.azure/templates/steps/prerequisites/install_minikube.yaml +++ b/.azure/templates/steps/prerequisites/install_minikube.yaml @@ -3,5 +3,5 @@ steps: displayName: "Setup Minikube cluster" env: TEST_CLUSTER: minikube - TEST_KUBECTL_VERSION: v1.21.0 - TEST_MINIKUBE_VERSION: v1.24.0 \ No newline at end of file + TEST_KUBECTL_VERSION: v1.23.0 + TEST_MINIKUBE_VERSION: v1.32.0 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index bda7b828e68..ef66515f9f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ ## 0.40.0 +### Changes, deprecations and removals + +* **From Strimzi 0.40.0 on, we support only Kubernetes 1.23 and newer.** + Kubernetes 1.21 and 1.22 are not supported anymore. + ## 0.39.0 * Add support for Apache Kafka 3.5.2 and 3.6.1 diff --git a/api/src/main/java/io/strimzi/platform/KubernetesVersion.java b/api/src/main/java/io/strimzi/platform/KubernetesVersion.java index 8ec3034b2f0..5372c038e72 100644 --- a/api/src/main/java/io/strimzi/platform/KubernetesVersion.java +++ b/api/src/main/java/io/strimzi/platform/KubernetesVersion.java @@ -11,18 +11,11 @@ public class KubernetesVersion implements Comparable { private final int major; private final int minor; - // unsupported versions - public static final KubernetesVersion V1_15 = new KubernetesVersion(1, 15); - - // supported versions - public static final KubernetesVersion V1_21 = new KubernetesVersion(1, 21); - public static final KubernetesVersion V1_22 = new KubernetesVersion(1, 22); + // 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_24 = new KubernetesVersion(1, 24); - public static final KubernetesVersion V1_25 = new KubernetesVersion(1, 25); - public static final KubernetesVersion V1_26 = new KubernetesVersion(1, 26); - public static final KubernetesVersion MINIMAL_SUPPORTED_VERSION = V1_21; + public static final KubernetesVersion MINIMAL_SUPPORTED_VERSION = V1_23; public static final int MINIMAL_SUPPORTED_MAJOR = MINIMAL_SUPPORTED_VERSION.major; public static final int MINIMAL_SUPPORTED_MINOR = MINIMAL_SUPPORTED_VERSION.minor; diff --git a/api/src/test/java/io/strimzi/platform/KubernetesVersionTest.java b/api/src/test/java/io/strimzi/platform/KubernetesVersionTest.java index 6f37a9ae36f..dfee4b031d9 100644 --- a/api/src/test/java/io/strimzi/platform/KubernetesVersionTest.java +++ b/api/src/test/java/io/strimzi/platform/KubernetesVersionTest.java @@ -11,30 +11,36 @@ import static org.hamcrest.Matchers.lessThan; public class KubernetesVersionTest { + // Kubernetes versions used for tests => comparing Kubernetes versions + private static final KubernetesVersion V1_5 = new KubernetesVersion(1, 5); // very old version + private static final KubernetesVersion V1_14 = new KubernetesVersion(1, 14); + private static final KubernetesVersion V1_15 = new KubernetesVersion(1, 15); + private static final KubernetesVersion V1_16 = new KubernetesVersion(1, 16); + @Test public void versionTest() { KubernetesVersion kv1p5 = new KubernetesVersion(1, 5); - assertThat(kv1p5.compareTo(KubernetesVersion.V1_15), lessThan(0)); - assertThat(kv1p5.compareTo(KubernetesVersion.V1_21), lessThan(0)); - assertThat(kv1p5.compareTo(KubernetesVersion.V1_25), lessThan(0)); + assertThat(kv1p5.compareTo(V1_14), lessThan(0)); + assertThat(kv1p5.compareTo(V1_15), lessThan(0)); + assertThat(kv1p5.compareTo(V1_16), lessThan(0)); - assertThat(KubernetesVersion.V1_15.compareTo(KubernetesVersion.V1_15), is(0)); - assertThat(KubernetesVersion.V1_15.compareTo(KubernetesVersion.V1_21), lessThan(0)); - assertThat(KubernetesVersion.V1_15.compareTo(KubernetesVersion.V1_25), lessThan(0)); + assertThat(V1_5.compareTo(V1_5), is(0)); + assertThat(V1_5.compareTo(V1_14), lessThan(0)); + assertThat(V1_5.compareTo(V1_15), lessThan(0)); - assertThat(KubernetesVersion.V1_22.compareTo(KubernetesVersion.V1_15), greaterThan(0)); - assertThat(KubernetesVersion.V1_22.compareTo(KubernetesVersion.V1_21), greaterThan(0)); - assertThat(KubernetesVersion.V1_22.compareTo(KubernetesVersion.V1_22), is(0)); + assertThat(V1_15.compareTo(V1_5), greaterThan(0)); + assertThat(V1_15.compareTo(V1_14), greaterThan(0)); + assertThat(V1_15.compareTo(V1_15), is(0)); KubernetesVersion kv2p22 = new KubernetesVersion(2, 22); - assertThat(kv2p22.compareTo(KubernetesVersion.V1_15), greaterThan(0)); - assertThat(kv2p22.compareTo(KubernetesVersion.V1_21), greaterThan(0)); + assertThat(kv2p22.compareTo(V1_5), greaterThan(0)); + assertThat(kv2p22.compareTo(V1_15), greaterThan(0)); } @Test public void versionsEqualTest() { - KubernetesVersion kv1p25 = new KubernetesVersion(1, 25); - assertThat(kv1p25, is(KubernetesVersion.V1_25)); + KubernetesVersion kv1p25 = new KubernetesVersion(1, 15); + assertThat(kv1p25, is(V1_15)); } } diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/PlatformFeaturesAvailabilityTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/PlatformFeaturesAvailabilityTest.java index 950dbfa179e..d544ccb142d 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/PlatformFeaturesAvailabilityTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/PlatformFeaturesAvailabilityTest.java @@ -51,16 +51,17 @@ public class PlatformFeaturesAvailabilityTest { public void testVersionDetectionOpenShift(Vertx vertx, VertxTestContext context) throws InterruptedException, ExecutionException { String version = """ { - "major": "1", - "minor": "21", - "gitVersion": "v1.21.1", + "major": "%s", + "minor": "%S", + "gitVersion": "v%s.%s.1", "gitCommit": "c4d752765b3bbac2237bf87cf0b1c2e307844666", "gitTreeState": "clean", "buildDate": "2020-12-18T12:00:47Z", "goVersion": "go1.15.5", "compiler": "gc", "platform": "linux/amd64" - }"""; + }""" + .formatted(KubernetesVersion.MINIMAL_SUPPORTED_MAJOR, KubernetesVersion.MINIMAL_SUPPORTED_MINOR, KubernetesVersion.MINIMAL_SUPPORTED_MAJOR, KubernetesVersion.MINIMAL_SUPPORTED_MINOR); startMockApi(vertx, version, Collections.emptyList()); @@ -69,7 +70,7 @@ public void testVersionDetectionOpenShift(Vertx vertx, VertxTestContext context) Checkpoint a = context.checkpoint(); PlatformFeaturesAvailability.create(vertx, client).onComplete(context.succeeding(pfa -> context.verify(() -> { - assertThat("Versions are not equal", pfa.getKubernetesVersion(), is(KubernetesVersion.V1_21)); + assertThat("Versions are not equal", pfa.getKubernetesVersion(), is(KubernetesVersion.MINIMAL_SUPPORTED_VERSION)); a.flag(); }))); } @@ -78,16 +79,17 @@ public void testVersionDetectionOpenShift(Vertx vertx, VertxTestContext context) public void testVersionDetectionMinikube(Vertx vertx, VertxTestContext context) throws InterruptedException, ExecutionException { String version = """ { - "major": "1", - "minor": "21", - "gitVersion": "v1.21.1", + "major": "%s", + "minor": "%s", + "gitVersion": "v%s.%s.1", "gitCommit": "c4d752765b3bbac2237bf87cf0b1c2e307844666", "gitTreeState": "clean", "buildDate": "2020-12-18T12:09:25Z", "goVersion": "go1.15.5", "compiler": "gc", "platform": "linux/amd64" - }"""; + }""" + .formatted(KubernetesVersion.MINIMAL_SUPPORTED_MAJOR, KubernetesVersion.MINIMAL_SUPPORTED_MINOR, KubernetesVersion.MINIMAL_SUPPORTED_MAJOR, KubernetesVersion.MINIMAL_SUPPORTED_MINOR); startMockApi(vertx, version, Collections.emptyList()); @@ -96,7 +98,7 @@ public void testVersionDetectionMinikube(Vertx vertx, VertxTestContext context) Checkpoint async = context.checkpoint(); PlatformFeaturesAvailability.create(vertx, client).onComplete(context.succeeding(pfa -> context.verify(() -> { - assertThat("Versions are not equal", pfa.getKubernetesVersion(), is(KubernetesVersion.V1_21)); + assertThat("Versions are not equal", pfa.getKubernetesVersion(), is(KubernetesVersion.MINIMAL_SUPPORTED_VERSION)); async.flag(); }))); } diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaAssemblyOperatorTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaAssemblyOperatorTest.java index a269d3f5ea5..1ca649e5aa9 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaAssemblyOperatorTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaAssemblyOperatorTest.java @@ -157,7 +157,7 @@ public class KafkaAssemblyOperatorTest { private final String differentMetricsCMName = "metrics-cm-2"; private final ConfigMap metricsCM = io.strimzi.operator.cluster.TestUtils.getJmxMetricsCm(metricsCmJson, metricsCMName, "metrics-config.yml"); - private final KubernetesVersion kubernetesVersion = KubernetesVersion.V1_21; + private final KubernetesVersion kubernetesVersion = KubernetesVersion.MINIMAL_SUPPORTED_VERSION; private static boolean openShift; private static boolean metrics; diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaBridgeAssemblyOperatorTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaBridgeAssemblyOperatorTest.java index d558506b8d9..0f8e72a0860 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaBridgeAssemblyOperatorTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaBridgeAssemblyOperatorTest.java @@ -97,7 +97,7 @@ public class KafkaBridgeAssemblyOperatorTest { private static final KafkaBridgeHttpConfig KAFKA_BRIDGE_HTTP_SPEC = new KafkaBridgeHttpConfig(); private final String image = "kafka-bridge:latest"; - private final KubernetesVersion kubernetesVersion = KubernetesVersion.V1_21; + private final KubernetesVersion kubernetesVersion = KubernetesVersion.MINIMAL_SUPPORTED_VERSION; @BeforeAll public static void before() { diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectAssemblyOperatorPodSetTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectAssemblyOperatorPodSetTest.java index 64281e18688..bf192747e1f 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectAssemblyOperatorPodSetTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectAssemblyOperatorPodSetTest.java @@ -105,7 +105,7 @@ public class KafkaConnectAssemblyOperatorPodSetTest { private final static String COMPONENT_NAME = NAME + "-connect"; private final static String NAMESPACE = "my-namespace"; private static final KafkaVersion.Lookup VERSIONS = KafkaVersionTestUtils.getKafkaVersionLookup(); - private static final KubernetesVersion KUBERNETES_VERSION = KubernetesVersion.V1_26; + private static final KubernetesVersion KUBERNETES_VERSION = KubernetesVersion.MINIMAL_SUPPORTED_VERSION; private static final Reconciliation RECONCILIATION = new Reconciliation("test", "KafkaConnect", NAMESPACE, NAME); private static final SharedEnvironmentProvider SHARED_ENV_PROVIDER = new MockSharedEnvironmentProvider(); diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectorIT.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectorIT.java index 8081e3d03ef..e1b24d22b58 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectorIT.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaConnectorIT.java @@ -120,7 +120,7 @@ public void afterEach() { public void testConnectorNotUpdatedWhenConfigUnchanged(VertxTestContext context) { KafkaConnectApiImpl connectClient = new KafkaConnectApiImpl(vertx); - PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.V1_21); + PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); String namespace = "ns"; String connectorName = "my-connector"; @@ -189,7 +189,7 @@ public void testConnectorNotUpdatedWhenConfigUnchanged(VertxTestContext context) public void testConnectorResourceNotReadyWhenConnectorFailed(VertxTestContext context) { KafkaConnectApiImpl connectClient = new KafkaConnectApiImpl(vertx); - PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.V1_21); + PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); String namespace = "ns"; String connectorName = "my-connector-2"; @@ -238,7 +238,7 @@ public void testConnectorResourceNotReadyWhenConnectorFailed(VertxTestContext co public void testConnectorResourceNotReadyWhenTaskFailed(VertxTestContext context) { KafkaConnectApiImpl connectClient = new KafkaConnectApiImpl(vertx); - PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.V1_21); + PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); String namespace = "ns"; String connectorName = "my-connector-3"; @@ -298,7 +298,7 @@ public void testConnectorResourceNotReadyWhenTaskFailed(VertxTestContext context public void testConnectorIsAutoRestarted(VertxTestContext context) { KafkaConnectApiImpl connectClient = new KafkaConnectApiImpl(vertx); - PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.V1_21); + PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); String namespace = "ns"; String connectorName = "my-connector-4"; @@ -347,7 +347,7 @@ public void testConnectorIsAutoRestarted(VertxTestContext context) { public void testTaskIsAutoRestarted(VertxTestContext context) { KafkaConnectApiImpl connectClient = new KafkaConnectApiImpl(vertx); - PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.V1_21); + PlatformFeaturesAvailability pfa = new PlatformFeaturesAvailability(false, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); String namespace = "ns"; String connectorName = "my-connector-5"; diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMaker2AssemblyOperatorPodSetTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMaker2AssemblyOperatorPodSetTest.java index 3e76e8ebb0d..73adcfce824 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMaker2AssemblyOperatorPodSetTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMaker2AssemblyOperatorPodSetTest.java @@ -98,7 +98,7 @@ public class KafkaMirrorMaker2AssemblyOperatorPodSetTest { private final static String COMPONENT_NAME = NAME + "-mirrormaker2"; private final static String NAMESPACE = "my-namespace"; private static final KafkaVersion.Lookup VERSIONS = KafkaVersionTestUtils.getKafkaVersionLookup(); - private static final KubernetesVersion KUBERNETES_VERSION = KubernetesVersion.V1_26; + private static final KubernetesVersion KUBERNETES_VERSION = KubernetesVersion.MINIMAL_SUPPORTED_VERSION; private static final Reconciliation RECONCILIATION = new Reconciliation("test", "KafkaMirrorMaker2", NAMESPACE, NAME); private static final SharedEnvironmentProvider SHARED_ENV_PROVIDER = new MockSharedEnvironmentProvider(); diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMakerAssemblyOperatorTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMakerAssemblyOperatorTest.java index bc03973b0ff..23a3aee1f69 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMakerAssemblyOperatorTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMakerAssemblyOperatorTest.java @@ -93,7 +93,7 @@ public class KafkaMirrorMakerAssemblyOperatorTest { private final String include = ".*"; private final String image = "my-image:latest"; - private final KubernetesVersion kubernetesVersion = KubernetesVersion.V1_21; + private final KubernetesVersion kubernetesVersion = KubernetesVersion.MINIMAL_SUPPORTED_VERSION; @BeforeAll public static void before() { diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerStatusTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerStatusTest.java index a1c0b113837..2aef525a717 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerStatusTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerStatusTest.java @@ -68,7 +68,7 @@ public class KafkaReconcilerStatusTest { private final static String NAMESPACE = "testns"; private final static String CLUSTER_NAME = "testkafka"; private final static KafkaVersion.Lookup VERSIONS = KafkaVersionTestUtils.getKafkaVersionLookup(); - private final static PlatformFeaturesAvailability PFA = new PlatformFeaturesAvailability(true, KubernetesVersion.V1_22); + private final static PlatformFeaturesAvailability PFA = new PlatformFeaturesAvailability(true, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); private final static KafkaVersionChange VERSION_CHANGE = new KafkaVersionChange( VERSIONS.defaultVersion(), VERSIONS.defaultVersion(), diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerUpgradeDowngradeTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerUpgradeDowngradeTest.java index aabab2ce0fd..2abfed215e0 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerUpgradeDowngradeTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaReconcilerUpgradeDowngradeTest.java @@ -59,7 +59,7 @@ public class KafkaReconcilerUpgradeDowngradeTest { private final static String NAMESPACE = "testns"; private final static String CLUSTER_NAME = "testkafka"; private final static KafkaVersion.Lookup VERSIONS = KafkaVersionTestUtils.getKafkaVersionLookup(); - private final static PlatformFeaturesAvailability PFA = new PlatformFeaturesAvailability(true, KubernetesVersion.V1_22); + private final static PlatformFeaturesAvailability PFA = new PlatformFeaturesAvailability(true, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); private final static ClusterOperatorConfig CO_CONFIG = ResourceUtils.dummyClusterOperatorConfig(); private final static ClusterCa CLUSTER_CA = new ClusterCa( Reconciliation.DUMMY_RECONCILIATION, diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/resource/events/KubernetesRestartEventsMockTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/resource/events/KubernetesRestartEventsMockTest.java index ae38c8f427e..b471b37965c 100644 --- a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/resource/events/KubernetesRestartEventsMockTest.java +++ b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/resource/events/KubernetesRestartEventsMockTest.java @@ -116,7 +116,7 @@ public class KubernetesRestartEventsMockTest { private final static Kafka KAFKA = kafka(); private final static KafkaVersion.Lookup VERSIONS = KafkaVersionTestUtils.getKafkaVersionLookup(); - private final static PlatformFeaturesAvailability PFA = new PlatformFeaturesAvailability(false, KubernetesVersion.V1_22); + private final static PlatformFeaturesAvailability PFA = new PlatformFeaturesAvailability(false, KubernetesVersion.MINIMAL_SUPPORTED_VERSION); private final static KafkaVersionChange VERSION_CHANGE = new KafkaVersionChange( VERSIONS.defaultVersion(), VERSIONS.defaultVersion(), diff --git a/documentation/shared/attributes.adoc b/documentation/shared/attributes.adoc index 95f679efd44..d6eabd7c340 100644 --- a/documentation/shared/attributes.adoc +++ b/documentation/shared/attributes.adoc @@ -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.21 and later +:KubernetesVersion: 1.23 and later // Kafka upgrade attributes used in kafka upgrades section :DefaultKafkaVersion: 3.6.1 diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md b/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md index 7707d0f27fc..e085abaa367 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md @@ -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 !!!** -From Strimzi 0.36 on, we support only Kubernetes 1.21 and newer. -Kubernetes versions 1.19 and 1.20 are no longer supported. +From Strimzi 0.40 on, we support only Kubernetes 1.23 and newer. +Kubernetes versions 1.21 and 1.22 are no longer supported. ## Introduction @@ -59,7 +59,7 @@ Strimzi is licensed under the [Apache License, Version 2.0](https://github.com/s ## Prerequisites -- Kubernetes 1.21+ +- Kubernetes 1.23+ ## Installing the Chart diff --git a/systemtest/scripts/results_info.sh b/systemtest/scripts/results_info.sh index bea8bea9e1b..079d4dd835b 100755 --- a/systemtest/scripts/results_info.sh +++ b/systemtest/scripts/results_info.sh @@ -4,7 +4,7 @@ RESULTS_PATH=${1} TEST_CASE=${2} TEST_PROFILE=${3} BUILD_ID=${4:-0} -KUBE_VERSION=${5:-1.21.0} +KUBE_VERSION=${5:-1.23.0} TEST_ONLY=${6:-''} TEST_COUNT_RUNNING_IN_PARALLEL=${7:-''} EXCLUDED_GROUPS=${8:-''}