Update samples

Author: rjeberhard

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/domain-template.yaml

@@ -54,7 +54,6 @@ spec:
       %EXPOSE_ADMIN_PORT_PREFIX%- channelName: default
       %EXPOSE_ADMIN_PORT_PREFIX%  nodePort: %ADMIN_NODE_PORT%
       # Uncomment to export the T3Channel as a service
-      %EXPOSE_T3_CHANNEL_PREFIX%exportedNetworkAccessPoints:
       %EXPOSE_T3_CHANNEL_PREFIX%- channelName: T3Channel
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.

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

@@ -252,14 +252,17 @@ function createFiles {
   # Generate the yaml to create the domain resource
   echo Generating ${dcrOutput}
 
+  exposeAnyChannelPrefix="${disabledPrefix}"
   if [ "${exposeAdminT3Channel}" = true ]; then
     exposeAdminT3ChannelPrefix="${enabledPrefix}"
+    exposeAnyChannelPrefix="${enabledPrefix}"
   else
     exposeAdminT3ChannelPrefix="${disabledPrefix}"
   fi
 
   if [ "${exposeAdminNodePort}" = true ]; then
     exposeAdminNodePortPrefix="${enabledPrefix}"
+    exposeAnyChannelPrefix="${enabledPrefix}"
   else
     exposeAdminNodePortPrefix="${disabledPrefix}"
   fi
@@ -274,10 +277,11 @@ function createFiles {
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_POLICY%:${imagePullPolicy}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${dcrOutput}
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
-  sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
-  sed -i -e "s:%CLUSTER_NAME%:${clusterName}: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:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
+  sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}
   sed -i -e "s:%JAVA_OPTIONS%:${javaOptions}:g" ${dcrOutput}
   sed -i -e "s:%SERVER_START_POLICY%:${serverStartPolicy}:g" ${dcrOutput}
   sed -i -e "s:%LOG_HOME%:${logHome}:g" ${dcrOutput}

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

@@ -61,16 +61,18 @@ spec:
     # "RUNNING" means the listed server will be started up to "RUNNING" mode
     # "ADMIN" means the listed server will be start up to "ADMIN" mode
     serverStartState: "RUNNING"
-    # The Admin Server's NodePort
-    %EXPOSE_ADMIN_PORT_PREFIX%nodePort: %ADMIN_NODE_PORT%
-    # Uncomment to export the T3Channel as a service
-    %EXPOSE_T3_CHANNEL_PREFIX%exportedNetworkAccessPoints:
-    %EXPOSE_T3_CHANNEL_PREFIX%  T3Channel: {}
+    %EXPOSE_ANY_CHANNEL_PREFIX%adminService:
+    %EXPOSE_ANY_CHANNEL_PREFIX%  channels:
+      # The Admin Server's NodePort
+      %EXPOSE_ADMIN_PORT_PREFIX%- channelName: default
+      %EXPOSE_ADMIN_PORT_PREFIX%  nodePort: %ADMIN_NODE_PORT%
+      # Uncomment to export the T3Channel as a service
+      %EXPOSE_T3_CHANNEL_PREFIX%- channelName: T3Channel
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
-    - clusterName: %CLUSTER_NAME%
-      serverStartState: "RUNNING"
-      replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
+  - clusterName: %CLUSTER_NAME%
+    serverStartState: "RUNNING"
+    replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
   # The number of managed servers to start for unlisted clusters
   # replicas: 1