Skip to content

Commit e17cd65

Browse files
scbarikGITscbarikGIT
authored
Documentation changes for April CPU release (#111)
1 parent be498eb commit e17cd65

File tree

17 files changed

+634
-401
lines changed

17 files changed

+634
-401
lines changed

‎OracleWebCenterSites/kubernetes/create-wcsites-domain/ingress-per-domain/Chart.yaml‎ renamed to ‎OracleWebCenterSites/kubernetes/charts/ingress-per-domain/Chart.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
# Copyright (c) 2021, Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
23
#
3-
# Licensed under the Universal Permissive License v 1.0 as shown at
4-
# https://oss.oracle.com/licenses/upl
5-
64
apiVersion: v1
75
appVersion: "1.0"
86
description: A Helm chart to create an Ingress for a WLS domain.
9-
name: ingress-per-domain-wcsites
7+
name: ingress-per-domain
108
version: 0.1.0

‎OracleWebCenterSites/kubernetes/charts/ingress-per-domain/templates/nginx-ingress-k8s1.19.yaml‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
# Copyright (c) 2020, 2021, 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 semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
5+
{{- if eq .Values.type "NGINX" }}
6+
{{- if or (eq .Values.sslType "NONSSL") (eq .Values.sslType "SSL") }}
7+
---
8+
apiVersion: networking.k8s.io/v1
9+
kind: Ingress
10+
metadata:
11+
name: {{ .Values.wlsDomain.domainUID }}-nginx
12+
namespace: {{ .Release.Namespace }}
13+
annotations:
14+
kubernetes.io/ingress.class: 'nginx'
15+
nginx.ingress.kubernetes.io/proxy-connect-timeout: '{{ .Values.nginx.connectTimeout }}'
16+
nginx.ingress.kubernetes.io/proxy-read-timeout: '{{ .Values.nginx.readTimeout }}'
17+
nginx.ingress.kubernetes.io/proxy-send-timeout: '{{ .Values.nginx.sendTimeout }}'
18+
nginx.ingress.kubernetes.io/affinity: 'cookie'
19+
nginx.ingress.kubernetes.io/session-cookie-name: 'stickyid'
20+
nginx.ingress.kubernetes.io/session-cookie-expires: '{{ .Values.nginx.cookieExpires }}'
21+
nginx.ingress.kubernetes.io/session-cookie-max-age: '{{ .Values.nginx.cookieMaxAge }}'
22+
nginx.ingress.kubernetes.io/ssl-redirect: 'false'
23+
nginx.ingress.kubernetes.io/affinity-mode: 'persistent'
24+
{{- if eq .Values.sslType "SSL" }}
25+
{{- end }}
26+
spec:
27+
rules:
28+
- host: '{{ .Values.nginx.hostname }}'
29+
http:
30+
paths:
31+
- path: /console
32+
pathType: ImplementationSpecific
33+
backend:
34+
service:
35+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
36+
port:
37+
number: {{ .Values.wlsDomain.adminServerPort }}
38+
- path: /em
39+
pathType: ImplementationSpecific
40+
backend:
41+
service:
42+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
43+
port:
44+
number: {{ .Values.wlsDomain.adminServerPort }}
45+
- path: /wls-exporter
46+
pathType: ImplementationSpecific
47+
backend:
48+
service:
49+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
50+
port:
51+
number: {{ .Values.wlsDomain.adminServerPort }}
52+
- path: /weblogic
53+
pathType: ImplementationSpecific
54+
backend:
55+
service:
56+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
57+
port:
58+
number: {{ .Values.wlsDomain.adminServerPort }}
59+
- path: /sbconsole
60+
pathType: ImplementationSpecific
61+
backend:
62+
service:
63+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
64+
port:
65+
number: {{ .Values.wlsDomain.adminServerPort }}
66+
- path: /sites
67+
pathType: ImplementationSpecific
68+
backend:
69+
service:
70+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
71+
port:
72+
number: {{ .Values.wlsDomain.wcsitesManagedServerPort }}
73+
- path: /cas
74+
pathType: ImplementationSpecific
75+
backend:
76+
service:
77+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
78+
port:
79+
number: {{ .Values.wlsDomain.wcsitesManagedServerPort }}
80+
- path: /wls-exporter
81+
pathType: ImplementationSpecific
82+
backend:
83+
service:
84+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
85+
port:
86+
number: {{ .Values.wlsDomain.wcsitesManagedServerPort }}
87+
{{- if eq .Values.sslType "SSL" }}
88+
tls:
89+
- hosts:
90+
- '{{ .Values.nginx.hostname }}'
91+
secretName: {{ .Values.wlsDomain.domainUID }}-tls-cert
92+
{{- end }}
93+
{{- else }}
94+
---
95+
apiVersion: v1
96+
kind: Service
97+
metadata:
98+
name: {{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower }}-nginx-ssl
99+
namespace: {{ .Release.Namespace }}
100+
spec:
101+
ports:
102+
- port: {{ .Values.wlsDomain.adminServerSSLPort }}
103+
protocol: TCP
104+
targetPort: {{ .Values.wlsDomain.adminServerSSLPort }}
105+
selector:
106+
weblogic.domainUID: {{ .Values.wlsDomain.domainUID }}
107+
weblogic.serverName: {{ .Values.wlsDomain.adminServerName }}
108+
type: ClusterIP
109+
110+
---
111+
apiVersion: networking.k8s.io/v1
112+
kind: Ingress
113+
metadata:
114+
name: {{ .Values.wlsDomain.domainUID }}-nginx-e2essl-admin
115+
namespace: {{ .Release.Namespace }}
116+
annotations:
117+
spec:
118+
tls:
119+
- hosts:
120+
- '{{ .Values.hostName.admin }}'
121+
secretName: {{ .Values.wlsDomain.domainUID }}-tls-cert
122+
rules:
123+
- host: '{{ .Values.hostName.admin }}'
124+
http:
125+
paths:
126+
- path:
127+
pathType: ImplementationSpecific
128+
backend:
129+
service:
130+
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
131+
port:
132+
number: {{ .Values.wlsDomain.adminServerSSLPort }}
133+
---
134+
apiVersion: networking.k8s.io/v1
135+
kind: Ingress
136+
metadata:
137+
name: {{ .Values.wlsDomain.domainUID }}-nginx-e2essl-wcsites
138+
namespace: {{ .Release.Namespace }}
139+
annotations:
140+
spec:
141+
tls:
142+
- hosts:
143+
- '{{ .Values.hostName.wcsites }}'
144+
secretName: {{ .Values.wlsDomain.domainUID }}-tls-cert
145+
rules:
146+
- host: '{{ .Values.hostName.wcsites }}'
147+
http:
148+
paths:
149+
- path:
150+
pathType: ImplementationSpecific
151+
backend:
152+
service:
153+
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
154+
port:
155+
number: {{ .Values.wlsDomain.wcsitesManagedServerSSLPort }}
156+
157+
{{- end }}
158+
{{- end }}
159+
{{- end }}
160+

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

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# Copyright (c) 2020, 2021, 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 semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
5+
{{- if eq .Values.type "NGINX" }}
6+
{{- if or (eq .Values.sslType "NONSSL") (eq .Values.sslType "SSL") }}
7+
---
8+
apiVersion: extensions/v1beta1
9+
kind: Ingress
10+
metadata:
11+
name: {{ .Values.wlsDomain.domainUID }}-nginx
12+
namespace: {{ .Release.Namespace }}
13+
annotations:
14+
kubernetes.io/ingress.class: 'nginx'
15+
nginx.ingress.kubernetes.io/proxy-connect-timeout: '{{ .Values.nginx.connectTimeout }}'
16+
nginx.ingress.kubernetes.io/proxy-read-timeout: '{{ .Values.nginx.readTimeout }}'
17+
nginx.ingress.kubernetes.io/proxy-send-timeout: '{{ .Values.nginx.sendTimeout }}'
18+
nginx.ingress.kubernetes.io/affinity: 'cookie'
19+
nginx.ingress.kubernetes.io/session-cookie-name: 'stickyid'
20+
nginx.ingress.kubernetes.io/session-cookie-expires: '{{ .Values.nginx.cookieExpires }}'
21+
nginx.ingress.kubernetes.io/session-cookie-max-age: '{{ .Values.nginx.cookieMaxAge }}'
22+
nginx.ingress.kubernetes.io/ssl-redirect: 'false'
23+
nginx.ingress.kubernetes.io/affinity-mode: 'persistent'
24+
{{- if eq .Values.sslType "SSL" }}
25+
{{- end }}
26+
spec:
27+
rules:
28+
- host: '{{ .Values.nginx.hostname }}'
29+
http:
30+
paths:
31+
- path: /console
32+
backend:
33+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
34+
servicePort: {{ .Values.wlsDomain.adminServerPort }}
35+
- path: /em
36+
backend:
37+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
38+
servicePort: {{ .Values.wlsDomain.adminServerPort }}
39+
- path: /wls-exporter
40+
backend:
41+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
42+
servicePort: {{ .Values.wlsDomain.adminServerPort }}
43+
- path: /weblogic
44+
backend:
45+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
46+
servicePort: {{ .Values.wlsDomain.adminServerPort }}
47+
- path: /sbconsole
48+
backend:
49+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
50+
servicePort: {{ .Values.wlsDomain.adminServerPort }}
51+
- path: /sites
52+
backend:
53+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
54+
servicePort: {{ .Values.wlsDomain.wcsitesManagedServerPort }}
55+
- path: /cas
56+
backend:
57+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
58+
servicePort: {{ .Values.wlsDomain.wcsitesManagedServerPort }}
59+
- path: /wls-exporter
60+
backend:
61+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
62+
servicePort: {{ .Values.wlsDomain.wcsitesManagedServerPort }}
63+
{{- if eq .Values.sslType "SSL" }}
64+
tls:
65+
- hosts:
66+
- '{{ .Values.nginx.hostname }}'
67+
secretName: {{ .Values.wlsDomain.domainUID }}-tls-cert
68+
{{- end }}
69+
{{- else }}
70+
---
71+
apiVersion: v1
72+
kind: Service
73+
metadata:
74+
name: {{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower }}-nginx-ssl
75+
namespace: {{ .Release.Namespace }}
76+
spec:
77+
ports:
78+
- port: {{ .Values.wlsDomain.adminServerSSLPort }}
79+
protocol: TCP
80+
targetPort: {{ .Values.wlsDomain.adminServerSSLPort }}
81+
selector:
82+
weblogic.domainUID: {{ .Values.wlsDomain.domainUID }}
83+
weblogic.serverName: {{ .Values.wlsDomain.adminServerName }}
84+
type: ClusterIP
85+
86+
---
87+
apiVersion: extensions/v1beta1
88+
kind: Ingress
89+
metadata:
90+
name: {{ .Values.wlsDomain.domainUID }}-nginx-e2essl-admin
91+
namespace: {{ .Release.Namespace }}
92+
annotations:
93+
spec:
94+
tls:
95+
- hosts:
96+
- '{{ .Values.hostName.admin }}'
97+
secretName: {{ .Values.wlsDomain.domainUID }}-tls-cert
98+
rules:
99+
- host: '{{ .Values.hostName.admin }}'
100+
http:
101+
paths:
102+
- path:
103+
backend:
104+
serviceName: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
105+
servicePort: {{ .Values.wlsDomain.adminServerSSLPort }}
106+
---
107+
apiVersion: extensions/v1beta1
108+
kind: Ingress
109+
metadata:
110+
name: {{ .Values.wlsDomain.domainUID }}-nginx-e2essl-wcsites
111+
namespace: {{ .Release.Namespace }}
112+
annotations:
113+
spec:
114+
tls:
115+
- hosts:
116+
- '{{ .Values.hostName.wcsites }}'
117+
secretName: {{ .Values.wlsDomain.domainUID }}-tls-cert
118+
rules:
119+
- host: '{{ .Values.hostName.wcsites }}'
120+
http:
121+
paths:
122+
- path:
123+
backend:
124+
serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wcsitesClusterName | lower | replace "_" "-" }}'
125+
servicePort: {{ .Values.wlsDomain.wcsitesManagedServerSSLPort }}
126+
127+
{{- end }}
128+
{{- end }}
129+
{{- end }}
130+

0 commit comments

Comments
 (0)