Merge branch 'owls-108294-change-domaintype-to-string' into 'main'

Owls 108294 - Change DomainType for a Domain on PV from an enumeration to a String and remove volumeMode.

See merge request weblogic-cloud/weblogic-kubernetes-operator!4322

Author: rjeberhard

documentation/domains/Domain.json

@@ -312,12 +312,8 @@
         },
         "domainType": {
           "default": "JRF",
-          "description": "WebLogic Deploy Tooling domain type. Legal values: WLS, JRF. Defaults to JRF.",
-          "type": "string",
-          "enum": [
-            "WLS",
-            "JRF"
-          ]
+          "description": "WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF.",
+          "type": "string"
         },
         "opss": {
           "description": "Settings for OPSS security.",
@@ -872,10 +868,6 @@
         "resources": {
           "description": "Resources represents the minimum resources the volume should have. More info https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources. ResourceRequirements describes the compute resource requirements.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
-        },
-        "volumeMode": {
-          "description": "VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec.",
-          "type": "string"
         }
       }
     },
@@ -901,10 +893,6 @@
         "capacity": {
           "description": "Capacity is the description of the persistent volume\u0027s resources and capacity. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity",
           "$ref": "#/definitions/Map"
-        },
-        "volumeMode": {
-          "description": "VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec.",
-          "type": "string"
         }
       }
     },

documentation/domains/Domain.md

