Skip to content

Commit 6d46b7a

Browse files
authored
Release 21.2.3 - bug fixes and documentation updates over last release (#60)
1 parent 9bac55d commit 6d46b7a

File tree

396 files changed

+85073
-67
lines changed

Some content is hidden

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

396 files changed

+85073
-67
lines changed

OracleWebCenterContent/kubernetes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The Oracle WebLogic Server Kubernetes Operator (the “operator”) supports deployment of Oracle WebCenter Content servers such as Oracle WebCenter Content Server and Oracle WebCenter Inbound Refinery Server.
44

55
***
6-
The current supported production release is [21.1.2](https://github.com/oracle/fmw-kubernetes/releases).
6+
The current supported production release is [21.2.3](https://github.com/oracle/fmw-kubernetes/releases).
77
***
88

99
In this release, Oracle WebCenter Content domain is supported using the “domain on a persistent volume”

OracleWebCenterContent/kubernetes/create-wcc-domain/domain-home-on-pv/create-domain-inputs.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,11 @@ createDomainFilesDir: wlst
173173
rcuSchemaPrefix: <your_schema_prefix>
174174

175175
# The database URL
176-
rcuDatabaseURL: <your_db_host>:1521:<your_db_service>
176+
rcuDatabaseURL: <your_db_host>:<your_db_port>/<your_db_service>
177177

178178
# The kubernetes secret containing the database credentials
179179
rcuCredentialsSecret: wccinfra-rcu-credentials
180180

181+
# Provide LoadBalancer Type
182+
# # Legal values are "traefik", "nginx" and "voyager"
183+
loadBalancerType: traefik

OracleWebCenterContent/kubernetes/create-wcc-domain/domain-home-on-pv/create-domain.sh

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,13 @@ function createDomainHome {
212212
JOB_NAME="${domainUID}-${CONTAINER_NAME}"
213213
deleteK8sObj job $JOB_NAME ${createJobOutput}
214214

215-
# testing for ibr cluster
216215
cp ${dcrOutput} ${dcrOutput}.bak
217216
export PRECREATE_SERVICE="\ \serverService:\n\
218217
precreateService: true"
219218

220-
219+
# override JVM max heap size from 512m to 1024m
220+
sed -i "s/-Xmx512m/-Xmx1024m/" ${dcrOutput}
221+
221222
# Appends new cluster and update cluster name to ibr_cluster
222223
sed -n '/- clusterName:/,/# replicas: /{p}' ${dcrOutput} >> ${dcrOutput}
223224
sed -i "0,/- clusterName: ${clusterName}/s//- clusterName: ibr_cluster/" ${dcrOutput}
@@ -227,6 +228,24 @@ function createDomainHome {
227228
sed -i "0,/- ${clusterName}/s//- ibr_cluster/" ${dcrOutput}
228229
sed -i -e "/- clusterName:/a ${PRECREATE_SERVICE}" ${dcrOutput}
229230

231+
#Traefik sticky session Setting
232+
echo "loadBalancerType= $loadBalancerType"
233+
234+
if [ -z "$loadBalancerType" ]
235+
then
236+
echo "\$loadBalancerType is empty"
237+
else
238+
echo "\$loadBalancerType is NOT empty"
239+
if [ $loadBalancerType == "traefik" ] ; then
240+
export LB_SETTINGS="\ clusterService:\n\
241+
annotations: \n\
242+
traefik.ingress.kubernetes.io/affinity: \"true\"\n\
243+
traefik.ingress.kubernetes.io/service.sticky.cookie: \"true\"\n\
244+
traefik.ingress.kubernetes.io/session-cookie-name: JSESSIONID"
245+
fi
246+
sed -i -e "/clusterName: ${clusterName}/a ${LB_SETTINGS}" ${dcrOutput}
247+
fi
248+
230249
echo Creating the domain by creating the job ${createJobOutput}
231250
kubectl create -f ${createJobOutput}
232251

OracleWebCenterContent/kubernetes/create-wcc-domain/domain-home-on-pv/start-managed-servers-wrapper.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ hostname=`echo $hostname | sed 's/^[[:space:]]*//'`
134134
hostalias=`echo $hostname | sed 's/[.]//g'`
135135
truncatedhostname=${hostalias}
136136

137-
if [ ${#truncatedhostname} -gt "20" ]
137+
if [ ${#truncatedhostname} -ge "15" ]
138138
then
139-
truncatedhostname=${truncatedhostname:0:10}
139+
truncatedhostname=${truncatedhostname:0:14}
140140
fi
141141

142142
sed -i "s/@UCM_PORT@/$UCM_PORT/g" autoinstall.cfg.cs
@@ -158,10 +158,10 @@ kubectl cp autoinstall.cfg.ibr $domainNS/$domainUID-ibr-server1:/u01/oracle/use
158158
#expose service for IBR intradoc port
159159
ip_addr=`hostname -i`
160160

161-
kubectl expose service/wccinfra-cluster-ibr-cluster --name wccinfra-cluster-ibr-cluster-ext --port=5555 --target-port=5555 --external-ip=$ip_addr -n $domainNS
161+
kubectl expose service/wccinfra-cluster-ibr-cluster --name wccinfra-cluster-ibr-cluster-ext --port=$IBRIntradocPort --target-port=$IBRIntradocPort --external-ip=$ip_addr -n $domainNS
162162

163163
kubectl get service/wccinfra-cluster-ibr-cluster-ext -n $domainNS -o yaml > wccinfra-cluster-ibr-cluster-ext.yaml
164-
sed -i '0,/5555/s//16250/' wccinfra-cluster-ibr-cluster-ext.yaml
164+
sed -i "0,/$IBRIntradocPort/s//16250/" wccinfra-cluster-ibr-cluster-ext.yaml
165165
kubectl -n $domainNS apply -f wccinfra-cluster-ibr-cluster-ext.yaml
166166

167167
#STOP
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
### Create or update an Oracle WebCenter Content Docker image using the Oracle WebLogic Image Tool
22

3-
For the release 21.1.2, follow the instructions in this [document](https://oracle.github.io/fmw-kubernetes/wccontent-domains/create-or-update-image/#create-an-image) to create or update an Oracle WebCenter Content Docker image using the Oracle WebLogic Image Tool.
3+
For the release 21.2.3, follow the instructions in this [document](https://oracle.github.io/fmw-kubernetes/wccontent-domains/create-or-update-image/#create-an-image) to create or update an Oracle WebCenter Content Docker image using the Oracle WebLogic Image Tool.

OracleWebCenterContent/kubernetes/imagetool-scripts/additionalBuildCmds.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package-manager-packages]
2-
libaio tar procps hostname zip unzip
2+
hostname
33

44
[final-build-commands]
55

OracleWebCenterContent/kubernetes/ingress-per-domain/templates/nginx-ingress.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ metadata:
1111

1212
annotations:
1313
kubernetes.io/ingress.class: nginx
14+
nginx.ingress.kubernetes.io/affinity: "cookie"
15+
nginx.ingress.kubernetes.io/affinity-mode: persistent
1416
{{- if eq .Values.tls "SSL" }}
1517
nginx.ingress.kubernetes.io/configuration-snippet: |
1618
more_set_input_headers "X-Forwarded-Proto: https";
@@ -30,6 +32,10 @@ spec:
3032
backend:
3133
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
3234
servicePort: {{ .Values.wlsDomain.adminServerPort }}
35+
- path: /wls-exporter
36+
backend:
37+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
38+
servicePort: {{ .Values.wlsDomain.adminServerPort }}
3339
- path: /cs
3440
backend:
3541
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
@@ -42,6 +48,22 @@ spec:
4248
backend:
4349
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
4450
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
51+
- path: /_dav
52+
backend:
53+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
54+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
55+
- path: /idcws
56+
backend:
57+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
58+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
59+
- path: /idcnativews
60+
backend:
61+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
62+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
63+
- path: /wsm-pm
64+
backend:
65+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
66+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
4567
- path: /ibr
4668
backend:
4769
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'

OracleWebCenterContent/kubernetes/ingress-per-domain/templates/traefik-ingress.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@ spec:
4646
backend:
4747
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
4848
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
49+
- path: /_dav
50+
backend:
51+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
52+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
53+
- path: /idcws
54+
backend:
55+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
56+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
57+
- path: /idcnativews
58+
backend:
59+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
60+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
61+
- path: /wsm-pm
62+
backend:
63+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
64+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
4965
- path: /ibr
5066
backend:
5167
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'

OracleWebCenterContent/kubernetes/ingress-per-domain/templates/voyager-ingress.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ spec:
3939
backend:
4040
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
4141
servicePort: {{ .Values.wlsDomain.adminServerPort }}
42+
- path: /wls-exporter
43+
backend:
44+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
45+
servicePort: {{ .Values.wlsDomain.adminServerPort }}
4246
- path: /cs
4347
backend:
4448
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
@@ -51,6 +55,22 @@ spec:
5155
backend:
5256
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
5357
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
58+
- path: /_dav
59+
backend:
60+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
61+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
62+
- path: /idcws
63+
backend:
64+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
65+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
66+
- path: /idcnativews
67+
backend:
68+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
69+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
70+
- path: /wsm-pm
71+
backend:
72+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
73+
servicePort: {{ .Values.wlsDomain.ucmManagedServerPort }}
5474
- path: /ibr
5575
backend:
5676
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Copyright (c) 2021, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at
3+
# https://oss.oracle.com/licenses/upl.
4+
5+
apiVersion: extensions/v1beta1
6+
kind: Ingress
7+
metadata:
8+
name: wcc-admin-ingress
9+
namespace: wccns
10+
annotations:
11+
kubernetes.io/ingress.class: nginx
12+
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
13+
spec:
14+
tls:
15+
- hosts:
16+
- 'your_host_name'
17+
secretName: domain1-tls-cert
18+
rules:
19+
- host: 'your_host_name'
20+
http:
21+
paths:
22+
- path:
23+
backend:
24+
serviceName: wccinfra-adminserver-nginx-ssl
25+
servicePort: 7002
26+
27+

0 commit comments

Comments
 (0)