Make most of the create-weblogic-domain-inputs.yaml name changes

Author: moreaut

kubernetes/create-weblogic-domain-inputs.yaml

@@ -7,15 +7,12 @@ adminPort: 7001
 # Name of the Admin Server
 adminServerName: admin-server
 
-# Script used to create the domain.
-createDomainScript: /u01/weblogic/create-domain-script.sh
-
 # Name of the WebLogic domain to create
 domainName: base_domain
 
 # Unique id identifying a domain.
 # This id must be lowercase and unique across all domains in a Kubernetes cluster
-domainUid: domain1
+domainUID: domain1
 
 # Determines which WebLogic Servers the Operator will start up
 # Legal values are "NONE", "ALL", "ADMIN", "SPECIFIED", or "AUTO"
@@ -25,29 +22,32 @@ startupControl: AUTO
 clusterName: cluster-1
 
 # Number of managed servers to generate for the domain
-managedServerCount: 2
+configuredManagedServerCount: 2
 
 # Number of managed servers to initially start for the domain
-managedServerStartCount: 2
+initialManagedServerReplicas: 2
 
 # Base string used to generate managed server names
 managedServerNameBase: managed-server
 
 # Port number for each managed server
 managedServerPort: 8001
 
-# Persistent volume type, the value must be hostPath or nfs.
-# If using nfs, nfsServer must be specified.
-persistenceType: hostPath
+# Persistent volume type for the domain's storage.
+# The value must be 'HOST_PATH' or 'NFS'. 
+# If using 'NFS', weblogicDomainStorageNFSServer must be specified.
+weblogicDomainStorageType: HOST_PATH
 
-# NFS server name or ip.  Only used if persistenceType is nfs.
-nfsServer: nfsServer
+# The server name or ip address of the NFS server to use
+# for the domain's storage.
+# Only used if persistenceType is nfs.
+weblogicDomainStorageNFSServer: nfsServer
 
-# Physical path of the persistent volume storage
-persistencePath: /scratch/k8s_dir/persistentVolume001
+# Physical path of the domain's persistent storage.
+weblogicDomainStoragePath: /scratch/k8s_dir/persistentVolume001
 
-# Total storage allocated by the persistent volume
-persistenceSize: 10Gi
+# Total storage allocated to the domain's persistent storage.
+weblogicDomainStorageSize: 10Gi
 
 # Name of the storage class to set for the persistent volume and persistent volume claim
 # The default value that will be used is the value of the domainUid input parameter
@@ -69,11 +69,11 @@ productionModeEnabled: true
 
 # Name of the Kubernetes secret for the Admin Server's username and password
 # The name must be lowercase
-secretName: domain1-weblogic-credentials
+weblogicCredentialsSecretName: domain1-weblogic-credentials
 
 # Name of the Kubernetes secret to access the Docker Store to pull the WebLogic Server Docker image
 # The presence of the secret will be validated when this parameter is enabled.
-#imagePullSecretName:
+#weblogicImagePullSecretName:
 
 # Port for the T3Channel of the NetworkAccessPoint
 t3ChannelPort: 30012
@@ -96,14 +96,14 @@ exposeAdminNodePort: false
 # Name of the domain namespace
 namespace: default
 
-# Load balancer to deploy.  Supported values are: traefik, none
-loadBalancer: traefik
+# Load balancer to deploy.  Supported values are:TRAEFIK, NONE
+loadBalancer: TRAEFIK
 
 # Load balancer web port
 loadBalancerWebPort: 30305
 
-# Load balancer admin port
-loadBalancerAdminPort: 30315
+# Load balancer dashboard port
+loadBalancerDashboardPort: 30315
 
 #Java Option for Weblogic Server
 javaOptions: -Dweblogic.StdoutDebugEnabled=false

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

@@ -47,7 +47,7 @@ data:
     source /u01/weblogic/utility.sh
 
     # Verify the script to create the domain exists
-    script='%CREATE_DOMAIN_SCRIPT%'
+    script='/u01/weblogic/create-domain-script.sh'
     if [ -f $script ]; then
       echo The domain will be created using the script $script
     else
@@ -279,7 +279,7 @@ data:
 
     # Create the managed servers
     index=0
-    while [ $index -lt %NUMBER_OF_MS% ]
+    while [ $index -lt %CONFIGURED_MANAGED_SERVER_COUNT% ]
     do
       ((index++))
       createNodeMgrHome %DOMAIN_UID% %MANAGED_SERVER_NAME_BASE%${index} %DOMAIN_UID%-%ADMIN_SERVER_NAME%
@@ -298,7 +298,7 @@ data:
     server_port        = %MANAGED_SERVER_PORT%
     domain_path        = os.environ.get("DOMAIN_HOME")
     cluster_name       = "%CLUSTER_NAME%"
-    number_of_ms       = %NUMBER_OF_MS%
+    number_of_ms       = %CONFIGURED_MANAGED_SERVER_COUNT%
 
     print('domain_path        : [%s]' % domain_path);
     print('domain_name        : [%DOMAIN_NAME%]');
@@ -494,6 +494,6 @@ spec:
             claimName: %PERSISTENT_VOLUME_CLAIM%
         - name: secrets
           secret:
-            secretName: %SECRET_NAME%
-      %IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
-      %IMAGE_PULL_SECRET_PREFIX%- name: %DOCKER_REGISTRY_SECRET%
+            secretName: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
+      %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
+      %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%- name: %WEBLOGIC_IMAGE_PULL_SECRET_NAME%