merge 1427 into master

Author: markxnelson

docs-source/content/samples/simple/domains/soa-domain/_index.md

@@ -0,0 +1,29 @@
+# Oracle SOA on Kubernetes
+
+The WebLogic Kubernetes operator supports deployment of SOA Suite components such as Oracle Service-Oriented Architecture (SOA), Oracle Service Bus (OSB), and Oracle Enterprise Scheduler (ESS).
+
+Oracle SOA Suite is currently supported for non-production use only in Docker and Kubernetes.  The information provided
+in this document is a *preview* for early adopters who wish to experiment with Oracle SOA Suite in Kubernetes before
+it is supported for production use.
+
+In this release, SOA Suite domains are supported using the “domain on a persistent volume”
+[model](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/choosing-a-model/) only, where the domain home is located in a persistent volume (PV).
+
+The operator has several key features to assist you with deploying and managing SOA domains in a Kubernetes
+environment. You can:
+
+* Create SOA instances in a Kubernetes persistent volume. This persistent volume can reside in an NFS file system or other Kubernetes volume types.
+* Start servers based on declarative startup parameters and desired states.
+* Expose the SOA Services and Composites for external access.
+* Scale SOA domains by starting and stopping Managed Servers on demand, or by integrating with a REST API to initiate scaling based on WLDF, Prometheus, Grafana, or other rules.
+* Publish operator and WebLogic Server logs into Elasticsearch and interact with them in Kibana.
+* Monitor the SOA instance using Prometheus and Grafana.
+
+### Limitations
+
+Refer to the [User guide](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-fmw-domains/soa-suite/) for limitations in this release.
+
+### Getting started
+
+The fastest way to experience the operator is to follow the [User guide](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-fmw-domains/soa-suite/)
+or try out the deployment [scripts](https://oracle.github.io/weblogic-kubernetes-operator/samples/simple/domains/soa-domain/).

docs-source/content/userguide/managing-fmw-domains/soa-suite/_index.md

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 

kubernetes/samples/scripts/create-soa-domain/README.md

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 import os
@@ -317,6 +317,12 @@ def extendSoaDomain(self, domainHome, db, dbPrefix, dbPassword, exposeAdminT3Cha
         self.readAndApplyJRFTemplates(domainHome, db, dbPrefix, dbPassword, exposeAdminT3Channel, t3ChannelPublicAddress, t3ChannelPort)
         self.applySOATemplates()
         print 'Extension Templates added'
+        
+        if 'soa_server1' not in self.MANAGED_SERVERS:
+            print 'INFO: deleting soa_server1'
+            cd('/')
+            delete('soa_server1','Server')
+            print 'INFO: deleted soa_server1'
 
         self.configureJDBCTemplates(db,dbPrefix,dbPassword)
         self.configureXADataSources()
@@ -345,6 +351,12 @@ def extendSoaEssDomain(self, domainHome, db, dbPrefix, dbPassword, exposeAdminT3
         self.applySOAESSTemplates()
 
         print 'Extension Templates added'
+        
+        if 'soa_server1' not in self.MANAGED_SERVERS:
+            print 'INFO: deleting soa_server1'
+            cd('/')
+            delete('soa_server1','Server')
+            print 'INFO: deleted soa_server1'
 
         print 'Deleting ess_server1'
         cd('/')
@@ -378,6 +390,12 @@ def extendOsbDomain(self, domainHome, db, dbPrefix, dbPassword, exposeAdminT3Cha
         self.applyOSBTemplates()
         print 'Extension Templates added'
 
+        if 'osb_server1' not in self.ADDL_MANAGED_SERVERS:
+            print 'INFO: deleting osb_server1'
+            cd('/')
+            delete('osb_server1','Server')
+            print 'INFO: deleted osb_server1'
+
         self.configureJDBCTemplates(db,dbPrefix,dbPassword)
         cd('/JDBCSystemResources/SOADataSource/JdbcResource/SOADataSource')
         cd('JDBCDriverParams/NO_NAME_0')

kubernetes/samples/scripts/create-soa-domain/domain-home-on-pv/common/create-domain-job.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
@@ -39,7 +39,32 @@ function checkDomainSecret {
   fi
 }
 
-function prepareDomainHomeDir { 
+#
+# traceDirs before|after
+#   Trace contents and owner of DOMAIN_HOME/LOG_HOME/DATA_HOME directories
+#
+function traceDirs() {
+  echo "id = '`id`'"
+  local indir
+  for indir in DOMAIN_HOME_DIR DOMAIN_ROOT_DIR DOMAIN_LOGS_DIR; do
+    [ -z "${!indir}" ] && continue
+    echo "Directory trace for $indir=${!indir} ($1)"
+    local cnt=0
+    local odir=""
+    local cdir="${!indir}/*"
+    while [ ${cnt} -lt 30 ] && [ ! "$cdir" = "$odir" ]; do
+      echo "  ls -ld $cdir:"
+      ls -ld $cdir 2>&1 | sed 's/^/    /'
+      odir="$cdir"
+      cdir="`dirname "$cdir"`"
+      cnt=$((cnt + 1))
+    done
+  done
+}
+
+function prepareDomainHomeDir {
+  traceDirs before
+
   # Do not proceed if the domain already exists
   local domainFolder=${DOMAIN_HOME_DIR}
   if [ -d ${domainFolder} ]; then
@@ -51,5 +76,6 @@ function prepareDomainHomeDir {
   createFolder ${DOMAIN_LOGS_DIR}
   createFolder ${DOMAIN_ROOT_DIR}/applications
   createFolder ${DOMAIN_ROOT_DIR}/stores
-}
 
+  traceDirs after
+}

kubernetes/samples/scripts/create-soa-domain/domain-home-on-pv/common/createSOADomain.py

@@ -1,63 +1,80 @@
+# Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 apiVersion: v1
 kind: Service
 metadata:
-  name: soadb
-  labels:
-    app: soadb
-  namespace: soans
+  name: oracle-db
+  namespace: default
 spec:
   ports:
-  - port: 1521
-    name: server-port
-  - port: 5500
-    name: em-port
-  clusterIP: None
+  - name: tns
+    port: 1521
+    protocol: TCP
+    targetPort: 1521
+    nodePort: 30022
   selector:
-    app: soadb
+    app.kubernetes.io/instance: dev
+    app.kubernetes.io/name: oracle-db
+  sessionAffinity: None
+  type: LoadBalancer
 ---
-apiVersion: apps/v1beta1
-kind: StatefulSet
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: soadb
-  namespace: soans
+  name: oracle-db
+  namespace: default
 spec:
-  serviceName: "soadb"
   replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: dev
+      app.kubernetes.io/name: oracle-db
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
   template:
     metadata:
       labels:
-        app: soadb
+        app.kubernetes.io/instance: dev
+        app.kubernetes.io/name: oracle-db
     spec:
-      terminationGracePeriodSeconds: 30
       containers:
-      - name: soadb
-        image: oracle/database:12.2.0.1
-        imagePullPolicy: IfNotPresent
-        ports:
-        - containerPort: 1521
-          name: server-port
-        - containerPort: 5500
-          name: em-port
-        env:
+      - env:
         - name: DB_SID
-          value: soadb
+          value: devcdb
         - name: DB_PDB
-          value: soapdb
+          value: devpdb
         - name: DB_DOMAIN
-          value: my.domain.com
+          value: k8s
         - name: DB_BUNDLE
-          value: basic
-        readinessProbe:
-          exec:
-            command:
-            - grep
-            - "Done ! The database is ready for use ."
-            - "/home/oracle/setup/log/setupDB.log"
-          initialDelaySeconds: 300
-          periodSeconds: 5
+          value: basic  
+        image: container-registry.oracle.com/database/enterprise:12.2.0.1-slim
+        imagePullPolicy: IfNotPresent
+        name: oracle-db
+        ports:
+        - containerPort: 1521
+          name: tns
+          protocol: TCP
+        resources:
+          limits:
+            cpu: "2"
+            memory: "6Gi"
+          requests:
+            cpu: 500m
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /ORCL
           name: soadb-storage
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      imagePullSecrets:
+           - name: docker-store
       volumes:
       - name: soadb-storage
         persistentVolumeClaim:

kubernetes/samples/scripts/create-soa-domain/domain-home-on-pv/common/utility.sh

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # The version of this inputs file.  Do not modify.
@@ -108,7 +108,7 @@ javaOptions: -Dweblogic.StdoutDebugEnabled=false
 persistentVolumeClaimName: soainfra-domain-pvc
 
 # Mount path of the domain persistent volume.
-domainPVMountPath: /u01/oracle/user_projects/domains
+domainPVMountPath: /u01/oracle/user_projects
 
 # Mount path where the create domain scripts are located inside a pod
 #
@@ -166,7 +166,7 @@ createDomainFilesDir: wlst
 rcuSchemaPrefix: SOA1
 
 # The database URL
-rcuDatabaseURL: soadb.soans:1521/soapdb.my.domain.com
+rcuDatabaseURL: oracle-db.default.svc.cluster.local:1521/devpdb.k8s
 
 # The kubernetes secret containing the database credentials
 rcuCredentialsSecret: soainfra-rcu-credentials

kubernetes/samples/scripts/create-soa-domain/domain-home-on-pv/create-database/db-with-pv.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 apiVersion: batch/v1
 kind: Job