merge fixes

Author: rjeberhard

kubernetes/create-domain-job.sh

@@ -147,11 +147,12 @@ function validateDomainSecret {
 # Function to validate the image pull secret name
 #
 function validateImagePullSecretName {
-  IMAGE_PULL_SECRET_EXISTS=false
   if [ ! -z ${imagePullSecretName} ]; then
     validateLowerCase ${imagePullSecretName} "validateImagePullSecretName"
-    IMAGE_PULL_SECRET_EXISTS=true
     imagePullSecretPrefix=""
+    if [ "${generateOnly}" = false ]; then
+      validateImagePullSecret
+    fi
   else
     # Set name blank when not specified, and comment out the yaml
     imagePullSecretName=""
@@ -166,10 +167,8 @@ function validateImagePullSecret {
 
   # The kubernetes secret for pulling images from the docker store is optional.
   # If it was specified, make sure it exists.
-  if [ "${IMAGE_PULL_SECRET_EXISTS}" = true ]; then
-    validateSecretExists ${imagePullSecretName} ${namespace}
-    failIfValidationErrors
-  fi
+  validateSecretExists ${imagePullSecretName} ${namespace}
+  failIfValidationErrors
 }
 
 #
@@ -557,9 +556,6 @@ if [ "${generateOnly}" = false ]; then
   # Check that the domain secret exists and contains the required elements
   validateDomainSecret
 
-  # Check if the optional docker secret exists
-  validateImagePullSecret
-
   # Create the persistent volume
   createPV
 

kubernetes/create-operator-inputs.yaml

@@ -17,11 +17,15 @@ namespace: weblogic-operator
 targetNamespaces: default
 
 # The docker image containing the operator code.
-image: wlsldi-v2.docker.oraclecorp.com/weblogic-operator:latest
+image: container-registry.oracle.com/middleware/weblogic-kubernetes-operator:latest
 
 # The image pull policy for the operator docker image.
 imagePullPolicy: IfNotPresent
 
+# Name of the Kubernetes secret to access the registry containing the operator Docker image
+# The presence of the secret will be validated when this parameter is enabled.
+#imagePullSecretName:
+ 
 # Options for externally exposing the operator REST https interface
 # (i.e. outside of the Kubernetes cluster). Valid values are:
 #

kubernetes/create-weblogic-operator.sh

@@ -95,10 +95,51 @@ function initialize {
   validateJavaLoggingLevel
 
   validateExternalRest
+  
+  validateImagePullSecretName
 
   failIfValidationErrors
 }
 
+#
+# Function to validate the image pull secret name
+#
+function validateImagePullSecretName {
+  if [ ! -z ${imagePullSecretName} ]; then
+  	validateLowerCase ${imagePullSecretName} "validateImagePullSecretName"
+    imagePullSecretPrefix=""
+    validateImagePullSecret
+  else
+    # Set name blank when not specified, and comment out the yaml
+    imagePullSecretName=""
+    imagePullSecretPrefix="#"
+  fi
+}
+
+#
+# Function to validate the image pull secret exists
+#
+function validateImagePullSecret {
+
+  # The kubernetes secret for pulling images from the docker store is optional.
+  # If it was specified, make sure it exists.
+  validateSecretExists ${imagePullSecretName} ${namespace}
+  failIfValidationErrors
+}
+
+#
+# Function to validate a kubernetes secret exists
+# $1 - the name of the secret
+# $2 - namespace
+function validateSecretExists {
+  # Verify the secret exists
+  echo "Checking to see if the secret ${1} exists in namespace ${2}"
+  local SECRET=`kubectl get secret ${1} -n ${2} | grep ${1} | wc | awk ' { print $1; }'`
+  if [ "${SECRET}" != "1" ]; then
+    validationError "The registry secret ${1} was not found in namespace ${2}"
+  fi
+}
+
 #
 # Function to validate the service account is lowercase
 #
@@ -269,6 +310,8 @@ function createYamlFiles {
   sed -i -e "s|%ACCOUNT_NAME%|$serviceAccount|g" ${oprOutput}
   sed -i -e "s|%IMAGE%|$image|g" ${oprOutput}
   sed -i -e "s|%IMAGE_PULL_POLICY%|$imagePullPolicy|g" ${oprOutput}
+  sed -i -e "s|%DOCKER_STORE_REGISTRY_SECRET%|${imagePullSecretName}|g" ${oprOutput}
+  sed -i -e "s|%IMAGE_PULL_SECRET_PREFIX%|${imagePullSecretPrefix}|g" ${oprOutput}
   sed -i -e "s|%EXTERNAL_OPERATOR_SERVICE_PREFIX%|$externalOperatorServicePrefix|g" ${oprOutput}
   sed -i -e "s|%EXTERNAL_REST_HTTPS_PORT%|$externalRestHttpsPort|g" ${oprOutput}
   sed -i -e "s|%EXTERNAL_DEBUG_HTTP_PORT%|$externalDebugHttpPort|g" ${oprOutput}

kubernetes/internal/domain-job-template.yaml

@@ -177,7 +177,7 @@ data:
     sleep 15
     echo "Finished waiting for the nodemanager to start"
 
-    echo "Update JVM arguments" 
+    echo "Update JVM arguments"
     echo "Arguments=\${USER_MEM_ARGS} -XX\:+UnlockExperimentalVMOptions -XX\:+UseCGroupMemoryLimitForHeap \${JAVA_OPTIONS}" >> ${startProp} 
 
     echo "Start the server"
@@ -207,7 +207,7 @@ data:
       checkFileExists ${pyFile}
 
       # Create a liveness probe script. It checks a WL server state file maintained by the node manager.
-      # The script and 'EOF' on the following lines must not be indented! 
+      # The script and 'EOF' on the following lines must not be indented!
 
       scriptFile=${nmdir}/livenessProbe.sh
 
@@ -317,7 +317,7 @@ data:
     done
 
     echo "Successfully Completed"
-    
+
   create-domain.py: |-
     # This python script is used to create a WebLogic domain
 

kubernetes/internal/generate-security-policy.sh

@@ -44,10 +44,10 @@ else
     shift
 fi
 
-if [ "$1" == "-o" ] ; then
+if [ "$1" = "-o" ] ; then
         shift
         SCRIPT="$1"
-elif [[ "$1" = --output=* ]] ; then
+elif [[ "$1" = "--output="* ]] ; then
         SCRIPT=`echo "$1" | cut -d \= -f 2`
 else
         SCRIPT=$SCRIPT_DEFAULT