Merge branch 'OWLS-108164' into 'release/4.0'

OWLS-108164 - Changes to convert cluster name to legal DNS 1123 name in Domain on PV and other samples.

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

Author: ddsharpe

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

@@ -90,7 +90,7 @@ spec:
   # must describe a cluster that already exists in the WebLogic domain
   # configuration.
   clusters:
-  - name: %DOMAIN_UID%-%CLUSTER_NAME%
+  - name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
 
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
@@ -100,7 +100,7 @@ spec:
 apiVersion: weblogic.oracle/v1
 kind: Cluster
 metadata:
-  name: %DOMAIN_UID%-%CLUSTER_NAME%
+  name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
   namespace: %NAMESPACE%
 spec:
   clusterName: %CLUSTER_NAME%

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

@@ -94,7 +94,7 @@ spec:
   # must describe a cluster that already exists in the WebLogic domain
   # configuration.
   clusters:
-  - name: %DOMAIN_UID%-%CLUSTER_NAME%
+  - name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
 
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
@@ -104,7 +104,7 @@ spec:
 apiVersion: weblogic.oracle/v1
 kind: Cluster
 metadata:
-  name: %DOMAIN_UID%-%CLUSTER_NAME%
+  name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
   namespace: %NAMESPACE%
 spec:
   clusterName: %CLUSTER_NAME%

kubernetes/samples/scripts/common/utility.sh

@@ -166,6 +166,18 @@ toDNS1123Legal() {
   echo "$val"
 }
 
+#
+# Function to lowercase a value and make it a legal DNS1123 name
+# $1 - value to convert to lowercase
+# $2 - converted retrun value.
+convertToDNS1123Legal() {
+  local name=$1
+  local __result=$2
+  val=$(echo -n $name | tr -c '[:alnum:]._-' '-' | \
+      tr [:upper:] [:lower:] | tr '_' '-' | tr -s "-")
+  eval $__result="'$val'"
+}
+
 #
 # Check the state of a persistent volume.
 # $1 - name of volume
