Skip to content

Commit

Permalink
Oracle SOA Suite script and documentation changes for release 23.4.2 (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
ashageetha authored Dec 5, 2023
1 parent c0078cf commit 922edbb
Show file tree
Hide file tree
Showing 209 changed files with 445,999 additions and 89,558 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}-nginx-ssl'
port:
number: {{ .Values.wlsDomain.adminServerSSLPort }}
{{- if or (eq .Values.domainType "soa") (eq .Values.domainType "soaosb") }}
Expand Down
Original file line number Diff line number Diff line change
@@ -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.operatorConfigMap" }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ spec:
affinity:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .tolerations }}
tolerations:
{{- toYaml . | nindent 12 }}
{{- end }}
containers:
- name: "weblogic-operator-webhook"
image: {{ .image | quote }}
Expand Down
4 changes: 2 additions & 2 deletions OracleSOASuite/kubernetes/common/utility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -969,11 +969,11 @@ getPodName() {
detectPod() {
ns=$1
startSecs=$SECONDS
maxWaitSecs=10
maxWaitSecs=120
while [ -z "`${KUBERNETES_CLI:-kubectl} get pod -n ${ns} -o jsonpath={.items[0].metadata.name}`" ]; do
if [ $((SECONDS - startSecs)) -lt $maxWaitSecs ]; then
echo "Pod not found after $((SECONDS - startSecs)) seconds, retrying ..."
sleep 2
sleep 5
else
echo "[Error] Could not find Pod after $((SECONDS - startSecs)) seconds"
exit 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
# Copyright (c) 2020, 2023, Oracle 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.
Expand Down Expand Up @@ -40,7 +40,7 @@ serverStartPolicy: IfNeeded
configuredManagedServerCount: 5

# Number of managed servers to initially start for the domain
initialManagedServerReplicas: 2
initialManagedServerReplicas: 1

# BEGIN: Configuration for SOA cluster
# Below values applicable only for the domain types soa and soaosb
Expand Down
9 changes: 5 additions & 4 deletions OracleSOASuite/kubernetes/domain-lifecycle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,19 @@ $ waitForDomain.sh -n my-namespace -d my-domain -p 0
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.
The script launches a Kubernetes pod named 'pvhelper' using the provided persistent volume claim name and the mount path.
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.
Use the 'kubectl delete pvhelper -n <namespace>' command to delete the Pod after it's no longer needed.
Use the 'kubectl delete pod pvhelper -n <namespace>' command to delete the Pod after it's no longer needed.

Use the following command for script usage:

```
$ domain-on-pv-helper.sh -h
$ pv-pvc-helper.sh -h
```

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

```
$ domain-on-pv-helper.sh -n sample-domain1-ns -c sample-domain1-weblogic-sample-pvc -m /shared
$ pv-pvc-helper.sh -n sample-domain1-ns -c sample-domain1-weblogic-sample-pvc -m /shared -r
```

After the Pod is created, use the following command to get a shell to the running pod container.
Expand Down
3 changes: 2 additions & 1 deletion docs-source/content/soa-domains/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The operator has several key features to assist you with deploying and managing

#### Current production release

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).
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).


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

To view documentation for an earlier release, see:

* [Version 23.3.2](https://oracle.github.io/fmw-kubernetes/23.3.2/soa-domains/)
* [Version 23.2.2](https://oracle.github.io/fmw-kubernetes/23.2.2/soa-domains/)
* [Version 23.1.2](https://oracle.github.io/fmw-kubernetes/23.1.2/soa-domains/)
* [Version 22.4.2](https://oracle.github.io/fmw-kubernetes/22.4.2/soa-domains/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Refer to the [sample](https://github.com/oracle/docker-images/tree/main/OracleWe

{{% /expand %}}

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.
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.

#### Prepare the certificate and private key

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ Follow these steps to set up NGINX as a load balancer for an Oracle SOA Suite do
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`.
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`.

> 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.
> 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.

```bash
$ cd ${WORKDIR}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Sample values for default configuration are shown in the file `${WORKDIR}/charts
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).
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`.

> 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.
> 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.

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ After the Oracle SOA Suite domain is set up, you can:
Using the `WebLogic Monitoring Exporter` you can scrape runtime information from a running Oracle SOA Suite instance and monitor them using Prometheus and Grafana.

#### Set up monitoring
Follow [these steps](https://github.com/oracle/fmw-kubernetes/blob/v23.3.2/OracleSOASuite/kubernetes/monitoring-service/README.md) to set up monitoring for an Oracle SOA Suite instance. For more details on WebLogic Monitoring Exporter, see [here](https://github.com/oracle/weblogic-monitoring-exporter).
Follow [these steps](https://github.com/oracle/fmw-kubernetes/blob/v23.4.2/OracleSOASuite/kubernetes/monitoring-service/README.md) to set up monitoring for an Oracle SOA Suite instance. For more details on WebLogic Monitoring Exporter, see [here](https://github.com/oracle/weblogic-monitoring-exporter).

### Publish WebLogic Server logs into Elasticsearch

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,23 +451,23 @@ Refer to the official [documentation](https://kubernetes.io/docs/setup/#producti
1. Create a working directory to set up the source code:
```bash
$ mkdir $HOME/soa_23.3.2
$ cd $HOME/soa_23.3.2
$ mkdir $HOME/soa_23.4.2
$ cd $HOME/soa_23.4.2
```
1. Download the WebLogic Kubernetes Operator source code and Oracle SOA Suite Kubernetes deployment scripts from the SOA [repository](https://github.com/oracle/fmw-kubernetes.git). Required artifacts are available at `OracleSOASuite/kubernetes`.
``` bash
$ git clone https://github.com/oracle/fmw-kubernetes.git
$ export WORKDIR=$HOME/soa_23.3.2/fmw-kubernetes/OracleSOASuite/kubernetes
$ export WORKDIR=$HOME/soa_23.4.2/fmw-kubernetes/OracleSOASuite/kubernetes
```
#### 3.2 Get required Docker images and add them to your local registry
1. Pull the WebLogic Kubernetes Operator image:
```shell
$ docker pull ghcr.io/oracle/weblogic-kubernetes-operator:4.1.0
$ docker pull ghcr.io/oracle/weblogic-kubernetes-operator:4.1.4
```
1. Obtain the Oracle Database image and Oracle SOA Suite Docker image from the [Oracle Container Registry](https://container-registry.oracle.com):
Expand Down Expand Up @@ -515,7 +515,7 @@ Use Helm to install and start the operator from the directory you just cloned:
$ cd ${WORKDIR}
$ helm install weblogic-kubernetes-operator charts/weblogic-operator \
--namespace opns \
--set image=ghcr.io/oracle/weblogic-kubernetes-operator:4.1.0 \
--set image=ghcr.io/oracle/weblogic-kubernetes-operator:4.1.4 \
--set serviceAccount=op-sa \
--wait
```
Expand All @@ -532,7 +532,7 @@ $ helm install weblogic-kubernetes-operator charts/weblogic-operator \
$ kubectl logs -n opns -c weblogic-operator deployments/weblogic-operator
```
The WebLogic Kubernetes Operator v4.1.0 has been installed. Continue with the load balancer and Oracle SOA Suite domain setup.
The WebLogic Kubernetes Operator v4.1.4 has been installed. Continue with the load balancer and Oracle SOA Suite domain setup.
### 5. Install the Traefik (ingress-based) load balancer
Expand Down
Loading

0 comments on commit 922edbb

Please sign in to comment.