Use v3alpha1

rjeberhard · rjeberhard · commit bc22aa540675 · 2019-03-05T10:12:54.000-05:00
diff --git a/docs/domains/Domain.json b/docs/domains/Domain.json
@@ -526,7 +526,7 @@
       "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
     },
     "apiVersion": {
-      "description": "The API version for the Domain. Must be \u0027weblogic.oracle/v3\u0027.",
+      "description": "The API version for the Domain.",
       "type": "string"
     },
     "kind": {
diff --git a/docs/domains/Domain.md b/docs/domains/Domain.md
@@ -4,7 +4,7 @@ Domain represents a WebLogic domain and how it will be realized in the Kubernete
 
 | Name | Type | Description |
 | --- | --- | --- |
-| apiVersion | string | The API version for the Domain. Must be 'weblogic.oracle/v3'. |
+| apiVersion | string | The API version for the Domain. |
 | kind | string | The type of resource. Must be 'Domain'. |
 | metadata | [Object Meta](k8s1.9.0.md#object-meta) | The domain meta-data. Must include the name and namespace. |
 | spec | [Domain Spec](#domain-spec) | The specification of the domain. Required |
diff --git a/docs/domains/index.html b/docs/domains/index.html
@@ -845,7 +845,7 @@
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
         },
         "apiVersion": {
-          "description": "The API version for the Domain. Must be \u0027weblogic.oracle/v3\u0027.",
+          "description": "The API version for the Domain.",
           "type": "string"
         },
         "kind": {
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java
@@ -369,7 +369,7 @@ private void initialize(String yamlFile) throws Exception {
     } else {
       operatorMap.put(
           "image",
-          "wlsldi-v3.docker.oraclecorp.com/weblogic-operator"
+          "wlsldi-v2.docker.oraclecorp.com/weblogic-operator"
               + ":test_"
               + BaseTest.getBranchName().replaceAll("/", "_"));
     }
diff --git a/integration-tests/src/test/resources/charts/ingress-per-domain/templates/traefik-ingress.yaml b/integration-tests/src/test/resources/charts/ingress-per-domain/templates/traefik-ingress.yaml
@@ -9,7 +9,7 @@ metadata:
   name: {{ .Values.wlsDomain.domainUID }}-traefik
   namespace: {{ .Release.Namespace }}
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
 spec:
   annotations:
     kubernetes.io/ingress.class: traefik
diff --git a/integration-tests/src/test/resources/charts/ingress-per-domain/templates/voyager-ingress.yaml b/integration-tests/src/test/resources/charts/ingress-per-domain/templates/voyager-ingress.yaml
@@ -9,7 +9,7 @@ metadata:
   name: {{ .Values.wlsDomain.domainUID }}-voyager
   namespace: {{ .Release.Namespace }}
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
   annotations:
     ingress.appscode.com/type: 'NodePort'
     ingress.appscode.com/stats: 'true'
@@ -31,7 +31,7 @@ metadata:
   name: {{ .Values.wlsDomain.domainUID }}-voyager-stats
   namespace: {{ .Release.Namespace }}
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
 spec:
   type: NodePort
   ports:
diff --git a/kubernetes/samples/charts/apache-webtier/templates/cluster-role-binding.yaml b/kubernetes/samples/charts/apache-webtier/templates/cluster-role-binding.yaml
@@ -7,7 +7,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: {{ template "apache.fullname" . }}
   labels:
-    weblogic.resourceVersion: "loadbalancer-v3"
+    weblogic.resourceVersion: "loadbalancer-v2"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/kubernetes/samples/charts/apache-webtier/templates/cluster-role.yaml b/kubernetes/samples/charts/apache-webtier/templates/cluster-role.yaml
@@ -7,7 +7,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: {{ template "apache.fullname" . }}
   labels:
-    weblogic.resourceVersion: "loadbalancer-v3"
+    weblogic.resourceVersion: "loadbalancer-v2"
 rules:
   - apiGroups:
       - ""
diff --git a/kubernetes/samples/charts/apache-webtier/templates/deployment.yaml b/kubernetes/samples/charts/apache-webtier/templates/deployment.yaml
@@ -8,18 +8,18 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "apache.fullname" . }}
-    weblogic.resourceVersion: "loadbalancer-v3"
+    weblogic.resourceVersion: "loadbalancer-v2"
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: {{ template "apache.fullname" . }}
-      weblogic.resourceVersion: "loadbalancer-v3"
+      weblogic.resourceVersion: "loadbalancer-v2"
   template:
     metadata:
       labels:
         app: {{ template "apache.fullname" . }}
-        weblogic.resourceVersion: "loadbalancer-v3"
+        weblogic.resourceVersion: "loadbalancer-v2"
     spec:
       serviceAccountName: {{ template "apache.serviceAccountName" . }}
       terminationGracePeriodSeconds: 60
diff --git a/kubernetes/samples/charts/apache-webtier/templates/secret.yaml b/kubernetes/samples/charts/apache-webtier/templates/secret.yaml
@@ -8,7 +8,7 @@ metadata:
   name: {{ template "apache.fullname" . }}-cert
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    weblogic.resourceVersion: "loadbalancer-v3"
+    weblogic.resourceVersion: "loadbalancer-v2"
 type: Opaque
 data:
   tls.crt: {{ .Values.customCert | quote }}
diff --git a/kubernetes/samples/charts/apache-webtier/templates/service-account.yaml b/kubernetes/samples/charts/apache-webtier/templates/service-account.yaml
@@ -7,4 +7,4 @@ metadata:
   name: {{ template "apache.serviceAccountName" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    weblogic.resourceVersion: "loadbalancer-v3"
+    weblogic.resourceVersion: "loadbalancer-v2"
diff --git a/kubernetes/samples/charts/apache-webtier/templates/service.yaml b/kubernetes/samples/charts/apache-webtier/templates/service.yaml
@@ -7,12 +7,12 @@ metadata:
   name: {{ template "apache.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    weblogic.resourceVersion: "loadbalancer-v3"
+    weblogic.resourceVersion: "loadbalancer-v2"
 spec:
   type: NodePort
   selector:
     app: {{ template "apache.fullname" . }}
-    weblogic.resourceVersion: "loadbalancer-v3"
+    weblogic.resourceVersion: "loadbalancer-v2"
   ports:
     - port: 80
       nodePort: {{ .Values.httpNodePort }}
diff --git a/kubernetes/samples/charts/ingress-per-domain/templates/traefik-ingress.yaml b/kubernetes/samples/charts/ingress-per-domain/templates/traefik-ingress.yaml
@@ -9,7 +9,7 @@ metadata:
   name: {{ .Values.wlsDomain.domainUID }}-traefik
   namespace: {{ .Release.Namespace }}
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
 spec:
   annotations:
     kubernetes.io/ingress.class: traefik
diff --git a/kubernetes/samples/charts/ingress-per-domain/templates/voyager-ingress.yaml b/kubernetes/samples/charts/ingress-per-domain/templates/voyager-ingress.yaml
@@ -9,7 +9,7 @@ metadata:
   name: {{ .Values.wlsDomain.domainUID }}-voyager
   namespace: {{ .Release.Namespace }}
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
   annotations:
     ingress.appscode.com/type: 'NodePort'
     ingress.appscode.com/stats: 'true'
@@ -31,7 +31,7 @@ metadata:
   name: {{ .Values.wlsDomain.domainUID }}-voyager-stats
   namespace: {{ .Release.Namespace }}
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
 spec:
   type: NodePort
   ports:
diff --git a/kubernetes/samples/scripts/common/domain-template.yaml b/kubernetes/samples/scripts/common/domain-template.yaml
@@ -4,13 +4,13 @@
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v3"
+apiVersion: "weblogic.oracle/v3alpha1"
 kind: Domain
 metadata:
   name: %DOMAIN_UID%
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
     weblogic.domainUID: %DOMAIN_UID%
 spec:
   # The WebLogic Domain Home
diff --git a/kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/pv-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/pv-template.yaml
@@ -6,7 +6,7 @@ kind: PersistentVolume
 metadata:
   name: %DOMAIN_UID%%SEPARATOR%%BASE_NAME%-pv
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
     %DOMAIN_UID_LABEL_PREFIX%weblogic.domainUID: %DOMAIN_UID%
 spec:
   storageClassName: %DOMAIN_UID%%SEPARATOR%%BASE_NAME%-storage-class
diff --git a/kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/pvc-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/pvc-template.yaml
@@ -7,7 +7,7 @@ metadata:
   name: %DOMAIN_UID%%SEPARATOR%%BASE_NAME%-pvc
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
     %DOMAIN_UID_LABEL_PREFIX%weblogic.domainUID: %DOMAIN_UID%
 spec:
   storageClassName: %DOMAIN_UID%%SEPARATOR%%BASE_NAME%-storage-class
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-job-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-job-template.yaml
@@ -9,7 +9,7 @@ spec:
   template:
     metadata:
       labels:
-        weblogic.resourceVersion: domain-v3
+        weblogic.resourceVersion: domain-v2
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         app: %DOMAIN_UID%-create-weblogic-sample-domain-job
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/delete-domain-job-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/delete-domain-job-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: %DOMAIN_UID%-delete-weblogic-sample-domain-job-cm
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 data:
@@ -27,7 +27,7 @@ spec:
   template:
     metadata:
       labels:
-        weblogic.resourceVersion: domain-v3
+        weblogic.resourceVersion: domain-v2
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         app: %DOMAIN_UID%-delete-weblogic-sample-domain-job
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml b/kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml
@@ -13,7 +13,7 @@ metadata:
   # Update this with the namespace your domain will run in:
   namespace: weblogic
   labels:
-    weblogic.resourceVersion: domain-v3
+    weblogic.resourceVersion: domain-v2
     # Update this with the `domainUID` of your domain:
     weblogic.domainUID: domain1
 
diff --git a/model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java b/model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java
@@ -19,17 +19,17 @@ public interface KubernetesConstants {
   String CRD_NAME = "domains.weblogic.oracle";
   String DOMAIN = "Domain";
   String DOMAIN_GROUP = "weblogic.oracle";
-  String DOMAIN_VERSION = "v3";
   String DOMAIN_PLURAL = "domains";
   String DOMAIN_SINGULAR = "domain";
   String DOMAIN_SHORT = "dom";
+  String DOMAIN_VERSION = "v3alpha1";
+  String[] DOMAIN_ALTERNATE_VERSIONS = {"v2"};
 
   boolean DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG = true;
 
   String CONTAINER_NAME = "weblogic-server";
 
   String DOMAIN_CONFIG_MAP_NAME = "weblogic-domain-cm";
   String DOMAIN_DEBUG_CONFIG_MAP_SUFFIX = "-weblogic-domain-debug-cm";
-  String API_VERSION_ORACLE_V2 = "weblogic.oracle/v3";
   String INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX = "-weblogic-domain-introspect-cm";
 }
diff --git a/model/src/main/java/oracle/kubernetes/operator/VersionConstants.java b/model/src/main/java/oracle/kubernetes/operator/VersionConstants.java
@@ -6,10 +6,10 @@
 
 public interface VersionConstants {
   String OPERATOR_V1 = "operator-v1";
-  String OPERATOR_V2 = "operator-v3";
+  String OPERATOR_V2 = "operator-v2";
   String DEFAULT_OPERATOR_VERSION = OPERATOR_V2;
   String DOMAIN_V1 = "domain-v1";
-  String DOMAIN_V2 = "domain-v3";
+  String DOMAIN_V2 = "domain-v2";
   String DEFAULT_DOMAIN_VERSION = DOMAIN_V2;
   String VOYAGER_LOAD_BALANCER_V1 = "voyager-load-balancer-v1";
   String APACHE_LOAD_BALANCER_V1 = "apache-load-balancer-v1";
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v3/Domain.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v3/Domain.java
@@ -37,7 +37,7 @@ public class Domain {
    */
   @SerializedName("apiVersion")
   @Expose
-  @Description("The API version for the Domain. Must be 'weblogic.oracle/v3'.")
+  @Description("The API version for the Domain.")
   private String apiVersion;
   /**
    * Kind is a string value representing the REST resource this object represents. Servers may infer
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v3/DomainV2Configurator.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v3/DomainV2Configurator.java
@@ -35,7 +35,8 @@ public DomainV2Configurator() {}
 
   private void setApiVersion(Domain domain) {
     domain.getMetadata().putLabelsItem(RESOURCE_VERSION_LABEL, DOMAIN_V2);
-    domain.setApiVersion(KubernetesConstants.API_VERSION_ORACLE_V2);
+    domain.setApiVersion(
+        KubernetesConstants.DOMAIN_GROUP + "/" + KubernetesConstants.DOMAIN_VERSION);
   }
 
   @Override
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/CRDHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/CRDHelper.java
@@ -17,10 +17,11 @@
 import io.kubernetes.client.models.V1beta1CustomResourceSubresources;
 import io.kubernetes.client.models.V1beta1CustomResourceValidation;
 import io.kubernetes.client.models.V1beta1JSONSchemaProps;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 import oracle.kubernetes.json.SchemaGenerator;
 import oracle.kubernetes.operator.KubernetesConstants;
 import oracle.kubernetes.operator.LabelConstants;
@@ -117,12 +118,16 @@ static V1beta1CustomResourceDefinitionSpec createSpec(KubernetesVersion version)
     }
 
     static List<V1beta1CustomResourceDefinitionVersion> getCRDVersions() {
-      return Arrays.asList(
+      List<V1beta1CustomResourceDefinitionVersion> versions =
+          Arrays.stream(KubernetesConstants.DOMAIN_ALTERNATE_VERSIONS)
+              .map(e -> new V1beta1CustomResourceDefinitionVersion().name(e).served(true))
+              .collect(Collectors.toList());
+      versions.add(
           new V1beta1CustomResourceDefinitionVersion()
               .name(KubernetesConstants.DOMAIN_VERSION)
               .served(true)
-              .storage(true),
-          new V1beta1CustomResourceDefinitionVersion().name("v3").served(true));
+              .storage(true));
+      return versions;
     }
 
     static V1beta1CustomResourceDefinitionNames getCRDNames() {
@@ -261,23 +266,50 @@ static class CRDComparatorImpl implements CRDComparator {
     @Override
     public boolean isOutdatedCRD(
         V1beta1CustomResourceDefinition actual, V1beta1CustomResourceDefinition expected) {
-      // For later versions of the product, we will want to do a complete comparison
-      // of the version, supporting alpha and beta variants, e.g. v3alpha1 format, but
-      // for now we just need to replace v1.
-      return actual.getSpec().getVersion().equals("v1")
-          || (actual.getSpec().getVersion().equals("v3")
+      ResourceVersion expectedMax = maximum(getVersions(expected));
+      ResourceVersion actualMax = maximum(getVersions(actual));
+
+      return compareMaximums(expectedMax, actualMax) > 0
+          || (new ResourceVersion(KubernetesConstants.DOMAIN_VERSION).equals(actualMax)
               && (getSchemaValidation(actual) == null
                   || !getSchemaValidation(expected).equals(getSchemaValidation(actual))
                   || !getSchemaSubresources(expected).equals(getSchemaSubresources(actual))));
       // Similarly, we will later want to check:
       // VersionHelper.matchesResourceVersion(existingCRD.getMetadata(), DEFAULT_OPERATOR_VERSION)
     }
 
-    // https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definition-versioning/#version-priority
-    static Comparator<String> compareVersions() {
-      return (left, right) -> {
+    private List<ResourceVersion> getVersions(V1beta1CustomResourceDefinition crd) {
+      List<ResourceVersion> versions = new ArrayList<>();
+      String v = crd.getSpec().getVersion();
+      if (v != null) {
+        versions.add(new ResourceVersion(v));
+      }
+      List<V1beta1CustomResourceDefinitionVersion> vs = crd.getSpec().getVersions();
+      if (vs != null) {
+        for (V1beta1CustomResourceDefinitionVersion vi : vs) {
+          versions.add(new ResourceVersion(vi.getName()));
+        }
+      }
+
+      return versions;
+    }
+
+    private ResourceVersion maximum(List<ResourceVersion> versions) {
+      if (versions.isEmpty()) {
+        return null;
+      }
+      return Collections.max(versions);
+    }
+
+    private int compareMaximums(ResourceVersion left, ResourceVersion right) {
+      if (left == null) {
+        return right == null ? 0 : -1;
+      }
+      if (right == null) {
+        return 1;
+      }
 
-      };
+      return left.compareTo(right);
     }
 
     private V1beta1JSONSchemaProps getSchemaValidation(V1beta1CustomResourceDefinition crd) {
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/ResourceVersion.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/ResourceVersion.java
diff --git a/operator/src/test/java/oracle/kubernetes/operator/builders/WatchBuilderTest.java b/operator/src/test/java/oracle/kubernetes/operator/builders/WatchBuilderTest.java
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/CRDHelperTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/CRDHelperTest.java
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/CallBuilderTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/CallBuilderTest.java
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/ResourceVersionTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/ResourceVersionTest.java

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ private void initialize(String yamlFile) throws Exception {`
`369`	`369`	`} else {`
`370`	`370`	`operatorMap.put(`
`371`	`371`	`"image",`
`372`		`- "wlsldi-v3.docker.oraclecorp.com/weblogic-operator"`
	`372`	`+ "wlsldi-v2.docker.oraclecorp.com/weblogic-operator"`
`373`	`373`	`+ ":test_"`
`374`	`374`	`+ BaseTest.getBranchName().replaceAll("/", "_"));`
`375`	`375`	`}`