@@ -305,7 +305,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 | `createIfNotExists` | string | Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain. |
 | `domainCreationConfigMap` | string | Name of a ConfigMap containing the WebLogic Deploy Tooling model. |
 | `domainCreationImages` | Array of [Domain Creation Image](#domain-creation-image) | Domain creation images containing WebLogic Deploy Tooling model, application archive, and WebLogic Deploy Tooling installation files. These files will be used to create the domain during introspection. This feature internally uses a Kubernetes emptyDir volume and Kubernetes init containers to share the files from the additional images  |
-| `domainType` | string | WebLogic Deploy Tooling domain type. Legal values: WLS, JRF. Defaults to JRF. |
+| `domainType` | string | WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF. |
 | `opss` | [Opss](#opss) | Settings for OPSS security. |
 
 ### Persistent Volume
@@ -365,15 +365,13 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 | `nfs` | [NFS Volume Source](k8s1.13.5.md#nfs-volume-source) | nfs represents an NFS mount on the host. Provisioned by an admin. More info:<br/>https://kubernetes.io/docs/concepts/storage/volumes#nfs<br/>Represents an NFS mount that lasts the lifetime of a pod. NFS volumes do not support ownership management or SELinux relabeling. |
 | `persistentVolumeReclaimPolicy` | string | PersistentVolumeReclaimPolicy defines what happens to a persistent volume when released from its claim. Valid options are Retain (default for manually created PersistentVolumes), Delete (default for dynamically provisioned PersistentVolumes), and Recycle (deprecated). Recycle must be supported by the volume plugin underlying this PersistentVolume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#reclaiming   |
 | `storageClassName` | string | StorageClassName is the name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass. |
-| `volumeMode` | string | VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec. |
 
 ### Persistent Volume Claim Spec
 
 | Name | Type | Description |
 | --- | --- | --- |
 | `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Resources represents the minimum resources the volume should have. More info https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources. ResourceRequirements describes the compute resource requirements. |
 | `storageClassName` | string | StorageClassName is the name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass. |
-| `volumeMode` | string | VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec. |
 | `volumeName` | string | VolumeName is the binding reference to the PersistentVolume backing this claim. |
 
 ### WDT Timeouts

kubernetes/crd/domain-crd.yaml

@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    weblogic.sha256: 99585cc6da80c53c308ee386305361ba10859fe959ee7cac31bd526dc30e2a42
+    weblogic.sha256: 178adc9415467dab4785cad74e3af8193024aa29ee181df4b22224fbe7866c0e
   name: domains.weblogic.oracle
 spec:
   group: weblogic.oracle
@@ -251,12 +251,6 @@ spec:
                                 description: 'Capacity is the description of the persistent
                                   volume''s resources and capacity. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
                                 type: object
-                              volumeMode:
-                                description: VolumeMode defines if a volume is intended
-                                  to be used with a formatted filesystem or to remain
-                                  in raw block state. Value of Filesystem is implied
-                                  when not included in spec.
-                                type: string
                             type: object
                         type: object
                       domain:
@@ -317,11 +311,8 @@ spec:
                             type: array
                           domainType:
                             default: JRF
-                            description: 'WebLogic Deploy Tooling domain type. Legal
-                              values: WLS, JRF. Defaults to JRF.'
-                            enum:
-                            - WLS
-                            - JRF
+                            description: 'WebLogic Deploy Tooling domain type. Known
+                              values are: WLS, RestrictedJRF, JRF. Defaults to JRF.'
                             type: string
                           opss:
                             description: Settings for OPSS security.
@@ -478,12 +469,6 @@ spec:
                                       type: string
                                     type: object
                                 type: object
-                              volumeMode:
-                                description: VolumeMode defines if a volume is intended
-                                  to be used with a formatted filesystem or to remain
-                                  in raw block state. Value of Filesystem is implied
-                                  when not included in spec.
-                                type: string
                             type: object
                         type: object
                     type: object

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

@@ -73,5 +73,5 @@ public interface ProcessingConstants {
   String BOUND = "Bound";
   int PVC_WAIT_STATUS_UPDATE_COUNT = 6;
   long DEFAULT_JRF_INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS = 1800L;
-  long DEFAULT_WLS_INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS = 600L;
+  long DEFAULT_WLS_OR_RESTRICTED_JRF_INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS = 600L;
 }

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

@@ -30,4 +30,8 @@ public interface WebLogicConstants {
               FORCE_SUSPENDING_STATE));
 
   String READINESS_PROBE_NOT_READY_STATE = "Not ready: WebLogic Server state: ";
+  String JRF = "JRF";
+  String WLS = "WLS";
+  String RESTRICTED_JRF = "RestrictedJRF";
+
 }

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

@@ -33,7 +33,6 @@
 import oracle.kubernetes.common.helpers.AuxiliaryImageEnvVars;
 import oracle.kubernetes.common.logging.MessageKeys;
 import oracle.kubernetes.common.utils.CommonUtils;
-import oracle.kubernetes.operator.DomainOnPVType;
 import oracle.kubernetes.operator.DomainSourceType;
 import oracle.kubernetes.operator.IntrospectorConfigMapConstants;
 import oracle.kubernetes.operator.KubernetesConstants;
@@ -296,8 +295,8 @@ String getWdtDomainTypeValue() {
     if (getInitializeDomainOnPV().isEmpty()) {
       return getDomain().getWdtDomainType().toString();
     } else {
-      return getInitializeDomainOnPV().map(InitializeDomainOnPV::getDomain).map(DomainOnPV::getDomainType).map(
-          DomainOnPVType::toString).orElse(null);
+      return getInitializeDomainOnPV().map(InitializeDomainOnPV::getDomain).map(DomainOnPV::getDomainType)
+          .orElse(null);
     }
   }
 

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

@@ -24,9 +24,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import oracle.kubernetes.operator.DomainOnPVType;
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.WatchTuning;
+import oracle.kubernetes.operator.WebLogicConstants;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 
@@ -213,16 +213,20 @@ public boolean isRestartEvictedPods() {
   /**
    * Returns the value of introspector job active deadline seconds with default value depending on the context.
    */
-  public long getActiveJobInitialDeadlineSeconds(boolean isInitializeDomainOnPV, DomainOnPVType type) {
+  public long getActiveJobInitialDeadlineSeconds(boolean isInitializeDomainOnPV, String type) {
     long defaultValue = 120L;
-    if (isInitializeDomainOnPV && DomainOnPVType.JRF.equals(type)) {
-      defaultValue = ProcessingConstants.DEFAULT_JRF_INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS;
+    if (isInitializeDomainOnPV && isWlsOrRestrictedJRFDomain(type)) {
+      defaultValue = ProcessingConstants.DEFAULT_WLS_OR_RESTRICTED_JRF_INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS;
     } else if (isInitializeDomainOnPV) {
-      defaultValue = ProcessingConstants.DEFAULT_WLS_INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS;
+      defaultValue = ProcessingConstants.DEFAULT_JRF_INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS;
     }
     return getParameter(INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS, defaultValue);
   }
 
+  private boolean isWlsOrRestrictedJRFDomain(String type) {
+    return WebLogicConstants.WLS.equals(type) || WebLogicConstants.RESTRICTED_JRF.equals(type);
+  }
+
   public long getActiveDeadlineIncrementSeconds() {
     return getParameter(INTROSPECTOR_JOB_DEADLINE_INCREMENT_SECONDS, DEFAULT_ACTIVE_DEADLINE_INCREMENT_SECONDS);
   }

operator/src/main/java/oracle/kubernetes/operator/tuning/TuningParameters.java

@@ -8,22 +8,25 @@
 import com.google.gson.annotations.SerializedName;
 import oracle.kubernetes.json.Default;
 import oracle.kubernetes.json.Description;
-import oracle.kubernetes.operator.DomainOnPVType;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import static oracle.kubernetes.operator.WebLogicConstants.JRF;
+import static oracle.kubernetes.operator.WebLogicConstants.RESTRICTED_JRF;
+import static oracle.kubernetes.operator.WebLogicConstants.WLS;
+
 public class DomainOnPV {
 
   @Description("Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains)."
       + " Legal values: domain, domainAndRCU. Defaults to domain.")
   @Default(strDefault = "domain")
   private CreateIfNotExists createIfNotExists = CreateIfNotExists.DOMAIN;
 
-  @Description("WebLogic Deploy Tooling domain type. Legal values: WLS, JRF. Defaults to JRF.")
+  @Description("WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF.")
   @SerializedName("domainType")
   @Default(strDefault = "JRF")
-  private DomainOnPVType domainType = DomainOnPVType.JRF;
+  private String domainType = JRF;
 
   /**
    * The domain images.
@@ -51,11 +54,24 @@ public DomainOnPV createMode(CreateIfNotExists createIfNotExists) {
     return this;
   }
 
-  public DomainOnPVType getDomainType() {
+  /**
+   * Returns the domain type in upper case for WLS and JRF domains, camel case for RestrictedJRF domain,
+   * and user provided value otherwise.
+   *
+   * @return the domain type in proper case.
+   */
+  public String getDomainType() {
+    if (JRF.equalsIgnoreCase(domainType)) {
+      return JRF;
+    } else if (WLS.equalsIgnoreCase(domainType)) {
+      return WLS;
+    } else if (RESTRICTED_JRF.equalsIgnoreCase(domainType)) {
+      return RESTRICTED_JRF;
+    }
     return domainType;
   }
 
-  public DomainOnPV domainType(DomainOnPVType domainType) {
+  public DomainOnPV domainType(String domainType) {
     this.domainType = domainType;
     return this;
   }

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainOnPV.java

@@ -37,13 +37,13 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import oracle.kubernetes.json.Description;
-import oracle.kubernetes.operator.DomainOnPVType;
 import oracle.kubernetes.operator.DomainSourceType;
 import oracle.kubernetes.operator.KubernetesConstants;
 import oracle.kubernetes.operator.LogHomeLayoutType;
 import oracle.kubernetes.operator.MIINonDynamicChangesMethod;
 import oracle.kubernetes.operator.ModelInImageDomainType;
 import oracle.kubernetes.operator.OverrideDistributionStrategy;
+import oracle.kubernetes.operator.WebLogicConstants;
 import oracle.kubernetes.operator.helpers.LegalNames;
 import oracle.kubernetes.operator.helpers.SecretType;
 import oracle.kubernetes.operator.processing.EffectiveAdminServerSpec;
@@ -57,8 +57,7 @@
 
 import static java.util.stream.Collectors.toSet;
 import static oracle.kubernetes.common.logging.MessageKeys.MAKE_RIGHT_WILL_RETRY;
-import static oracle.kubernetes.operator.DomainOnPVType.JRF;
-import static oracle.kubernetes.operator.DomainOnPVType.WLS;
+import static oracle.kubernetes.operator.WebLogicConstants.JRF;
 import static oracle.kubernetes.operator.helpers.LegalNames.LEGAL_DNS_LABEL_NAME_MAX_LENGTH;
 import static oracle.kubernetes.utils.OperatorUtils.emptyToNull;
 import static oracle.kubernetes.weblogic.domain.model.DomainValidationMessages.clusterInUse;
@@ -564,7 +563,7 @@ public InitializeDomainOnPV getInitializeDomainOnPV() {
    * Returns the domain type when initializeDomainOnPV is specified.
    * @return domain type
    */
-  public DomainOnPVType getInitializeDomainOnPVDomainType() {
+  public String getInitializeDomainOnPVDomainType() {
     return spec.getInitializeDomainOnPVDomainType();
   }
 
@@ -1680,10 +1679,11 @@ private boolean isCreateIfNotExistsDomainAndRCU() {
     }
 
     private boolean isDomainTypeWLS() {
-      return spec.getInitializeDomainOnPVDomainType() == WLS;
+      return WebLogicConstants.WLS.equals(spec.getInitializeDomainOnPVDomainType());
     }
 
     private CreateIfNotExists getCreateIfNotExists() {
+
       return spec.getInitializeDomainOnPV().getDomain().getCreateIfNotExists();
     }