Skip to content

Commit 3b22d7b

Browse files
deboghosdeboghos
authored
WCContent Kubernetes release 22.4.1 (#139)
1 parent 0b3af82 commit 3b22d7b

File tree

166 files changed

+18361
-1425
lines changed

Some content is hidden

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

166 files changed

+18361
-1425
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
WebLogic 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 [22.2.3](https://github.com/oracle/fmw-kubernetes/releases).
6+
The current supported production release is [22.4.1](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/ingress-per-domain/Chart.yaml‎ renamed to ‎OracleWebCenterContent/kubernetes/charts/ingress-per-domain/Chart.yaml‎

File renamed without changes.

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

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
{{- if eq .Values.type "NGINX" }}
5+
---
6+
apiVersion: networking.k8s.io/v1
7+
kind: Ingress
8+
metadata:
9+
name: {{ .Values.wlsDomain.domainUID }}-nginx
10+
namespace: {{ .Release.Namespace }}
11+
12+
annotations:
13+
kubernetes.io/ingress.class: nginx
14+
nginx.ingress.kubernetes.io/affinity: "cookie"
15+
nginx.ingress.kubernetes.io/affinity-mode: persistent
16+
{{- if eq .Values.tls "SSL" }}
17+
nginx.ingress.kubernetes.io/configuration-snippet: |
18+
more_set_input_headers "X-Forwarded-Proto: https";
19+
more_set_input_headers "WL-Proxy-SSL: true";
20+
nginx.ingress.kubernetes.io/ingress.allow-http: "false"
21+
{{- end }}
22+
spec:
23+
rules:
24+
- host: '{{ .Values.nginx.hostname }}'
25+
http:
26+
paths:
27+
- path: /console
28+
pathType: ImplementationSpecific
29+
backend:
30+
service:
31+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
32+
port:
33+
number: {{ .Values.wlsDomain.adminServerPort }}
34+
- path: /em
35+
pathType: ImplementationSpecific
36+
backend:
37+
service:
38+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
39+
port:
40+
number: {{ .Values.wlsDomain.adminServerPort }}
41+
- path: /wls-exporter
42+
pathType: ImplementationSpecific
43+
backend:
44+
service:
45+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
46+
port:
47+
number: {{ .Values.wlsDomain.adminServerPort }}
48+
- path: /cs
49+
pathType: ImplementationSpecific
50+
backend:
51+
service:
52+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
53+
port:
54+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
55+
- path: /adfAuthentication
56+
pathType: ImplementationSpecific
57+
backend:
58+
service:
59+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
60+
port:
61+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
62+
- path: /_ocsh
63+
pathType: ImplementationSpecific
64+
backend:
65+
service:
66+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
67+
port:
68+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
69+
- path: /_dav
70+
pathType: ImplementationSpecific
71+
backend:
72+
service:
73+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
74+
port:
75+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
76+
- path: /idcws
77+
pathType: ImplementationSpecific
78+
backend:
79+
service:
80+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
81+
port:
82+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
83+
- path: /idcnativews
84+
pathType: ImplementationSpecific
85+
backend:
86+
service:
87+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
88+
port:
89+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
90+
- path: /wsm-pm
91+
pathType: ImplementationSpecific
92+
backend:
93+
service:
94+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
95+
port:
96+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
97+
- path: /ibr
98+
pathType: ImplementationSpecific
99+
backend:
100+
service:
101+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
102+
port:
103+
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
104+
- path: /ibr/adfAuthentication
105+
pathType: ImplementationSpecific
106+
backend:
107+
service:
108+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
109+
port:
110+
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
111+
- path: /weblogic/ready
112+
pathType: ImplementationSpecific
113+
backend:
114+
service:
115+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
116+
port:
117+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
118+
- path: /imaging
119+
pathType: ImplementationSpecific
120+
backend:
121+
service:
122+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ipmClusterName | lower | replace "_" "-" }}'
123+
port:
124+
number: {{ .Values.wlsDomain.ipmManagedServerPort }}
125+
- path: /dc-console
126+
pathType: ImplementationSpecific
127+
backend:
128+
service:
129+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
130+
port:
131+
number: {{ .Values.wlsDomain.captureManagedServerPort }}
132+
- path: /dc-client
133+
pathType: ImplementationSpecific
134+
backend:
135+
service:
136+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
137+
port:
138+
number: {{ .Values.wlsDomain.captureManagedServerPort }}
139+
- path: /wcc
140+
pathType: ImplementationSpecific
141+
backend:
142+
service:
143+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wccadfClusterName | lower | replace "_" "-" }}'
144+
port:
145+
number: {{ .Values.wlsDomain.wccadfManagedServerPort }}
146+
147+
{{- if eq .Values.tls "SSL" }}
148+
tls:
149+
- hosts:
150+
- '{{ .Values.nginx.hostnameorip }}'
151+
secretName: domain1-tls-cert
152+
{{- end }}
153+
154+
{{- end }}
155+

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

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
{{- if eq .Values.type "TRAEFIK" }}
5+
---
6+
apiVersion: networking.k8s.io/v1
7+
kind: Ingress
8+
metadata:
9+
name: {{ .Values.wlsDomain.domainUID }}-traefik
10+
namespace: {{ .Release.Namespace }}
11+
labels:
12+
weblogic.resourceVersion: domain-v2
13+
annotations:
14+
kubernetes.io/ingress.class: traefik
15+
{{- if eq .Values.tls "SSL" }}
16+
traefik.ingress.kubernetes.io/router.entrypoints: websecure
17+
traefik.ingress.kubernetes.io/router.tls: "true"
18+
traefik.ingress.kubernetes.io/router.middlewares: wccns-wls-proxy-ssl@kubernetescrd
19+
{{- end }}
20+
spec:
21+
rules:
22+
- host: '{{ .Values.traefik.hostname }}'
23+
http:
24+
paths:
25+
- path: /console
26+
pathType: ImplementationSpecific
27+
backend:
28+
service:
29+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
30+
port:
31+
number: {{ .Values.wlsDomain.adminServerPort }}
32+
- path: /em
33+
pathType: ImplementationSpecific
34+
backend:
35+
service:
36+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
37+
port:
38+
number: {{ .Values.wlsDomain.adminServerPort }}
39+
- path: /wls-exporter
40+
pathType: ImplementationSpecific
41+
backend:
42+
service:
43+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
44+
port:
45+
number: {{ .Values.wlsDomain.adminServerPort }}
46+
- path: /cs
47+
pathType: ImplementationSpecific
48+
backend:
49+
service:
50+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
51+
port:
52+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
53+
- path: /adfAuthentication
54+
pathType: ImplementationSpecific
55+
backend:
56+
service:
57+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
58+
port:
59+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
60+
- path: /_ocsh
61+
pathType: ImplementationSpecific
62+
backend:
63+
service:
64+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
65+
port:
66+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
67+
- path: /_dav
68+
pathType: ImplementationSpecific
69+
backend:
70+
service:
71+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
72+
port:
73+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
74+
- path: /idcws
75+
pathType: ImplementationSpecific
76+
backend:
77+
service:
78+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
79+
port:
80+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
81+
- path: /idcnativews
82+
pathType: ImplementationSpecific
83+
backend:
84+
service:
85+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
86+
port:
87+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
88+
- path: /wsm-pm
89+
pathType: ImplementationSpecific
90+
backend:
91+
service:
92+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
93+
port:
94+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
95+
- path: /ibr
96+
pathType: ImplementationSpecific
97+
backend:
98+
service:
99+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
100+
port:
101+
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
102+
- path: /ibr/adfAuthentication
103+
pathType: ImplementationSpecific
104+
backend:
105+
service:
106+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
107+
port:
108+
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
109+
- path: /weblogic/ready
110+
pathType: ImplementationSpecific
111+
backend:
112+
service:
113+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
114+
port:
115+
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
116+
- path: /imaging
117+
pathType: ImplementationSpecific
118+
backend:
119+
service:
120+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ipmClusterName | lower | replace "_" "-" }}'
121+
port:
122+
number: {{ .Values.wlsDomain.ipmManagedServerPort }}
123+
- path: /dc-console
124+
pathType: ImplementationSpecific
125+
backend:
126+
service:
127+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
128+
port:
129+
number: {{ .Values.wlsDomain.captureManagedServerPort }}
130+
- path: /dc-client
131+
pathType: ImplementationSpecific
132+
backend:
133+
service:
134+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
135+
port:
136+
number: {{ .Values.wlsDomain.captureManagedServerPort }}
137+
- path: /wcc
138+
pathType: ImplementationSpecific
139+
backend:
140+
service:
141+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wccadfClusterName | lower | replace "_" "-" }}'
142+
port:
143+
number: {{ .Values.wlsDomain.wccadfManagedServerPort }}
144+
145+
{{- if eq .Values.tls "SSL" }}
146+
tls:
147+
- hosts:
148+
- '{{ .Values.traefik.hostnameorip }}'
149+
secretName: domain1-tls-cert
150+
{{- end }}
151+
152+
{{- end }}
153+

