Merge branch 'fix-startdb-script' into 'main'

Fix startdb script and JRF sample

See merge request weblogic-cloud/weblogic-kubernetes-operator!5044

Author: rjeberhard

documentation/site/content/samples/domains/domain-home-on-pv/build-domain-creation-image.md

@@ -222,6 +222,8 @@ domainInfo:
         rcu_prefix: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_prefix@@'
         rcu_schema_password: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_schema_password@@'
         rcu_db_conn_string: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_db_conn_string@@'
+        rcu_admin_password: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:dba_password@@'
+        rcu_admin_user: sys
 
 topology:
     AdminServerName: 'admin-server'

documentation/site/content/samples/domains/domain-home-on-pv/prerequisites.md

@@ -127,7 +127,7 @@ To do this, follow the same steps as the [Quick Start](https://oracle.github.io/
    For more information on ingresses and load balancers, see [Ingress]({{< relref "/managing-domains/accessing-the-domain/ingress/_index.md" >}}).
 
 
-1. Obtain the WebLogic 12.2.1.4 image that is referenced by the sample's Domain resource YAML.
+1. Obtain the WebLogic 14.1.2.0 image that is referenced by the sample's Domain resource YAML.
 
    a. Use a browser to access the [Oracle Container Registry](http://container-registry.oracle.com).
 
@@ -169,11 +169,11 @@ A JRF domain requires an infrastructure database and requires initializing this
 | --------- | ----- |
 | database Kubernetes namespace | `default` |
 | database Kubernetes pod | `oracle-db` |
-| database image | `container-registry.oracle.com/database/enterprise:12.2.0.1-slim` |
+| database image | `container-registry.oracle.com/database/enterprise:19.3.0.0` |
 | database password | MY_DBA_PASSWORD |
 | infrastructure schema prefix | `FMW1` (for domain1) |
 | infrastructure schema password | MY_RCU_SCHEMA_PASSWORD |
-| database URL | `oracle-db.default.svc.cluster.local:1521/devpdb.k8s` |
+| database URL | `oracle-db.default.svc.cluster.local:1521/devpdb` |
 
 
 1. Ensure that you have access to the database image, and then create a deployment using it:
@@ -201,7 +201,7 @@ A JRF domain requires an infrastructure database and requires initializing this
      $ cd /tmp/weblogic-kubernetes-operator/kubernetes/samples/scripts/create-oracle-db-service
      ```
      ```shell
-     $ start-db-service.sh
+     $ start-db-service.sh -i container-registry.oracle.com/database/enterprise:19.3.0.0
      ```
 
      This script will deploy a database in the `default` namespace with the connect string `oracle-db.default.svc.cluster.local:1521/devpdb.k8s`, and administration password MY_DBA_PASSWORD.
@@ -231,6 +231,8 @@ For example, in this sample:
         rcu_prefix: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_prefix@@'
         rcu_schema_password: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_schema_password@@'
         rcu_db_conn_string: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_db_conn_string@@'
+        rcu_admin_password: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:dba_password@@'
+        rcu_admin_user: sys        
 ```
 
 For important JRF domain information, refer to [JRF domains]({{< relref "/managing-domains/domain-on-pv/jrf-domain.md" >}}).

documentation/site/content/samples/domains/domain-home-on-pv/sample.md

@@ -47,7 +47,7 @@ The sample uses a `domain creation image` with the name `wdt-domain-image:WLS-v1
 In this section, you will define the PV and PVC configuration and reference the `domain creation image` created earlier in the domain resource YAML file. You will then deploy the domain resource YAML file to the namespace `sample-domain1-ns`, including the following steps:
 
   - Create a Secret containing your WebLogic administrator user name and password.
-  - If your domain type is `JRF`, create secrets containing your RCU access URL, credentials, and prefix.
+  - If your domain type is `JRF`, create secrets containing your RCU access URL, credentials, prefix and DBA password.
   - Deploy a Domain YAML file that references the PV/PVC configuration and a `domain creation image` under the `spec.configuration.initializeDomainOnPV` section.
   - Wait for the PV and PVC to be created if they do not already exist.
   - Wait for domain's Pods to start and reach their ready state.
@@ -82,16 +82,18 @@ Run the following `kubectl` commands to deploy the required secrets:
 
   {{%expand "Click here for the commands for deploying additional secrets for JRF." %}}
 
-  **NOTE**: Replace `MY_RCU_SCHEMA_PASSWORD` with the RCU schema password
-  that you chose in the prequisite steps when
+  **NOTE**: Replace `MY_RCU_SCHEMA_PASSWORD` with the RCU schema password and `MY_DBA_PASSWORD` with the DBA password of the database
+  that you chose in the prerequisite steps when
   [setting up JRF]({{< relref "/samples/domains/domain-home-on-pv/prerequisites#additional-prerequisites-for-jrf-domains" >}}).
 
   ```shell
   $ kubectl -n sample-domain1-ns create secret generic \
     sample-domain1-rcu-access \
      --from-literal=rcu_prefix=FMW1 \
      --from-literal=rcu_schema_password=MY_RCU_SCHEMA_PASSWORD \
-     --from-literal=rcu_db_conn_string=oracle-db.default.svc.cluster.local:1521/devpdb.k8s
+     --from-literal=rcu_db_conn_string=oracle-db.default.svc.cluster.local:1521/devpdb \
+     --from-literal=dba_user=sys \
+     --from-literal=dba_password=MY_DBA_PASSWORD     
   ```
   ```shell
   $ kubectl -n sample-domain1-ns label  secret \

kubernetes/samples/scripts/create-oracle-db-service/common/oracle.db.19plus.yaml

@@ -44,13 +44,11 @@ spec:
       containers:
       - env:
         - name: ORACLE_SID
-          value: ORCLCDB
+          value: devcdb
         - name: ORACLE_PDB
-          value: ORCLPDB1
-        - name: DB_DOMAIN
-          value: k8s
-        - name: DB_BUNDLE
-          value: basic  
+          value: devpdb
+        - name: ORACLE_EDITION
+          value: standard
         - name: ORACLE_PWD
           valueFrom:
             secretKeyRef:

kubernetes/samples/scripts/create-oracle-db-service/start-db-service.sh

@@ -22,7 +22,6 @@ usage() {
   echo "      If this secret is not deployed, then Kubernetes will try pull anonymously."
   echo "  -n Configurable Kubernetes NameSpace for Oracle DB Service (optional)"
   echo "      (default: default) "
-  echo "  -l db pdb id for Oracle DB service (optional, default: devpdb.k8s)"
   echo "  -h Help"
   exit $1
 }
@@ -46,8 +45,6 @@ while getopts ":a:p:i:s:n:h:l:" opt; do
     ;;
     n) namespace="${OPTARG}"
     ;;
-    l) pdbid="${OPTARG}"
-    ;;
     h) usage 0
     ;;
     *) usage 1
