Merge pull request #586 from oracle/update_min_ks8_version

Update min ks8 version

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -34,7 +34,7 @@
 import oracle.kubernetes.operator.helpers.ConfigMapHelper;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.HealthCheckHelper;
-import oracle.kubernetes.operator.helpers.HealthCheckHelper.KubernetesVersion;
+import oracle.kubernetes.operator.helpers.KubernetesVersion;
 import oracle.kubernetes.operator.helpers.ResponseStep;
 import oracle.kubernetes.operator.helpers.ServerKubernetesObjects;
 import oracle.kubernetes.operator.logging.LoggingFacade;

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

@@ -12,7 +12,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.MessageKeys;
@@ -66,8 +65,6 @@ public final class HealthCheckHelper {
   // default namespace or svc account name
   private static final String DEFAULT_NAMESPACE = "default";
 
-  private static final String MINIMUM_K8S_VERSION = "v1.7.5";
-
   static {
     // CRUD resources
     namespaceAccessChecks.put(AuthorizationProxy.Resource.PODS, crudOperations);
@@ -121,7 +118,7 @@ public static void performSecurityChecks(
     AuthorizationProxy ap = new AuthorizationProxy();
     LOGGER.info(MessageKeys.VERIFY_ACCESS_START);
 
-    if (version.major > 1 || version.minor >= 8) {
+    if (version.isRulesReviewSupported()) {
       boolean rulesReviewSuccessful = true;
       V1SelfSubjectRulesReview review = ap.review(ns);
       if (review == null) {
@@ -198,94 +195,33 @@ private static boolean apiGroupMatch(List<String> ruleApiGroups, String apiGroup
     return ruleApiGroups != null && ruleApiGroups.contains(apiGroup);
   }
 
-  /** Major and minor version of Kubernetes API Server */
-  public static class KubernetesVersion {
-    final int major;
-    final int minor;
-
-    public KubernetesVersion(int major, int minor) {
-      this.major = major;
-      this.minor = minor;
-    }
-
-    boolean isPublishNotReadyAddressesSupported() {
-      return this.major > 1 || (this.major == 1 && this.minor >= 8);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      return this == o || o instanceof KubernetesVersion && equals((KubernetesVersion) o);
-    }
-
-    private boolean equals(KubernetesVersion o) {
-      return major == o.major && minor == o.minor;
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(major, minor);
-    }
-
-    @Override
-    public String toString() {
-      return "KubernetesVersion{" + "major=" + major + ", minor=" + minor + '}';
-    }
-  }
-
   /**
    * Verify the k8s version.
    *
    * @return Major and minor version information
    */
   public static KubernetesVersion performK8sVersionCheck() {
-
-    // k8s version must be 1.7.5 or greater
     LOGGER.info(MessageKeys.VERIFY_K8S_MIN_VERSION);
-    boolean k8sMinVersion = true;
-    VersionInfo info;
 
-    int major = 0;
-    int minor = 0;
     try {
-      info = new CallBuilder().readVersionCode();
-
-      String gitVersion = info.getGitVersion();
-      major = Integer.parseInt(info.getMajor());
-      if (major < 1) {
-        k8sMinVersion = false;
-      } else if (major == 1) {
-        // The Minor version can be also 8+
-        String minor_string = info.getMinor();
-        // It will check if it is a number.
-        // If not it will remove the last part of the string in order to have just a number
-        while (!minor_string.chars().allMatch(Character::isDigit)) {
-          minor_string = minor_string.substring(0, minor_string.length() - 1);
-        }
-        minor = Integer.parseInt(minor_string);
-        if (minor < 7) {
-          k8sMinVersion = false;
-        } else if (minor == 7) {
-          // git version is of the form v1.7.5
-          // Check the 3rd part of the version.
-          String[] splitVersion = gitVersion.split("\\.");
-          // issue-36: gitVersion can be not just "v1.7.9" but also values like "v1.7.9+coreos.0"
-          splitVersion = splitVersion[2].split("\\+");
-          if (Integer.parseInt(splitVersion[0]) < 5) {
-            k8sMinVersion = false;
-          }
-        }
-      }
-
-      // Minimum k8s version not satisfied.
-      if (!k8sMinVersion) {
-        LOGGER.warning(MessageKeys.K8S_MIN_VERSION_CHECK_FAILED, MINIMUM_K8S_VERSION, gitVersion);
-      } else {
-        LOGGER.info(MessageKeys.K8S_VERSION_CHECK, gitVersion);
-      }
+      return createAndValidateKubernetesVersion(new CallBuilder().readVersionCode());
     } catch (ApiException ae) {
       LOGGER.warning(MessageKeys.K8S_VERSION_CHECK_FAILURE, ae);
+      return KubernetesVersion.UNREADABLE;
     }
+  }
+
+  private static KubernetesVersion createAndValidateKubernetesVersion(VersionInfo info) {
+    KubernetesVersion kubernetesVersion = new KubernetesVersion(info);
 
-    return new KubernetesVersion(major, minor);
+    if (!kubernetesVersion.isCompatible()) {
+      LOGGER.warning(
+          MessageKeys.K8S_VERSION_TOO_LOW,
+          KubernetesVersion.getSupportedVersions(),
+          kubernetesVersion.asDisplayString());
+    } else {
+      LOGGER.info(MessageKeys.K8S_VERSION_CHECK, kubernetesVersion.asDisplayString());
+    }
+    return kubernetesVersion;
   }
 }

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

@@ -0,0 +1,132 @@
+// Copyright 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helpers;
+
+import io.kubernetes.client.models.VersionInfo;
+import java.util.Objects;
+
+/** Major and minor version of Kubernetes API Server */
+public class KubernetesVersion {
+  static KubernetesVersion UNREADABLE = new KubernetesVersion(0, 0);
+  private static final String[] MINIMUM_K8S_VERSIONS = {"1.10.11", "1.11.5", "1.12.3"};
+
+  private final int major;
+  private final int minor;
+  private final int revision;
+  private final String version;
+
+  KubernetesVersion(int major, int minor) {
+    this.major = major;
+    this.minor = minor;
+    revision = 0;
+    version = String.format("%d.%d.0", major, minor);
+  }
+
+  KubernetesVersion(VersionInfo info) {
+    major = Integer.parseInt(info.getMajor());
+    minor = getNumericPortion(info.getMinor());
+    version = info.getGitVersion();
+    revision = getRevision(asDisplayString());
+  }
+
+  int getMajor() {
+    return major;
+  }
+
+  int getMinor() {
+    return minor;
+  }
+
+  String asDisplayString() {
+    return version;
+  }
+
+  static String getSupportedVersions() {
+    return String.join("+,", MINIMUM_K8S_VERSIONS) + "+";
+  }
+
+  // version is a string like 1.2.3[+abcd]
+  private static int getRevision(String version) {
+    String[] splitVersion = version.split("\\.");
+    return splitVersion.length > 2 ? getNumericPortion(splitVersion[2]) : 0;
+  }
+
+  private static int getNumericPortion(String numericString) {
+    while (!numericString.chars().allMatch(Character::isDigit)) {
+      numericString = numericString.substring(0, numericString.length() - 1);
+    }
+    return numericString.length() == 0 ? 0 : Integer.parseInt(numericString);
+  }
+
+  enum Compatibility {
+    REVISION_OK,
+    REVISION_TOO_LOW,
+    VERSION_HIGHER,
+    VERSION_LOWER
+  }
+
+  boolean isCompatible() {
+    int numHigher = 0;
+    for (String minimumVersion : MINIMUM_K8S_VERSIONS) {
+      switch (getCompatibilityWith(minimumVersion)) {
+        case REVISION_OK:
+          return true;
+        case REVISION_TOO_LOW:
+          return false;
+        case VERSION_HIGHER:
+          numHigher++;
+      }
+    }
+
+    return numHigher == MINIMUM_K8S_VERSIONS.length;
+  }
+
+  private Compatibility getCompatibilityWith(String minimumVersion) {
+    String[] parts = minimumVersion.split("\\.");
+    int allowedMajor = asInteger(parts[0]);
+    if (major < allowedMajor) return Compatibility.VERSION_LOWER;
+    if (major > allowedMajor) return Compatibility.VERSION_HIGHER;
+
+    int allowedMinor = asInteger(parts[1]);
+    if (minor < allowedMinor) return Compatibility.VERSION_LOWER;
+    if (minor > allowedMinor) return Compatibility.VERSION_HIGHER;
+
+    int allowedRevision = asInteger(parts[2]);
+    return (revision >= allowedRevision)
+        ? Compatibility.REVISION_OK
+        : Compatibility.REVISION_TOO_LOW;
+  }
+
+  private int asInteger(String intString) {
+    return Integer.parseInt(intString);
+  }
+
+  boolean isPublishNotReadyAddressesSupported() {
+    return this.major > 1 || (this.major == 1 && this.minor >= 8);
+  }
+
+  boolean isRulesReviewSupported() {
+    return this.major > 1 || (this.major == 1 && this.minor >= 8);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return this == o || o instanceof KubernetesVersion && equals((KubernetesVersion) o);
+  }
+
+  private boolean equals(KubernetesVersion o) {
+    return major == o.major && minor == o.minor;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(major, minor);
+  }
+
+  @Override
+  public String toString() {
+    return "KubernetesVersion{" + "major=" + major + ", minor=" + minor + '}';
+  }
+}

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

@@ -31,7 +31,6 @@
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.VersionConstants;
 import oracle.kubernetes.operator.calls.CallResponse;
-import oracle.kubernetes.operator.helpers.HealthCheckHelper.KubernetesVersion;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.steps.DefaultResponseStep;

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -80,7 +80,7 @@ private MessageKeys() {}
   public static final String APIEXCEPTION_FROM_SUBJECT_ACCESS_REVIEW = "WLSKO-0069";
   public static final String SUBJECT_ACCESS_REVIEW = "WLSKO-0070";
   public static final String REPLICA_MORE_THAN_WLS_SERVERS = "WLSKO-0071";
-  public static final String K8S_MIN_VERSION_CHECK_FAILED = "WLSKO-0073";
+  public static final String K8S_VERSION_TOO_LOW = "WLSKO-0073";
   public static final String VERIFY_K8S_MIN_VERSION = "WLSKO-0074";
   public static final String DOMAIN_UID_UNIQUENESS_FAILED = "WLSKO-0076";
   public static final String PV_NOT_FOUND_FOR_DOMAIN_UID = "WLSKO-0077";

operator/src/main/resources/Operator.properties

@@ -71,7 +71,7 @@ WLSKO-0069=ApiException from SubjectAccessReview: {0}
 WLSKO-0070=SubjectAccessReview: {0}
 WLSKO-0071=Replicas in {0} for cluster {1} is specified with a value of {2} which is larger than the number of configured WLS servers in the cluster: {3}
 WLSKO-0072=
-WLSKO-0073=Kubernetes minimum version check failed. Required minimum version is {0}, but found version {1}
+WLSKO-0073=Kubernetes minimum version check failed. Supported versions are {0}, but found version {1}
 WLSKO-0074=Verifying Kubernetes minimum version
 WLSKO-0075=
 WLSKO-0076=WebLogic domain UID uniqueness check failed. Domain UID {0} exists in domains named {1} and {2}

operator/src/test/java/oracle/kubernetes/operator/ClientFactoryStub.java

@@ -10,9 +10,9 @@
 import oracle.kubernetes.operator.helpers.ClientFactory;
 import oracle.kubernetes.operator.helpers.ClientPool;
 
-class ClientFactoryStub implements ClientFactory {
+public class ClientFactoryStub implements ClientFactory {
 
-  static Memento install() throws NoSuchFieldException {
+  public static Memento install() throws NoSuchFieldException {
     return StaticStubSupport.install(ClientPool.class, "FACTORY", new ClientFactoryStub());
   }