Merge branch 'master' into feature/dynamic-cluster

Author: alai8

README.md

@@ -202,7 +202,7 @@ <h2 title="oracle.kubernetes">oracle.kubernetes.*</h2>
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/9/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <th class="colSecond" scope="row"><code><a href="oracle/kubernetes/operator/KubernetesConstants.html#DOMAIN_CONFIG_MAP_NAME">DOMAIN_CONFIG_MAP_NAME</a></code></th>
-<td class="colLast"><code>"weblogic-domain-config-map"</code></td>
+<td class="colLast"><code>"weblogic-domain-cm"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="oracle.kubernetes.operator.KubernetesConstants.DOMAIN_GROUP">

docs/apidocs/constant-values.html

@@ -3,10 +3,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: domain-%DOMAIN_UID%-scripts
+  name: %DOMAIN_UID%-create-weblogic-domain-job-cm
   namespace: %NAMESPACE%
   labels:
     weblogic.domainUID: %DOMAIN_UID%
+    weblogic.domainName: %DOMAIN_NAME%
 data:
   utility.sh: |-
     #!/bin/bash
@@ -278,42 +279,43 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: domain-%DOMAIN_UID%-job
+  name: %DOMAIN_UID%-create-weblogic-domain-job
   namespace: %NAMESPACE%
 spec:
   template:
     metadata:
       labels:
-        app: domain-%DOMAIN_UID%-job
         weblogic.domainUID: %DOMAIN_UID%
+        weblogic.domainName: %DOMAIN_NAME%
+        app: %DOMAIN_UID%-create-weblogic-domain-job
     spec:
       restartPolicy: Never
       containers:
-        - name: domain-job
+        - name: create-weblogic-domain-job
           image: store/oracle/weblogic:12.2.1.3
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 7001
           volumeMounts:
           - mountPath: /u01/weblogic
-            name: config-map-scripts
+            name: create-weblogic-domain-job-cm-volume
           - mountPath: /shared
-            name: pv-storage
+            name: weblogic-domain-storage-volume
           - mountPath: /weblogic-operator/secrets
-            name: secrets
+            name: weblogic-credentials-volume
           command: ["/bin/sh"]
           args: ["/u01/weblogic/create-domain-job.sh"]
           env:
             - name: SHARED_PATH
               value: "/shared"
       volumes:
-        - name: config-map-scripts
+        - name: create-weblogic-domain-job-cm-volume
           configMap:
-            name: domain-%DOMAIN_UID%-scripts
-        - name: pv-storage
+            name: %DOMAIN_UID%-create-weblogic-domain-job-cm
+        - name: weblogic-domain-storage-volume
           persistentVolumeClaim:
             claimName: %DOMAIN_UID%-weblogic-domain-pvc
-        - name: secrets
+        - name: weblogic-credentials-volume
           secret:
             secretName: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
       %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:

kubernetes/internal/create-weblogic-domain-job-template.yaml

@@ -96,11 +96,12 @@ function initAndValidateOutputDir {
     ${domainOutputDir} \
     ${valuesInputFile} \
     create-weblogic-domain-inputs.yaml \
-    weblogic-domain-persistent-volume.yaml \
-    weblogic-domain-persistent-volume-claim.yaml \
+    weblogic-domain-pv.yaml \
+    weblogic-domain-pvc.yaml \
+    weblogic-domain-traefik-${clusterNameLC}.yaml \
+    weblogic-domain-traefik-security-${clusterNameLC}.yaml \
     create-weblogic-domain-job.yaml \
-    domain-custom-resource.yaml \
-    traefik.yaml
+    domain-custom-resource.yaml
 }
 
 #
