OWLS-83537 - Update domain home in image samples to use WIT instead of docker-images samples

kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/create-domain-inputs.yaml

@@ -40,9 +40,8 @@ productionModeEnabled: true
 # OracleFMWInfrastructure Server image that the operator uses to start the domain.
 #
 # The create domain scripts generate a OracleFMWInfrastructure Server image with a domain home in it.
-# By default, the scripts tag the generated OracleFMWInfrastructure server image as either
-# `domain-home-in-image` or `domain-home-in-image-wdt` based on the `domainHomeImageBuildPath`
-# property, and use it to set the `image` element in the generated domain YAML file.
+# By default, the scripts tag the generated OracleFMWInfrastructure server image as 
+# `domain-home-in-image`, and use it to set the `image` element in the generated domain YAML file.
 #
 # If this property is set, the create domain scripts will use the value specified, instead of the
 # default value, to tag the generated image and set the `image` in the domain YAML file.
@@ -135,18 +134,20 @@ domainPVMountPath: /shared
 # See README.md for more help.
 domainHomeImageBase: container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4
 
-# Location of the OracleFMWInfrastructure "domain home in image" image sample in the
-# `https://github.com/oracle/docker-images.git` project.
-# If not specified, use "./docker-images/OracleFMWInfrastructure/samples/12213-domain-home-in-image".
-# Another possible value is "./docker-images/OracleFMWInfrastructure/samples/12213-domain-home-in-image-wdt",
-# which uses WDT, instead of WLST, to generate the domain configuration.
-domainHomeImageBuildPath: ./docker-images/OracleFMWInfrastructure/samples/12213-domain-home-in-image
-
 # Uncomment to customize the WebLogic Deploy Tool (WDT) version used by the WDT
 # "domain home in image" image sample in the Docker images project. See
 # "domainHomeImageBuildPath". Set to "LATEST" to use the latest version.
 # wdtVersion: LATEST
 
+Uncomment to customize the WebLogic Image Tool (WIT) version.
+# Set to "LATEST" to use the latest version.
+# witVersion: LATEST
+
+# Uncomment to customize the directory where WebLogic Deploy Tool (WDT)
+# and WebLogic Image Tool (WIT) are installed.
+# Default is /tmp/dhii-sample/tools
+# toolsDir: /tmp/dhii-sample/tools
+
 # Resource request for each server pod (Memory and CPU). This is minimum amount of compute
 # resources required for each server pod. Edit value(s) below as per pod sizing requirements.
 # These are optional. 

kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/create-domain.sh

@@ -156,16 +156,11 @@ function initialize {
 
   initOutputDir
 
-  export WDT_DIR="/tmp/fmw-dhii-sample/tools"
+  export WDT_DIR=${toolsDir:-"/tmp/dhii-sample/tools"}
   export WIT_DIR="${WDT_DIR}"
 
-  if [ -n "${wdtVersion}" ]; then
-    export WDT_VERSION=${wdtVersion}
-  fi
-
-  if [ -n "${witVersion}" ]; then
-    export WIT_VERSION=${witVersion}
-  fi
+  export WDT_VERSION=${wdtVersion:-LATEST}
+  export WIT_VERSION=${witVersion:-LATEST}
 
   install_wit_if_needed || exit 1
 }
