initialize weblogic image to default if not defined and update create/delete domain job templates

Author: lennyphan

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

@@ -275,7 +275,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: create-weblogic-domain-job
-          image: store/oracle/weblogic:12.2.1.3
+          image: %WEBLOGIC_IMAGE%
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 7001

kubernetes/internal/create-weblogic-domain.sh

@@ -454,6 +454,14 @@ function createYamlFiles {
   enabledPrefix=""     # uncomment the feature
   disabledPrefix="# "  # comment out the feature
 
+  # For backward compatability, default to "store/oracle/weblogic:12.2.1.3" if not defined in
+  # create-weblogic-domain-inputs.yaml
+  if [ -z "${weblogicImage}" ]; then
+    weblogicImage="store/oracle/weblogic:12.2.1.3"
+  fi
+  # Must escape the ':' value in weblogicImage for sed to properly parse and replace
+  weblogicImage=$(echo ${weblogicImage} | sed -e "s/\:/\\\:/g")
+
   # Generate the yaml to create the persistent volume
   echo Generating ${domainPVOutput}
 
@@ -491,6 +499,7 @@ function createYamlFiles {
   cp ${createJobInput} ${createJobOutput}
   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%:${weblogicImage}:g" ${createJobOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${weblogicImagePullSecretName}:g" ${createJobOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${weblogicImagePullSecretPrefix}:g" ${createJobOutput}
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${createJobOutput}
@@ -511,6 +520,7 @@ function createYamlFiles {
 
   cp ${deleteJobInput} ${deleteJobOutput}
   sed -i -e "s:%NAMESPACE%:$namespace:g" ${deleteJobOutput}
+  sed -i -e "s:%WEBLOGIC_IMAGE%:${weblogicImage}:g" ${deleteJobOutput}
   sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${deleteJobOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${weblogicImagePullSecretName}:g" ${deleteJobOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${weblogicImagePullSecretPrefix}:g" ${deleteJobOutput}
@@ -538,7 +548,6 @@ function createYamlFiles {
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${dcrOutput}
   sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${dcrOutput}
   sed -i -e "s:%ADMIN_SERVER_NAME%:${adminServerName}:g" ${dcrOutput}
-  weblogicImage=$(echo ${weblogicImage} | sed -e "s/\:/\\\:/g")
   sed -i -e "s:%WEBLOGIC_IMAGE%:${weblogicImage}:g" ${dcrOutput}
   sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${dcrOutput}
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}

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

@@ -35,7 +35,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: delete-weblogic-domain-job
-          image: store/oracle/weblogic:12.2.1.3
+          image: %WEBLOGIC_IMAGE%
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 7001