Merge pull request #999 from oracle/crdv3

CRD version v3 in preparation for 2.1 release

Author: rjeberhard

kubernetes/samples/scripts/common/domain-template.yaml

@@ -4,7 +4,7 @@
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v3alpha1"
+apiVersion: "weblogic.oracle/v3"
 kind: Domain
 metadata:
   name: %DOMAIN_UID%

kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml

@@ -5,7 +5,7 @@
 # This is an example of how to define a Domain resource.  Please read through the comments which explain
 # what updates are needed.
 #
-apiVersion: "weblogic.oracle/v3alpha1"
+apiVersion: "weblogic.oracle/v3"
 kind: Domain
 metadata:
   # Update this with the `domainUID` of your domain:

model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

@@ -22,7 +22,7 @@ public interface KubernetesConstants {
   String DOMAIN_PLURAL = "domains";
   String DOMAIN_SINGULAR = "domain";
   String DOMAIN_SHORT = "dom";
-  String DOMAIN_VERSION = "v3alpha1";
+  String DOMAIN_VERSION = "v3";
   String[] DOMAIN_ALTERNATE_VERSIONS = {"v2"};
 
   boolean DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG = true;

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

@@ -366,8 +366,10 @@ private boolean isLaterOrEqual(ResourceVersion base, ResourceVersion version) {
         return "alpha".equals(base.getPrerelease());
       }
 
-      if (version.getPrereleaseVersion() == null && base.getPrereleaseVersion() != null) {
-        return false;
+      if (version.getPrereleaseVersion() == null) {
+        return base.getPrereleaseVersion() == null;
+      } else if (base.getPrereleaseVersion() == null) {
+        return true;
       }
       return version.getPrereleaseVersion() >= base.getPrereleaseVersion();
     }