Merge pull request #334 from oracle/issue_330

Better handling optional elements in apache yaml file

Author: rjeberhard

kubernetes/internal/create-weblogic-domain.sh

@@ -586,24 +586,21 @@ function createYamlFiles {
 
     echo Generating ${apacheOutput}
 
-    # This part needs to be done before substitution of %DOMAIN_UID%, %ADMIN_SERVER_NAME% and %ADMIN_PORT%
     if [ "${loadBalancerExposeAdminPort}" = "true" ]; then
-      sed -i -e "s|# - name: WEBLOGIC_HOST|  - name: WEBLOGIC_HOST|g" ${apacheOutput}
-      sed -i -e "s|#   value: '%DOMAIN_UID%-%ADMIN_SERVER_NAME%'|    value: '%DOMAIN_UID%-%ADMIN_SERVER_NAME%'|g" ${apacheOutput}
-      sed -i -e "s|# - name: WEBLOGIC_PORT|  - name: WEBLOGIC_PORT|g" ${apacheOutput}
-      sed -i -e "s|#   value: '%ADMIN_PORT%'|    value: '%ADMIN_PORT%'|g" ${apacheOutput}
+      enableLoadBalancerExposeAdminPortPrefix="${enabledPrefix}"
+    else
+      enableLoadBalancerExposeAdminPortPrefix="${disabledPrefix}"
     fi
 
     if [ ! -z "${loadBalancerVolumePath}" ]; then
+      enableLoadBalancerVolumePathPrefix="${enabledPrefix}"
       sed -i -e "s:%LOAD_BALANCER_VOLUME_PATH%:${loadBalancerVolumePath}:g" ${apacheOutput}
-      sed -i -e "s:# volumes:volumes:g" ${apacheOutput}
-      sed -i -e "s|# - name: %DOMAIN_UID%-apache-webtier|- name: %DOMAIN_UID%-apache-webtier|g" ${apacheOutput}
-      sed -i -e "s:#   hostPath:  hostPath:g" ${apacheOutput}
-      sed -i -e "s:#     path:    path:g" ${apacheOutput}
-      sed -i -e "s:# volumeMounts:volumeMounts:g" ${apacheOutput}
-      sed -i -e "s:#   mountPath:  mountPath:g" ${apacheOutput}
+    else
+      enableLoadBalancerVolumePathPrefix="${disabledPrefix}"
     fi
 
+    sed -i -e "s:%ENABLE_LOAD_BALANCER_EXPOSE_ADMIN_PORT%:${enableLoadBalancerExposeAdminPortPrefix}:g" ${apacheOutput}
+    sed -i -e "s:%ENABLE_LOAD_BALANCER_VOLUME_PATH%:${enableLoadBalancerVolumePathPrefix}:g" ${apacheOutput}
     sed -i -e "s:%NAMESPACE%:$namespace:g" ${apacheOutput}
     sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${apacheOutput}
     sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${apacheOutput}

kubernetes/internal/weblogic-domain-apache-template.yaml

@@ -37,26 +37,26 @@ spec:
     spec:
       serviceAccountName: %DOMAIN_UID%-apache-webtier
       terminationGracePeriodSeconds: 60
-      # volumes:
-      # - name: %DOMAIN_UID%-apache-webtier
-      #   hostPath:
-      #     path: %LOAD_BALANCER_VOLUME_PATH%
+      %ENABLE_LOAD_BALANCER_VOLUME_PATH%volumes:
+      %ENABLE_LOAD_BALANCER_VOLUME_PATH%- name: %DOMAIN_UID%-apache-webtier
+      %ENABLE_LOAD_BALANCER_VOLUME_PATH%  hostPath:
+      %ENABLE_LOAD_BALANCER_VOLUME_PATH%    path: %LOAD_BALANCER_VOLUME_PATH%
       containers:
       - name: %DOMAIN_UID%-apache-webtier
         image: store/oracle/apache:12.2.1.3
         imagePullPolicy: Never
-        # volumeMounts:
-        # - name: %DOMAIN_UID%-apache-webtier
-        #   mountPath: "/config"
+        %ENABLE_LOAD_BALANCER_VOLUME_PATH%volumeMounts:
+        %ENABLE_LOAD_BALANCER_VOLUME_PATH%- name: %DOMAIN_UID%-apache-webtier
+        %ENABLE_LOAD_BALANCER_VOLUME_PATH%  mountPath: "/config"
         env:
           - name: WEBLOGIC_CLUSTER
             value: '%DOMAIN_UID%-cluster-%CLUSTER_NAME_LC%:%MANAGED_SERVER_PORT%'
           - name: LOCATION
             value: '%WEB_APP_PREPATH%'
-        # - name: WEBLOGIC_HOST
-        #   value: '%DOMAIN_UID%-%ADMIN_SERVER_NAME%'
-        # - name: WEBLOGIC_PORT
-        #   value: '%ADMIN_PORT%'
+          %ENABLE_LOAD_BALANCER_EXPOSE_ADMIN_PORT%- name: WEBLOGIC_HOST
+          %ENABLE_LOAD_BALANCER_EXPOSE_ADMIN_PORT%  value: '%DOMAIN_UID%-%ADMIN_SERVER_NAME%'
+          %ENABLE_LOAD_BALANCER_EXPOSE_ADMIN_PORT%- name: WEBLOGIC_PORT
+          %ENABLE_LOAD_BALANCER_EXPOSE_ADMIN_PORT%  value: '%ADMIN_PORT%'
         readinessProbe:
           tcpSocket:
             port: 80