Skip to content

WCContent Kubernetes release 22.4.1 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 31, 2022
Merged

WCContent Kubernetes release 22.4.1 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
457f502
For WCContent Kubernetes release 22.4.1
deboghos Oct 28, 2022
27b1239
For WCContent Kubernetes release 22.4.1
deboghos Oct 28, 2022
8b60eff
Changing copyright info
deboghos Oct 31, 2022
cf030e0
correcting minor version info
deboghos Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OracleWebCenterContent/kubernetes/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WebLogic Kubernetes Operator (the “operator”) supports deployment of Oracle WebCenter Content servers such as Oracle WebCenter Content Server and Oracle WebCenter Inbound Refinery Server.

***
The current supported production release is [22.2.3](https://github.com/oracle/fmw-kubernetes/releases).
The current supported production release is [22.4.1](https://github.com/oracle/fmw-kubernetes/releases).
***

In this release, Oracle WebCenter Content domain is supported using the “domain on a persistent volume”
Expand Down
0 .../kubernetes/ingress-per-domain/Chart.yaml → ...etes/charts/ingress-per-domain/Chart.yaml
100755 → 100644
View file
Open in desktop
File renamed without changes.
155 changes: 155 additions & 0 deletions OracleWebCenterContent/kubernetes/charts/ingress-per-domain/templates/nginx-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

{{- if eq .Values.type "NGINX" }}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Values.wlsDomain.domainUID }}-nginx
namespace: {{ .Release.Namespace }}

annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/affinity: "cookie"
nginx.ingress.kubernetes.io/affinity-mode: persistent
{{- if eq .Values.tls "SSL" }}
nginx.ingress.kubernetes.io/configuration-snippet: |
more_set_input_headers "X-Forwarded-Proto: https";
more_set_input_headers "WL-Proxy-SSL: true";
nginx.ingress.kubernetes.io/ingress.allow-http: "false"
{{- end }}
spec:
rules:
- host: '{{ .Values.nginx.hostname }}'
http:
paths:
- path: /console
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.adminServerPort }}
- path: /em
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.adminServerPort }}
- path: /wls-exporter
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.adminServerPort }}
- path: /cs
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /adfAuthentication
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /_ocsh
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /_dav
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /idcws
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /idcnativews
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /wsm-pm
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /ibr
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
- path: /ibr/adfAuthentication
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
- path: /weblogic/ready
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /imaging
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ipmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ipmManagedServerPort }}
- path: /dc-console
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.captureManagedServerPort }}
- path: /dc-client
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.captureManagedServerPort }}
- path: /wcc
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wccadfClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.wccadfManagedServerPort }}

{{- if eq .Values.tls "SSL" }}
tls:
- hosts:
- '{{ .Values.nginx.hostnameorip }}'
secretName: domain1-tls-cert
{{- end }}

{{- end }}

153 changes: 153 additions & 0 deletions OracleWebCenterContent/kubernetes/charts/ingress-per-domain/templates/traefik-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

{{- if eq .Values.type "TRAEFIK" }}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Values.wlsDomain.domainUID }}-traefik
namespace: {{ .Release.Namespace }}
labels:
weblogic.resourceVersion: domain-v2
annotations:
kubernetes.io/ingress.class: traefik
{{- if eq .Values.tls "SSL" }}
traefik.ingress.kubernetes.io/router.entrypoints: websecure
traefik.ingress.kubernetes.io/router.tls: "true"
traefik.ingress.kubernetes.io/router.middlewares: wccns-wls-proxy-ssl@kubernetescrd
{{- end }}
spec:
rules:
- host: '{{ .Values.traefik.hostname }}'
http:
paths:
- path: /console
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.adminServerPort }}
- path: /em
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.adminServerPort }}
- path: /wls-exporter
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-{{ .Values.wlsDomain.adminServerName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.adminServerPort }}
- path: /cs
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /adfAuthentication
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /_ocsh
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /_dav
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /idcws
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /idcnativews
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /wsm-pm
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /ibr
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
- path: /ibr/adfAuthentication
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ibrClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ibrManagedServerPort }}
- path: /weblogic/ready
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ucmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ucmManagedServerPort }}
- path: /imaging
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.ipmClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.ipmManagedServerPort }}
- path: /dc-console
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.captureManagedServerPort }}
- path: /dc-client
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.captureClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.captureManagedServerPort }}
- path: /wcc
pathType: ImplementationSpecific
backend:
service:
name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.wccadfClusterName | lower | replace "_" "-" }}'
port:
number: {{ .Values.wlsDomain.wccadfManagedServerPort }}

{{- if eq .Values.tls "SSL" }}
tls:
- hosts:
- '{{ .Values.traefik.hostnameorip }}'
secretName: domain1-tls-cert
{{- end }}

{{- end }}

11 changes: 7 additions & 4 deletions ...gress-per-domain/tls/nginx-admin-tls.yaml → ...gress-per-domain/tls/nginx-admin-tls.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright (c) 2021, Oracle and/or its affiliates.
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at
# https://oss.oracle.com/licenses/upl.

apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: wcc-admin-ingress
Expand All @@ -20,8 +20,11 @@ spec:
http:
paths:
- path:
pathType: ImplementationSpecific
backend:
serviceName: wccinfra-adminserver-nginx-ssl
servicePort: 7002
service:
name: wccinfra-adminserver-nginx-ssl
port:
number: 7002


9 changes: 6 additions & 3 deletions ...ess-per-domain/tls/nginx-capture-tls.yaml → ...ess-per-domain/tls/nginx-capture-tls.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the Universal Permissive License v 1.0 as shown at
# https://oss.oracle.com/licenses/upl.

apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: wcc-capture-ingress
Expand All @@ -20,8 +20,11 @@ spec:
http:
paths:
- path:
pathType: ImplementationSpecific
backend:
serviceName: wccinfra-cluster-capture-cluster
servicePort: 16401
service:
name: wccinfra-cluster-capture-cluster
port:
number: 16401


11 changes: 7 additions & 4 deletions ...ingress-per-domain/tls/nginx-ibr-tls.yaml → ...ingress-per-domain/tls/nginx-ibr-tls.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright (c) 2021, Oracle and/or its affiliates.
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at
# https://oss.oracle.com/licenses/upl.

apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: wcc-ibr-ingress
Expand All @@ -20,8 +20,11 @@ spec:
http:
paths:
- path:
pathType: ImplementationSpecific
backend:
serviceName: wccinfra-cluster-ibr-cluster
servicePort: 16251
service:
name: wccinfra-cluster-ibr-cluster
port:
number: 16251


Loading