Oracle SOA Suite and Webcenter Sites release 23.2.2 - scripts and documentation updates (#168)

Author: ashageetha

OracleSOASuite/kubernetes/README.md

@@ -7,7 +7,7 @@ The WebLogic Kubernetes operator (the “operator”) supports deployment of Ora
 * `soaosb`: Deploys a domain with SOA, Oracle Enterprise Scheduler (ESS), and Oracle Service Bus
 
 ***
-The current supported production release is [23.1.2](https://github.com/oracle/fmw-kubernetes/releases).
+The current supported production release is [23.2.2](https://github.com/oracle/fmw-kubernetes/releases).
 ***
 
 In this release, Oracle SOA Suite domains are supported using the “domain on a persistent volume”

OracleSOASuite/kubernetes/charts/traefik/values.yaml

@@ -2,8 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 image:                                                                                                                                                                                                             
-  name: traefik                                                                                                                                                                                                    
-  tag: 2.6.0                                                                                                                                                                                                       
+  name: traefik                                                                                                                                                                                                       
   pullPolicy: IfNotPresent                                                                                                                                                                                         
 ingressRoute:                                                                                                                                                                                                      
   dashboard:                                                                                                                                                                                                       

OracleSOASuite/kubernetes/charts/weblogic-operator/Chart.yaml

@@ -1,10 +1,10 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1
 name: weblogic-operator
 description: Helm chart for configuring the WebLogic operator.
 
 type: application
-version: 4.0.4
-appVersion: 4.0.4
+version: 4.0.6
+appVersion: 4.0.6

OracleSOASuite/kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- define "operator.operatorDeployment" }}
@@ -34,9 +34,10 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ .serviceAccount | quote }}
-      {{- if .runAsUser }}
+      {{- if (ne ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
       securityContext:
-        runAsUser: {{ .runAsUser }}
+        seccompProfile:
+          type: RuntimeDefault
       {{- end }}
       {{- with .nodeSelector }}
       nodeSelector:
@@ -74,12 +75,16 @@ spec:
               fieldPath: "metadata.uid"
         - name: "OPERATOR_VERBOSE"
           value: "false"
-        - name: "JAVA_LOGGING_LEVEL"
-          value: {{ .javaLoggingLevel | quote }}
         {{- if .kubernetesPlatform }}
         - name: "KUBERNETES_PLATFORM"
           value: {{ .kubernetesPlatform | quote }}
         {{- end }}
+        {{- if and (hasKey . "enableRest") .enableRest }}
+        - name: "ENABLE_REST_ENDPOINT"
+          value: "true"
+        {{- end }}
+        - name: "JAVA_LOGGING_LEVEL"
+          value: {{ .javaLoggingLevel | quote }}
         - name: "JAVA_LOGGING_MAXSIZE"
           value: {{ .javaLoggingFileSizeLimit | default 20000000 | quote }}
         - name: "JAVA_LOGGING_COUNT"
@@ -109,15 +114,15 @@ spec:
             {{- if .memoryLimits}}
             memory: {{ .memoryLimits }}
             {{- end }}
-        {{- if (eq ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
         securityContext:
+          {{- if (ne ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
+          runAsUser: {{ .runAsUser | default 1000 }}
+          {{- end }}
+          runAsNonRoot: true
+          privileged: false
           allowPrivilegeEscalation: false
           capabilities:
             drop: ["ALL"]
-          runAsNonRoot: true
-          seccompProfile:
-            type: RuntimeDefault
-        {{- end }}
         volumeMounts:
         - name: "weblogic-operator-cm-volume"
           mountPath: "/deployment/config"
@@ -259,17 +264,18 @@ spec:
           {{- end }}
         spec:
           serviceAccountName: {{ .serviceAccount | quote }}
-          {{- if .runAsUser }}
+          {{- if (ne ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
           securityContext:
-            runAsUser: {{ .runAsUser }}
+            seccompProfile:
+              type: RuntimeDefault
           {{- end }}
           {{- with .nodeSelector }}
           nodeSelector:
-            {{- toYaml . | nindent 8 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- with .affinity }}
           affinity:
-            {{- toYaml . | nindent 8 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           containers:
           - name: "weblogic-operator-webhook"
@@ -320,15 +326,15 @@ spec:
                 {{- if .memoryLimits}}
                 memory: {{ .memoryLimits }}
                 {{- end }}
-            {{- if (eq ( .kubernetesPlatform | default "Generic") "OpenShift") }}
             securityContext:
+              {{- if (ne ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
+              runAsUser: {{ .runAsUser | default 1000 }}
+              {{- end }}
+              runAsNonRoot: true
+              privileged: false
               allowPrivilegeEscalation: false
               capabilities:
-                 drop: ["ALL"]
-              runAsNonRoot: true
-              seccompProfile:
-                type: RuntimeDefault
-            {{- end }}
+                drop: ["ALL"]
             volumeMounts:
             - name: "weblogic-webhook-cm-volume"
               mountPath: "/deployment/config"

OracleSOASuite/kubernetes/charts/weblogic-operator/templates/_operator-external-svc.tpl

@@ -1,8 +1,8 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- define "operator.operatorExternalService" }}
-{{- if or .externalRestEnabled .remoteDebugNodePortEnabled }}
+{{- if or (and (hasKey . "enableRest") .enableRest .externalRestEnabled) .remoteDebugNodePortEnabled }}
 ---
 apiVersion: "v1"
 kind: "Service"

OracleSOASuite/kubernetes/charts/weblogic-operator/templates/_operator-internal-svc.tpl

@@ -1,7 +1,8 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- define "operator.operatorInternalService" }}
+{{- if and (hasKey . "enableRest") .enableRest }}
 ---
 apiVersion: "v1"
 kind: "Service"
@@ -21,6 +22,7 @@ spec:
     - port: 8083
       name: "metrics"
       appProtocol: http
+{{- end }}
 ---
 {{- if not .operatorOnly }}
 apiVersion: "v1"

OracleSOASuite/kubernetes/charts/weblogic-operator/values.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # serviceAccount specifies the name of the ServiceAccount in the operator's namespace that the
@@ -54,7 +54,7 @@ domainNamespaceSelectionStrategy: LabelSelector
 enableClusterRoleBinding: true
 
 # image specifies the container image containing the operator.
-image: "ghcr.io/oracle/weblogic-kubernetes-operator:4.0.4"
+image: "ghcr.io/oracle/weblogic-kubernetes-operator:4.0.6"
 
 # imagePullPolicy specifies the image pull policy for the operator's container image.
 imagePullPolicy: IfNotPresent
@@ -69,9 +69,13 @@ imagePullPolicy: IfNotPresent
 # imagePullSecrets:
 # - name: "my-operator-secret"
 
+# enableRest specifies whether the operator's REST interface is enabled. Beginning with version 4.0.5,
+# the REST interface will be disabled by default.
+# enableRest: true
+
 # externalRestEnabled specifies whether the operator's REST interface is exposed
 # outside the Kubernetes cluster on the port specified by the 'externalRestHttpsPort'
-# property.
+# property. Ignored if 'enableRest' is not true.
 #
 # If set to true, then the customer must provide the SSL certificate and private key for
 # the operator's external REST interface by specifying the 'externalOperatorCert' and

OracleSOASuite/kubernetes/common/utility.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
@@ -855,7 +855,7 @@ checkPodDelete() {
 checkPodState() {
 
  status="NotReady"
- max=60
+ max=120
  count=1
 
  pod=$1
@@ -880,7 +880,7 @@ checkPodState() {
   count=`expr $count + 1`
  done
  if [ $count -gt $max ] ; then
-   echo "[ERROR] Unable to start the Pod [$pod] after 300s "; 
+   echo "[ERROR] Unable to start the Pod [$pod] after 600s ";
    exit 1
  fi 
 

OracleSOASuite/kubernetes/create-soa-domain/domain-home-on-pv/create-domain.sh

@@ -227,11 +227,17 @@ function createDomainHome {
       sed -i "0,/  clusterName: ${soaClusterName}/s//  clusterName: ${osbClusterName}/" ${dcrOutput}
 
       sed -i -e "/  clusterName:/a ${PRECREATE_SERVICE}" ${dcrOutput}
-    else
+    elif [ "${domainType}" = "soa" ]; then
       sed -i "0,/  name: ${domainUID}-${soaClusterName}/s//  name: ${domainUID}-$(toDNS1123Legal ${soaClusterName})/" ${dcrOutput}
       sed -i "0,/- name: ${domainUID}-${soaClusterName}/s//- name: ${domainUID}-$(toDNS1123Legal ${soaClusterName})/" ${dcrOutput}
       sed -i -e "/  clusterName:/a ${PRECREATE_SERVICE}" ${dcrOutput}
-    fi
+    elif [ "${domainType}" = "osb" ]; then
+      sed -i "0,/  name: ${domainUID}-${osbClusterName}/s//  name: ${domainUID}-$(toDNS1123Legal ${osbClusterName})/" ${dcrOutput}
+      sed -i "0,/- name: ${domainUID}-${osbClusterName}/s//- name: ${domainUID}-$(toDNS1123Legal ${osbClusterName})/" ${dcrOutput}
+      sed -i -e "/  clusterName:/a ${PRECREATE_SERVICE}" ${dcrOutput}
+    else
+	    echo "No Matching ${domainType}"
+    fi   
     # set MemoryMetricEnabled=false for SOA and OSB clusters
     if [ "${domainType}" = "osb" ]; then
       sed -i -e "s/%MemoryMetricEnabled%/-Doracle.sb.tracking.resiliency.MemoryMetricEnabled=false /" ${dcrOutput}
@@ -244,6 +250,8 @@ function createDomainHome {
   else
     echo "domainType not defined. Setting it to soa by default"
     sed -i -e "s:%DOMAIN_TYPE%:soa:g" ${createJobOutput}
+    sed -i "0,/  name: ${domainUID}-${soaClusterName}/s//  name: ${domainUID}-$(toDNS1123Legal ${soaClusterName})/" ${dcrOutput}
+    sed -i "0,/- name: ${domainUID}-${soaClusterName}/s//- name: ${domainUID}-$(toDNS1123Legal ${soaClusterName})/" ${dcrOutput}
     sed -i -e "/  clusterName:/a ${PRECREATE_SERVICE}" ${dcrOutput}
     sed -i -e "s/%MemoryMetricEnabled%/-Doracle.soa.tracking.resiliency.MemoryMetricEnabled=false /" ${dcrOutput}
   fi