@@ -67,20 +64,18 @@ fi
 
 echo "NodePort[$nodeport] ImagePullSecret[$pullsecret] Image[${dbimage}] NameSpace[${namespace}] SysSecret[${syssecret}]"
 
-#create unique db yaml file if does not exists
+#unique db yaml file holder
 dbYaml=${scriptDir}/common/oracle.db.${namespace}.yaml
 
-if [ ! -f "$dbYaml" ]; then
-    echo "$dbYaml does not exist."
-    # Choose template based on dbimage version
-    if echo "$dbimage" | grep -q "12\."; then
-        templateYaml="${scriptDir}/common/oracle.db.yaml"
-    else
-        templateYaml="${scriptDir}/common/oracle.db.19plus.yaml"
-    fi
-    echo "Using template: $templateYaml"
-    cp "$templateYaml" "$dbYaml"
+# Choose template based on dbimage version
+if echo "$dbimage" | grep -q "12\."; then
+    templateYaml="${scriptDir}/common/oracle.db.yaml"
+else
+    templateYaml="${scriptDir}/common/oracle.db.19plus.yaml"
+    pdbid="devpdb"
 fi
+echo "Using template: $templateYaml"
+cp "$templateYaml" "$dbYaml"
 
 
 # Modify ImagePullSecret and DatabaseImage based on input
@@ -141,10 +136,6 @@ if [ $counter -gt ${max} ]; then
  exit -1
 fi
 
-# for db 19c only
-echo " set sys password "
-${KUBERNETES_CLI:-kubectl} exec -it ${dbpod} -n ${namespace} -- /bin/bash setPassword.sh Oradoc_db1
-
 if [ $? != 0  ]; then
  echo "######################";
  echo "[ERROR] Could not create Oracle DB Service, check the pod log for pod ${dbpod} in namespace ${namespace}";

kubernetes/samples/scripts/create-weblogic-domain/wdt-artifacts/wdt-model-files/JRF-v1/model.10.yaml

@@ -10,7 +10,7 @@ domainInfo:
         rcu_schema_password: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_schema_password@@'
         rcu_db_conn_string: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_db_conn_string@@'
         rcu_admin_user: sys
-        rcu_admin_password: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_schema_password@@'
+        rcu_admin_password: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:dba_password@@'
 
 topology:
     AdminServerName: 'admin-server'