Skip to content

Commit 922edbb

Browse files
authored
Oracle SOA Suite script and documentation changes for release 23.4.2 (#187)
1 parent c0078cf commit 922edbb

File tree

209 files changed

+445999
-89558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+445999
-89558
lines changed

OracleSOASuite/kubernetes/charts/ingress-per-domain/templates/nginx-ingress-e2essl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
pathType: ImplementationSpecific
4444
backend:
4545
service:
46-
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
46+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}-nginx-ssl'
4747
port:
4848
number: {{ .Values.wlsDomain.adminServerSSLPort }}
4949
{{- if or (eq .Values.domainType "soa") (eq .Values.domainType "soaosb") }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
1+
# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
{{- define "operator.operatorConfigMap" }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,10 @@ spec:
285285
affinity:
286286
{{- toYaml . | nindent 12 }}
287287
{{- end }}
288+
{{- with .tolerations }}
289+
tolerations:
290+
{{- toYaml . | nindent 12 }}
291+
{{- end }}
288292
containers:
289293
- name: "weblogic-operator-webhook"
290294
image: {{ .image | quote }}

OracleSOASuite/kubernetes/common/utility.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,11 +969,11 @@ getPodName() {
969969
detectPod() {
970970
ns=$1
971971
startSecs=$SECONDS
972-
maxWaitSecs=10
972+
maxWaitSecs=120
973973
while [ -z "`${KUBERNETES_CLI:-kubectl} get pod -n ${ns} -o jsonpath={.items[0].metadata.name}`" ]; do
974974
if [ $((SECONDS - startSecs)) -lt $maxWaitSecs ]; then
975975
echo "Pod not found after $((SECONDS - startSecs)) seconds, retrying ..."
976-
sleep 2
976+
sleep 5
977977
else
978978
echo "[Error] Could not find Pod after $((SECONDS - startSecs)) seconds"
979979
exit 1

OracleSOASuite/kubernetes/create-soa-domain/domain-home-on-pv/create-domain-inputs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
# The version of this inputs file. Do not modify.
@@ -40,7 +40,7 @@ serverStartPolicy: IfNeeded
4040
configuredManagedServerCount: 5
4141

4242
# Number of managed servers to initially start for the domain
43-
initialManagedServerReplicas: 2
43+
initialManagedServerReplicas: 1
4444

4545
# BEGIN: Configuration for SOA cluster
4646
# Below values applicable only for the domain types soa and soaosb

OracleSOASuite/kubernetes/domain-lifecycle/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,18 +286,19 @@ $ waitForDomain.sh -n my-namespace -d my-domain -p 0
286286
Use this helper script for examining, changing permissions, or deleting the contents of the persistent volume (such as domain files or logs) for a WebLogic Domain on PV or Model in Image domain.
287287
The script launches a Kubernetes pod named 'pvhelper' using the provided persistent volume claim name and the mount path.
288288
You can run the 'kubectl exec' command to get a shell to the running pod container and run commands to examine or clean up the contents of shared directories on the persistent volume.
289-
Use the 'kubectl delete pvhelper -n <namespace>' command to delete the Pod after it's no longer needed.
289+
Use the 'kubectl delete pod pvhelper -n <namespace>' command to delete the Pod after it's no longer needed.
290290

291291
Use the following command for script usage:
292292

293293
```
294-
$ domain-on-pv-helper.sh -h
294+
$ pv-pvc-helper.sh -h
295295
```
296296

297-
The following is an example command to launch the helper pod with the PVC name `sample-domain1-weblogic-sample-pvc` and mount path `/shared`.
297+
The following is an example command to launch the helper pod with the PVC name `sample-domain1-weblogic-sample-pvc` and mount path `/shared`.
298+
Specifying the `-r` argument allows the script to run as the `root` user.
298299

299300
```
300-
$ domain-on-pv-helper.sh -n sample-domain1-ns -c sample-domain1-weblogic-sample-pvc -m /shared
301+
$ pv-pvc-helper.sh -n sample-domain1-ns -c sample-domain1-weblogic-sample-pvc -m /shared -r
301302
```
302303

303304
After the Pod is created, use the following command to get a shell to the running pod container.

docs-source/content/soa-domains/_index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The operator has several key features to assist you with deploying and managing
2525

2626
#### Current production release
2727

28-
The current production release for the Oracle SOA Suite domains deployment on Kubernetes is [23.3.2](https://github.com/oracle/fmw-kubernetes/releases). This release uses the WebLogic Kubernetes Operator version [4.1.0](https://github.com/oracle/weblogic-kubernetes-operator/releases/tag/v4.1.0).
28+
The current production release for the Oracle SOA Suite domains deployment on Kubernetes is [23.4.2](https://github.com/oracle/fmw-kubernetes/releases). This release uses the WebLogic Kubernetes Operator version [4.1.4](https://github.com/oracle/weblogic-kubernetes-operator/releases/tag/v4.1.4).
2929

3030

3131
#### Recent changes and known issues
@@ -64,6 +64,7 @@ please consult this table of contents:
6464

6565
To view documentation for an earlier release, see:
6666

67+
* [Version 23.3.2](https://oracle.github.io/fmw-kubernetes/23.3.2/soa-domains/)
6768
* [Version 23.2.2](https://oracle.github.io/fmw-kubernetes/23.2.2/soa-domains/)
6869
* [Version 23.1.2](https://oracle.github.io/fmw-kubernetes/23.1.2/soa-domains/)
6970
* [Version 22.4.2](https://oracle.github.io/fmw-kubernetes/22.4.2/soa-domains/)

docs-source/content/soa-domains/adminguide/configure-load-balancer/apache.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Refer to the [sample](https://github.com/oracle/docker-images/tree/main/OracleWe
133133

134134
{{% /expand %}}
135135

136-
1. Create a PV and PVC (pv-claim-name) that can be used to store the custom_mod_wl_apache.conf. Refer to the [Sample](https://github.com/oracle/weblogic-kubernetes-operator/blob/v4.1.0/kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/README.md) for creating a PV or PVC.
136+
1. Create a PV and PVC (pv-claim-name) that can be used to store the custom_mod_wl_apache.conf. Refer to the [Sample](https://github.com/oracle/weblogic-kubernetes-operator/blob/v4.1.4/kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/README.md) for creating a PV or PVC.
137137

138138
#### Prepare the certificate and private key
139139

docs-source/content/soa-domains/adminguide/configure-load-balancer/nginx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Follow these steps to set up NGINX as a load balancer for an Oracle SOA Suite do
202202
1. Create an ingress for the domain in the domain namespace by using the sample Helm chart. Here path-based routing is used for ingress. Sample values for default configuration are shown in the file `${WORKDIR}/charts/ingress-per-domain/values.yaml`. By default, `type` is `TRAEFIK` , `sslType` is `NONSSL`, and `domainType` is `soa`. These values can be overridden by passing values through the command line or can be edited in the sample file `values.yaml`.
203203
If needed, you can update the ingress YAML file to define more path rules (in section `spec.rules.host.http.paths`) based on the domain application URLs that need to be accessed. Update the template YAML file for the NGINX load balancer located at `${WORKDIR}/charts/ingress-per-domain/templates/nginx-ingress.yaml`.
204204

205-
> Note: See [here](https://github.com/oracle/fmw-kubernetes/blob/v23.3.2/OracleSOASuite/kubernetes/charts/ingress-per-domain/README.md#configuration) for all the configuration parameters.
205+
> Note: See [here](https://github.com/oracle/fmw-kubernetes/blob/v23.4.2/OracleSOASuite/kubernetes/charts/ingress-per-domain/README.md#configuration) for all the configuration parameters.
206206

207207
```bash
208208
$ cd ${WORKDIR}

docs-source/content/soa-domains/adminguide/configure-load-balancer/traefik.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Sample values for default configuration are shown in the file `${WORKDIR}/charts
156156
By default, `type` is `TRAEFIK`, `sslType` is `NONSSL`, and `domainType` is `soa`. These values can be overridden by passing values through the command line or can be edited in the sample file `values.yaml` based on the type of configuration (NONSSL, SSL, and E2ESSL).
157157
If needed, you can update the ingress YAML file to define more path rules (in section `spec.rules.host.http.paths`) based on the domain application URLs that need to be accessed. The template YAML file for the Traefik (ingress-based) load balancer is located at `${WORKDIR}/charts/ingress-per-domain/templates/traefik-ingress.yaml`.
158158

159-
> Note: See [here](https://github.com/oracle/fmw-kubernetes/blob/v23.3.2/OracleSOASuite/kubernetes/charts/ingress-per-domain/README.md#configuration) for all the configuration parameters.
159+
> Note: See [here](https://github.com/oracle/fmw-kubernetes/blob/v23.4.2/OracleSOASuite/kubernetes/charts/ingress-per-domain/README.md#configuration) for all the configuration parameters.
160160

161161
1. Choose an appropriate `LOADBALANCER_HOSTNAME` for accessing the Oracle SOA Suite domain application URLs.
162162

0 commit comments

Comments
 (0)