‎OracleWebCenterContent/kubernetes/ingress-per-domain/tls/nginx-admin-tls.yaml‎ renamed to ‎OracleWebCenterContent/kubernetes/charts/ingress-per-domain/tls/nginx-admin-tls.yaml‎

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

5-
apiVersion: extensions/v1beta1
5+
apiVersion: networking.k8s.io/v1
66
kind: Ingress
77
metadata:
88
name: wcc-admin-ingress
@@ -20,8 +20,11 @@ spec:
2020
http:
2121
paths:
2222
- path:
23+
pathType: ImplementationSpecific
2324
backend:
24-
serviceName: wccinfra-adminserver-nginx-ssl
25-
servicePort: 7002
25+
service:
26+
name: wccinfra-adminserver-nginx-ssl
27+
port:
28+
number: 7002
2629

2730

‎OracleWebCenterContent/kubernetes/ingress-per-domain/tls/nginx-capture-tls.yaml‎ renamed to ‎OracleWebCenterContent/kubernetes/charts/ingress-per-domain/tls/nginx-capture-tls.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at
33
# https://oss.oracle.com/licenses/upl.
44

5-
apiVersion: extensions/v1beta1
5+
apiVersion: networking.k8s.io/v1
66
kind: Ingress
77
metadata:
88
name: wcc-capture-ingress
@@ -20,8 +20,11 @@ spec:
2020
http:
2121
paths:
2222
- path:
23+
pathType: ImplementationSpecific
2324
backend:
24-
serviceName: wccinfra-cluster-capture-cluster
25-
servicePort: 16401
25+
service:
26+
name: wccinfra-cluster-capture-cluster
27+
port:
28+
number: 16401
2629

2730

‎OracleWebCenterContent/kubernetes/ingress-per-domain/tls/nginx-ibr-tls.yaml‎ renamed to ‎OracleWebCenterContent/kubernetes/charts/ingress-per-domain/tls/nginx-ibr-tls.yaml‎

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

5-
apiVersion: extensions/v1beta1
5+
apiVersion: networking.k8s.io/v1
66
kind: Ingress
77
metadata:
88
name: wcc-ibr-ingress
@@ -20,8 +20,11 @@ spec:
2020
http:
2121
paths:
2222
- path:
23+
pathType: ImplementationSpecific
2324
backend:
24-
serviceName: wccinfra-cluster-ibr-cluster
25-
servicePort: 16251
25+
service:
26+
name: wccinfra-cluster-ibr-cluster
27+
port:
28+
number: 16251
2629

2730

0 commit comments

Comments
 (0)