Backport revised model tempates to work with revised WDT schema

Author: rjeberhard

kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-on-pv/wdt_k8s_model_template.yaml

@@ -29,12 +29,12 @@ kubernetes:
     imagePullPolicy: "%WEBLOGIC_IMAGE_PULL_POLICY%"
 
     # Identify which Secret contains the credentials for pulling an image
-    %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets: 
+    %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
     %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%  "%WEBLOGIC_IMAGE_PULL_SECRET_NAME%":
 
     # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
     # how to create that Secret at the end of this file)
-    webLogicCredentialsSecret: 
+    webLogicCredentialsSecret:
        name: '%WEBLOGIC_CREDENTIALS_SECRET_NAME%'
 
     # Whether to include the server out file into the pod's stdout, default is true
@@ -85,10 +85,10 @@ kubernetes:
       %EXPOSE_ANY_CHANNEL_PREFIX%adminService:
       %EXPOSE_ANY_CHANNEL_PREFIX%  channels:
       # The Admin Server's NodePort
-      %EXPOSE_ANY_CHANNEL_PREFIX%    default:
-      %EXPOSE_ADMIN_PORT_PREFIX%       nodePort: %ADMIN_NODE_PORT%
+      %EXPOSE_ANY_CHANNEL_PREFIX%  - channelName: default
+      %EXPOSE_ADMIN_PORT_PREFIX%    nodePort: %ADMIN_NODE_PORT%
       # Uncomment to export the T3Channel as a service
-      %EXPOSE_T3_CHANNEL_PREFIX%    T3Channel:
+      %EXPOSE_T3_CHANNEL_PREFIX%  - channelName: T3Channel
 
     # Istio service mesh support is experimental.
     %ISTIO_PREFIX%configuration:

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

@@ -29,12 +29,12 @@ kubernetes:
     imagePullPolicy: "%WEBLOGIC_IMAGE_PULL_POLICY%"
 
     # Identify which Secret contains the credentials for pulling an image
-    %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets: 
+    %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
     %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%  "%WEBLOGIC_IMAGE_PULL_SECRET_NAME%":
 
     # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
     # how to create that Secret at the end of this file)
-    webLogicCredentialsSecret: 
+    webLogicCredentialsSecret:
        name: '%WEBLOGIC_CREDENTIALS_SECRET_NAME%'
 
     # Whether to include the server out file into the pod's stdout, default is true
@@ -86,10 +86,10 @@ kubernetes:
       %EXPOSE_ANY_CHANNEL_PREFIX%adminService:
       %EXPOSE_ANY_CHANNEL_PREFIX%  channels:
       # The Admin Server's NodePort
-      %EXPOSE_ANY_CHANNEL_PREFIX%    default:
-      %EXPOSE_ADMIN_PORT_PREFIX%       nodePort: %ADMIN_NODE_PORT%
+      %EXPOSE_ANY_CHANNEL_PREFIX%  - channelName: default
+      %EXPOSE_ADMIN_PORT_PREFIX%    nodePort: %ADMIN_NODE_PORT%
       # Uncomment to export the T3Channel as a service
-      %EXPOSE_T3_CHANNEL_PREFIX%    T3Channel:
+      %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.