@@ -431,6 +443,8 @@ createFiles() {
     # Generate the properties file that will be used when creating the weblogic domain
     echo Generating ${domainPropertiesOutput} from ${domainPropertiesInput}
 
+    # convert the cluster name to a legal DNS subdomain name.
+    convertToDNS1123Legal "${clusterName}" legalDNS1123ClusterName
     cp ${domainPropertiesInput} ${domainPropertiesOutput}
     sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${domainPropertiesOutput}
     sed -i -e "s:%DOMAIN_HOME%:${domainHome}:g" ${domainPropertiesOutput}
@@ -442,6 +456,7 @@ createFiles() {
     sed -i -e "s:%MANAGED_SERVER_NAME_BASE%:${managedServerNameBase}:g" ${domainPropertiesOutput}
     sed -i -e "s:%CONFIGURED_MANAGED_SERVER_COUNT%:${configuredManagedServerCount}:g" ${domainPropertiesOutput}
     sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${domainPropertiesOutput}
+    sed -i -e "s:%LEGAL_DNS_CLUSTER_NAME%:${legalDNS1123ClusterName}:g" ${domainPropertiesOutput}
     sed -i -e "s:%SSL_ENABLED%:${sslEnabled}:g" ${domainPropertiesOutput}
     sed -i -e "s:%PRODUCTION_MODE_ENABLED%:${productionModeEnabled}:g" ${domainPropertiesOutput}
     sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${domainPropertiesOutput}
@@ -500,6 +515,8 @@ createFiles() {
     echo Generating ${createJobOutput}
 
     cp ${createJobInput} ${createJobOutput}
+    # convert the cluster name to a legal DNS subdomain name.
+    convertToDNS1123Legal "${clusterName}" legalDNS1123ClusterName
     sed -i -e "s:%NAMESPACE%:$namespace:g" ${createJobOutput}
     sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${createJobOutput}
     sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${createJobOutput}
@@ -523,6 +540,7 @@ createFiles() {
     sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${createJobOutput}
     sed -i -e "s:%T3_PUBLIC_ADDRESS%:${t3PublicAddress}:g" ${createJobOutput}
     sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${createJobOutput}
+    sed -i -e "s:%LEGAL_DNS_CLUSTER_NAME%:${legalDNS1123ClusterName}:g" ${createJobOutput}
     sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${createJobOutput}
     sed -i -e "s:%DOMAIN_PVC_NAME%:${persistentVolumeClaimName}:g" ${createJobOutput}
     sed -i -e "s:%DOMAIN_ROOT_DIR%:${domainPVMountPath}:g" ${createJobOutput}
@@ -610,11 +628,14 @@ createFiles() {
       exposeAdminNodePortPrefix="${disabledPrefix}"
     fi
 
+    # convert the cluster name to a legal DNS subdomain name.
+    convertToDNS1123Legal "${clusterName}" legalDNS1123ClusterName
     sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
     sed -i -e "s:%EXPOSE_ANY_CHANNEL_PREFIX%:${exposeAnyChannelPrefix}:g" ${dcrOutput}
     sed -i -e "s:%EXPOSE_ADMIN_PORT_PREFIX%:${exposeAdminNodePortPrefix}:g" ${dcrOutput}
     sed -i -e "s:%ADMIN_NODE_PORT%:${adminNodePort}:g" ${dcrOutput}
     sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}
+    sed -i -e "s:%LEGAL_DNS_CLUSTER_NAME%:${legalDNS1123ClusterName}:g" ${dcrOutput}
     sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
     # MII settings are used for model-in-image integration testing
     sed -i -e "s:%MII_PREFIX%:${miiPrefix}:g" ${dcrOutput}
@@ -688,12 +709,17 @@ updateModelFile() {
       exposeAdminNodePortPrefix="${disabledPrefix}"
   fi
 
+  # convert the cluster name to a legal DNS subdomain name.
+  convertToDNS1123Legal "${clusterName}" legalDNS1123ClusterName
+  convertToDNS1123Legal "${clusterName2}" legalDNS1123ClusterName2
   sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${modelFile}
   sed -i -e "s:%EXPOSE_ANY_CHANNEL_PREFIX%:${exposeAnyChannelPrefix}:g" ${modelFile}
   sed -i -e "s:%EXPOSE_ADMIN_PORT_PREFIX%:${exposeAdminNodePortPrefix}:g" ${modelFile}
   sed -i -e "s:%ADMIN_NODE_PORT%:${adminNodePort}:g" ${modelFile}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${modelFile}
+  sed -i -e "s:%LEGAL_DNS_CLUSTER_NAME%:${legalDNS1123ClusterName}:g" ${modelFile}
   sed -i -e "s:%CLUSTER_NAME2%:${clusterName2}:g" ${modelFile}
+  sed -i -e "s:%LEGAL_DNS_CLUSTER_NAME2%:${legalDNS1123ClusterName2}:g" ${modelFile}
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${modelFile}
   # MII settings are used for model-in-image integration testing
   sed -i -e "s:%MII_PREFIX%:${miiPrefix}:g" ${modelFile}

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt_k8s_model_template.yaml

@@ -89,12 +89,12 @@ kubernetes:
       # must describe a cluster that already exists in the WebLogic domain
       # configuration.
       clusters:
-        - name: %DOMAIN_UID%-%CLUSTER_NAME%
+        - name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
 
   # Used by WDT's extractDomainResource script to generate a Cluster resource.
   clusters:
     - metadata:
-        name: %DOMAIN_UID%-%CLUSTER_NAME%
+        name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
         namespace: "%NAMESPACE%"
       spec:
         clusterName: %CLUSTER_NAME%

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt_k8s_model_template_updated.yaml

@@ -89,19 +89,19 @@ kubernetes:
       # must describe a cluster that already exists in the WebLogic domain
       # configuration.
       clusters:
-        - name: %DOMAIN_UID%-%CLUSTER_NAME%
-        - name: %DOMAIN_UID%-%CLUSTER_NAME2%
+        - name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
+        - name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME2%
 
   # Used by WDT's extractDomainResource script to generate Cluster resources.
   clusters:
     - metadata:
-        name: %DOMAIN_UID%-%CLUSTER_NAME%
+        name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME%
         namespace: "%NAMESPACE%"
       spec:
         clusterName: %CLUSTER_NAME%
         replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
     - metadata:
-        name: %DOMAIN_UID%-%CLUSTER_NAME2%
+        name: %DOMAIN_UID%-%LEGAL_DNS_CLUSTER_NAME2%
         namespace: "%NAMESPACE%"
       spec:
         clusterName: %CLUSTER_NAME2%