@@ -308,12 +309,12 @@ function initialize {
     fi
   fi
 
-  domainPVInput="${scriptDir}/weblogic-domain-persistent-volume-template.yaml"
+  domainPVInput="${scriptDir}/weblogic-domain-pv-template.yaml"
   if [ ! -f ${domainPVInput} ]; then
     validationError "The template file ${domainPVInput} for generating a persistent volume was not found"
   fi
 
-  domainPVCInput="${scriptDir}/weblogic-domain-persistent-volume-claim-template.yaml"
+  domainPVCInput="${scriptDir}/weblogic-domain-pvc-template.yaml"
   if [ ! -f ${domainPVCInput} ]; then
     validationError "The template file ${domainPVCInput} for generating a persistent volume claim was not found"
   fi
@@ -328,12 +329,12 @@ function initialize {
     validationError "The template file ${dcrInput} for creating the domain custom resource was not found"
   fi
 
-  traefikSecurityInput="${scriptDir}/traefik-security-template.yaml"
+  traefikSecurityInput="${scriptDir}/weblogic-domain-traefik-security-template.yaml"
   if [ ! -f ${traefikSecurityInput} ]; then
     validationError "The file ${traefikSecurityInput} for generating the traefik RBAC was not found"
   fi
 
-  traefikInput="${scriptDir}/traefik-template.yaml"
+  traefikInput="${scriptDir}/weblogic-domain-traefik-template.yaml"
   if [ ! -f ${traefikInput} ]; then
     validationError "The template file ${traefikInput} for generating the traefik deployment was not found"
   fi
@@ -400,12 +401,12 @@ function createYamlFiles {
   # (if needed) and copy the inputs file there.
   copyInputsFileToOutputDirectory ${valuesInputFile} "${domainOutputDir}/create-weblogic-domain-inputs.yaml"
 
-  domainPVOutput="${domainOutputDir}/weblogic-domain-persistent-volume.yaml"
-  domainPVCOutput="${domainOutputDir}/weblogic-domain-persistent-volume-claim.yaml"
+  domainPVOutput="${domainOutputDir}/weblogic-domain-pv.yaml"
+  domainPVCOutput="${domainOutputDir}/weblogic-domain-pvc.yaml"
   jobOutput="${domainOutputDir}/create-weblogic-domain-job.yaml"
   dcrOutput="${domainOutputDir}/domain-custom-resource.yaml"
-  traefikSecurityOutput="${domainOutputDir}/traefik-security.yaml"
-  traefikOutput="${domainOutputDir}/traefik.yaml"
+  traefikSecurityOutput="${domainOutputDir}/weblogic-domain-traefik-security-${clusterNameLC}.yaml"
+  traefikOutput="${domainOutputDir}/weblogic-domain-traefik-${clusterNameLC}.yaml"
 
   enabledPrefix=""     # uncomment the feature
   disabledPrefix="# "  # comment out the feature
@@ -424,6 +425,7 @@ function createYamlFiles {
   fi
 
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${domainPVOutput}
+  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${domainPVOutput}
   sed -i -e "s:%NAMESPACE%:$namespace:g" ${domainPVOutput}
   sed -i -e "s:%WEBLOGIC_DOMAIN_STORAGE_PATH%:${weblogicDomainStoragePath}:g" ${domainPVOutput}
   sed -i -e "s:%WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY%:${weblogicDomainStorageReclaimPolicy}:g" ${domainPVOutput}
@@ -437,6 +439,7 @@ function createYamlFiles {
   cp ${domainPVCInput} ${domainPVCOutput}
   sed -i -e "s:%NAMESPACE%:$namespace:g" ${domainPVCOutput}
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${domainPVCOutput}
+  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${domainPVCOutput}
   sed -i -e "s:%WEBLOGIC_DOMAIN_STORAGE_SIZE%:${weblogicDomainStorageSize}:g" ${domainPVCOutput}
 
   # Generate the yaml to create the kubernetes job that will create the weblogic domain
@@ -495,8 +498,9 @@ function createYamlFiles {
   echo Generating ${traefikOutput}
   sed -i -e "s:%NAMESPACE%:$namespace:g" ${traefikOutput}
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${traefikOutput}
-  sed -i -e "s:%CLUSTER_NAME_LC%:${clusterNameLC}:g" ${traefikOutput}
+  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${traefikOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${traefikOutput}
+  sed -i -e "s:%CLUSTER_NAME_LC%:${clusterNameLC}:g" ${traefikOutput}
   sed -i -e "s:%LOAD_BALANCER_WEB_PORT%:$loadBalancerWebPort:g" ${traefikOutput}
   sed -i -e "s:%LOAD_BALANCER_DASHBOARD_PORT%:$loadBalancerDashboardPort:g" ${traefikOutput}
 
@@ -505,6 +509,8 @@ function createYamlFiles {
   echo Generating ${traefikSecurityOutput}
   sed -i -e "s:%NAMESPACE%:$namespace:g" ${traefikSecurityOutput}
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${traefikSecurityOutput}
+  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${traefikSecurityOutput}
+  sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${traefikSecurityOutput}
   sed -i -e "s:%CLUSTER_NAME_LC%:${clusterNameLC}:g" ${traefikSecurityOutput}
 
   # Remove any "...yaml-e" files left over from running sed
@@ -547,7 +553,7 @@ function createDomainPVC {
 function createDomain {
 
   # There is no way to re-run a kubernetes job, so first delete any prior job
-  JOB_NAME="domain-${domainUID}-job"
+  JOB_NAME="${domainUID}-create-weblogic-domain-job"
   deleteK8sObj job $JOB_NAME ${jobOutput}
 
   echo Creating the domain by creating the job ${jobOutput}
@@ -560,8 +566,8 @@ function createDomain {
   while [ "$JOB_STATUS" != "Completed" -a $count -lt $max ] ; do
     sleep 30
     count=`expr $count + 1`
-    JOB_STATUS=`kubectl get pods --show-all -n ${namespace} | grep "domain-${domainUID}" | awk ' { print $3; } '`
-    JOB_INFO=`kubectl get pods --show-all -n ${namespace} | grep "domain-${domainUID}" | awk ' { print "pod", $1, "status is", $3; } '`
+    JOB_STATUS=`kubectl get pods --show-all -n ${namespace} | grep ${JOB_NAME} | awk ' { print $3; } '`
+    JOB_INFO=`kubectl get pods --show-all -n ${namespace} | grep ${JOB_NAME} | awk ' { print "pod", $1, "status is", $3; } '`
     echo "status on iteration $count of $max"
     echo "$JOB_INFO"
 
@@ -579,7 +585,7 @@ function createDomain {
   done
 
   # Confirm the job pod is status completed
-  JOB_POD=`kubectl get pods --show-all -n ${namespace} | grep "domain-${domainUID}" | awk ' { print $1; } '`
+  JOB_POD=`kubectl get pods --show-all -n ${namespace} | grep ${JOB_NAME} | awk ' { print $1; } '`
   if [ "$JOB_STATUS" != "Completed" ]; then
     echo The create domain job is not showing status completed after waiting 300 seconds
     echo Check the log output for errors

kubernetes/internal/create-weblogic-domain.sh

@@ -306,7 +306,7 @@ dirname "${script}"
   generatedKeyFile="${generatedCertDir}/weblogic-operator.key.pem"
 
   # Always generate a self-signed cert for the internal operator REST port
-  internal_host="internal-weblogic-operator-service"
+  internal_host="internal-weblogic-operator-svc"
   internal_sans="DNS:${internal_host},DNS:${internal_host}.${namespace},DNS:${internal_host}.${namespace}.svc,DNS:${internal_host}.${namespace}.svc.cluster.local"
   echo "Generating a self-signed certificate for the operator's internal https port with the subject alternative names ${internal_sans}"
   ${genOprCertScript} ${internal_sans}
@@ -570,8 +570,8 @@ function deployOperator {
   fi
 
   echo Checking the operator labels
-  LABEL=`kubectl describe deploy weblogic-operator -n ${namespace} | grep "^Labels:" | awk ' { print $2; } '`
-  if [ "$LABEL" != "app=weblogic-operator" ]; then
+  LABEL=`kubectl get deploy weblogic-operator -n ${namespace} -o jsonpath='{.spec.template.metadata.labels.app}'`
+  if [ "$LABEL" != "weblogic-operator" ]; then
     fail "The weblogic-operator deployment should have the label app=weblogic-operator"
   fi
 

kubernetes/internal/create-weblogic-operator.sh

@@ -10,6 +10,7 @@ metadata:
   namespace: %NAMESPACE%
   labels:
     weblogic.domainUID: %DOMAIN_UID%
+    weblogic.domainName: %DOMAIN_NAME%
 spec:
   # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
   # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed

kubernetes/internal/domain-custom-resource-template.yaml

@@ -66,6 +66,8 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: ${NAMESPACE}
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 ---
 #
 # Service Account for WebLogic Operator
@@ -75,6 +77,8 @@ kind: ServiceAccount
 metadata:
   namespace: ${NAMESPACE}
   name: ${ACCOUNT_NAME}
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 ---
 EOF
 
@@ -86,6 +90,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-cluster-role
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 rules:
 - apiGroups: [""]
   resources: ["namespaces", "persistentvolumes"]
@@ -107,6 +113,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-cluster-role-nonresource
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 rules:
 - nonResourceURLs: ["/version/*"]
   verbs: ["get"]
@@ -118,6 +126,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
   name: ${ACCOUNT_NAME}
@@ -132,6 +142,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-nonresource
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
   name: ${ACCOUNT_NAME}
@@ -146,6 +158,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-discovery
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
   name: ${ACCOUNT_NAME}
@@ -160,6 +174,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-auth-delegator
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
   name: ${ACCOUNT_NAME}
@@ -177,6 +193,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-namespace-role
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 rules:
 - apiGroups: [""]
   resources: ["secrets", "persistentvolumeclaims"]
@@ -214,6 +232,8 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-rolebinding
   namespace: ${i}
+  labels:
+    weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
   name: ${ACCOUNT_NAME}

kubernetes/internal/generate-security-policy.sh

@@ -7,6 +7,7 @@ metadata:
   name: %DOMAIN_UID%-weblogic-domain-pv
   labels:
     weblogic.domainUID: %DOMAIN_UID%
+    weblogic.domainName: %DOMAIN_NAME%
 spec:
   storageClassName: %DOMAIN_UID%-weblogic-domain-storage-class
   capacity:

kubernetes/internal/weblogic-domain-persistent-volume-template.yaml renamed to kubernetes/internal/weblogic-domain-pv-template.yaml

@@ -8,6 +8,7 @@ metadata:
   namespace: %NAMESPACE%
   labels:
     weblogic.domainUID: %DOMAIN_UID%
+    weblogic.domainName: %DOMAIN_NAME%
 spec:
   storageClassName: %DOMAIN_UID%-weblogic-domain-storage-class
   accessModes:

kubernetes/internal/weblogic-domain-persistent-volume-claim-template.yaml renamed to kubernetes/internal/weblogic-domain-pvc-template.yaml

@@ -5,6 +5,8 @@ metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
   labels:
     weblogic.domainUID: %DOMAIN_UID%
+    weblogic.domainName: %DOMAIN_NAME%
+    weblogic.clusterName: %CLUSTER_NAME%
 rules:
   - apiGroups:
       - ""
@@ -32,7 +34,8 @@ metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
   labels:
     weblogic.domainUID: %DOMAIN_UID%
-    weblogic.clusterName: %CLUSTER_NAME_LC%
+    weblogic.domainName: %DOMAIN_NAME%
+    weblogic.clusterName: %CLUSTER_NAME%
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole