Adjust required versions

Author: rjeberhard

documentation/3.4/content/userguide/prerequisites/introduction.md

@@ -7,7 +7,7 @@ weight: 2
 
 For the current production release {{< latestVersion >}}:
 
-* Kubernetes 1.19.15+, 1.20.11+, 1.21.10+, 1.22.7+, and 1.23.4+ (check with `kubectl version`).
+* Kubernetes 1.19.15+, 1.20.11+, 1.21.5+, 1.22.5+, and 1.23.4+ (check with `kubectl version`).
 * Flannel networking v0.13.0-amd64 or later (check with `docker images | grep flannel`), Calico networking v3.16.1 or later,
  *or* OpenShift SDN on OpenShift 4.3 systems.
 * Docker 19.03.1+ (check with `docker version`) *or* CRI-O 1.20.2+ (check with `crictl version | grep RuntimeVersion`).

operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesVersion.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.helpers;
@@ -7,7 +7,7 @@
 
 /** Major and minor version of Kubernetes API Server. */
 public class KubernetesVersion extends SemanticVersion {
-  private static final String[] MINIMUM_K8S_VERSIONS = {"1.16.15", "1.17.13", "1.18.10", "1.19.7"};
+  private static final String[] MINIMUM_K8S_VERSIONS = {"1.19.15", "1.20.11", "1.21.5", "1.22.5", "1.23.4"};
   static final KubernetesVersion UNREADABLE = new KubernetesVersion(0, 0);
   private final String version;
 

operator/src/test/java/oracle/kubernetes/operator/helpers/VersionCheckTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.helpers;
@@ -54,9 +54,14 @@ private static Stream<Arguments> getTestParams() {
           Arguments.of(LOG_MSG_TEST, "1", "12", "2", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()),
           Arguments.of(LOG_MSG_TEST, "1", "14", "8", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()),
           Arguments.of(LOG_MSG_TEST, "1", "15", "7", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()),
-          Arguments.of(VERSION_TEST, "1", "16", "15", returnsVersion(1, 16), ignoring(K8S_VERSION_CHECK)),
-          Arguments.of(VERSION_TEST, "1", "17", "13", returnsVersion(1, 17), ignoring(K8S_VERSION_CHECK)),
-          Arguments.of(VERSION_TEST, "1", "18", "10", returnsVersion(1, 18), ignoring(K8S_VERSION_CHECK)),
+          Arguments.of(LOG_MSG_TEST, "1", "16", "15", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()),
+          Arguments.of(LOG_MSG_TEST, "1", "17", "13", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()),
+          Arguments.of(LOG_MSG_TEST, "1", "18", "10", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()),
+          Arguments.of(VERSION_TEST, "1", "19", "15", returnsVersion(1, 19), ignoring(K8S_VERSION_CHECK)),
+          Arguments.of(VERSION_TEST, "1", "20", "13", returnsVersion(1, 20), ignoring(K8S_VERSION_CHECK)),
+          Arguments.of(VERSION_TEST, "1", "21", "10", returnsVersion(1, 21), ignoring(K8S_VERSION_CHECK)),
+          Arguments.of(VERSION_TEST, "1", "22", "5", returnsVersion(1, 22), ignoring(K8S_VERSION_CHECK)),
+          Arguments.of(VERSION_TEST, "1", "23", "7", returnsVersion(1, 23), ignoring(K8S_VERSION_CHECK)),
           Arguments.of(VERSION_TEST, "2", "7", "", returnsVersion(2, 7), ignoring(K8S_VERSION_CHECK)),
           Arguments.of(LOG_MSG_TEST, "2", "", "", containsInfo(K8S_VERSION_CHECK), noIgnores())
         );