@@ -191,15 +186,32 @@ function createDomainHome {
 
   echo "Invoking WebLogic Image Tool to create a WebLogic domain at '${domainHome}' from image '${domainHomeImageBase}' and tagging the resulting image as '${BUILD_IMAGE_TAG}'."
 
+  echo "fmwDomainType is [${fmwDomainType}]"
+  # fmwDomainType is either JRF or RestrictedJRF. JRF does not support Dynamic Cluster Model
+  if [ "${fmwDomainType}" == "RestrictedJRF" ]; then
+    wdtModelFile=wdt_model_restricted_jrf_configured.yaml
+    wdtDomainType=RestrictedJRF
+  else
+    wdtModelFile=wdt_model_configured.yaml
+    wdtDomainType=JRF
+  fi
+
+    echo "debug- wdtModel is ${scriptDir}/${wdtModelFile}"
+    echo "debug- wdtVariables is ${domainPropertiesOutput}"
+    echo "debug- WDT_VERSION is ${WDT_VERSION}"
+    echo "debug- wdtDomainHome is ${domainHome}"
+    echo "debug- wdtDomainType is ${wdtDomainType}"
+
+
   $WIT_DIR/imagetool/bin/imagetool.sh update \
       --fromImage $domainHomeImageBase \
-      --tag ""${BUILD_IMAGE_TAG}"" \
-      --wdtModel ${scriptDir}/topology.yaml \
+      --tag "${BUILD_IMAGE_TAG}" \
+      --wdtModel ${scriptDir}/${wdtModelFile} \
       --wdtVariables ${domainPropertiesOutput} \
       --wdtOperation CREATE \
       --wdtVersion ${WDT_VERSION} \
-      --wdtDomainType JRF \
-      --wdtDomainHome $domainHome #--chown=oracle:root
+      --wdtDomainType ${wdtDomainType} \
+      --wdtDomainHome ${domainHome} #--chown=oracle:root
 
       #--wdtRunRCU \
   return

kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/wdt_model_configured.yaml

@@ -0,0 +1,56 @@
+domainInfo:
+    AdminUserName: '@@PROP:ADMIN_USER_NAME@@'
+    AdminPassword: '@@PROP:ADMIN_USER_PASS@@'
+    RCUDbInfo:
+        rcu_prefix: '@@PROP:RCU_SCHEMA_PREFIX@@'
+        rcu_schema_password: '@@PROP:RCU_SCHEMA_PASSWORD@@'
+        rcu_db_conn_string: '@@PROP:RCU_DB_CONN_STRING@@'
+    ServerStartMode: prod
+topology:
+    Name: '@@PROP:DOMAIN_NAME@@'
+    AdminServerName: '@@PROP:ADMIN_NAME@@'
+    ProductionModeEnabled: '@@PROP:PRODUCTION_MODE_ENABLED@@'
+    Cluster:
+        '@@PROP:CLUSTER_NAME@@':
+    Server:
+        '@@PROP:ADMIN_NAME@@':
+            NetworkAccessPoint:
+                T3Channel:
+                    ListenPort: '@@PROP:T3_CHANNEL_PORT@@'
+                    PublicAddress: '@@PROP:T3_PUBLIC_ADDRESS@@'
+                    PublicPort: '@@PROP:T3_CHANNEL_PORT@@'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@1':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
+            NumOfRetriesBeforeMsiMode: 0
+            RetryIntervalBeforeMsiMode: 1
+            JTAMigratableTarget:
+                Cluster: '@@PROP:CLUSTER_NAME@@'
+                UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@1'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@2':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
+            NumOfRetriesBeforeMsiMode: 0
+            RetryIntervalBeforeMsiMode: 1
+            JTAMigratableTarget:
+                Cluster: '@@PROP:CLUSTER_NAME@@'
+                UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@2'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@3':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
+            NumOfRetriesBeforeMsiMode: 0
+            RetryIntervalBeforeMsiMode: 1
+            JTAMigratableTarget:
+                Cluster: '@@PROP:CLUSTER_NAME@@'
+                UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@3'
+    MigratableTarget:
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@1 (migratable)':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@1'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@2 (migratable)':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@2'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@3 (migratable)':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@3'
+

kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/wdt_model_restricted_jrf_configured.yaml

@@ -0,0 +1,52 @@
+domainInfo:
+    AdminUserName: '@@PROP:ADMIN_USER_NAME@@'
+    AdminPassword: '@@PROP:ADMIN_USER_PASS@@'
+    ServerStartMode: prod
+topology:
+    AdminServerName: '@@PROP:ADMIN_NAME@@'
+    Name: '@@PROP:DOMAIN_NAME@@'
+    ProductionModeEnabled: '@@PROP:PRODUCTION_MODE_ENABLED@@'
+    Cluster:
+        '@@PROP:CLUSTER_NAME@@':
+    Server:
+        '@@PROP:ADMIN_NAME@@':
+            NetworkAccessPoint:
+                T3Channel:
+                    ListenPort: '@@PROP:T3_CHANNEL_PORT@@'
+                    PublicAddress: '@@PROP:T3_PUBLIC_ADDRESS@@'
+                    PublicPort: '@@PROP:T3_CHANNEL_PORT@@'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@1':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
+            NumOfRetriesBeforeMsiMode: 0
+            RetryIntervalBeforeMsiMode: 1
+            JTAMigratableTarget:
+                Cluster: '@@PROP:CLUSTER_NAME@@'
+                UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@1'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@2':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
+            NumOfRetriesBeforeMsiMode: 0
+            RetryIntervalBeforeMsiMode: 1
+            JTAMigratableTarget:
+                Cluster: '@@PROP:CLUSTER_NAME@@'
+                UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@2'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@3':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
+            NumOfRetriesBeforeMsiMode: 0
+            RetryIntervalBeforeMsiMode: 1
+            JTAMigratableTarget:
+                Cluster: '@@PROP:CLUSTER_NAME@@'
+                UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@3'
+    MigratableTarget:
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@1 (migratable)':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@1'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@2 (migratable)':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@2'
+        '@@PROP:MANAGED_SERVER_NAME_BASE@@3 (migratable)':
+            Cluster: '@@PROP:CLUSTER_NAME@@'
+            UserPreferredServer: '@@PROP:MANAGED_SERVER_NAME_BASE@@3'
+

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

@@ -189,10 +189,10 @@ function createDomainHome {
     echo "Invoking WebLogic Image Tool to create a WebLogic domain at '${domainHome}' from image '${domainHomeImageBase}' and tagging the resulting image as '${BUILD_IMAGE_TAG}'."
 
     $WIT_DIR/imagetool/bin/imagetool.sh update \
-      --fromImage $domainHomeImageBase \
-      --tag ""${BUILD_IMAGE_TAG}"" \
+      --fromImage "$domainHomeImageBase" \
+      --tag "${BUILD_IMAGE_TAG}" \
       --wdtModel ${scriptDir}/topology.yaml \
-      --wdtVariables ${domainPropertiesOutput} \
+      --wdtVariables "${domainPropertiesOutput}" \
       --wdtOperation CREATE \
       --wdtVersion ${WDT_VERSION} \
       --wdtDomainHome $domainHome --chown=oracle:root