wcsites operator 4.0.6 support (#167)

Author: scbarikGIT

FMWKubernetesMAA/OracleEnterpriseDeploymentAutomation/OracleWebCenterSites/README.md

@@ -25,11 +25,11 @@ This terraform deployment requires the prior installation of the following:
 
 	[tfswitch](https://tfswitch.warrensbox.com/Install/) can be used for flexibility of working with multiple versions of terraform, but it is only available on Linux and Mac OS X, for Windows or if you prefer to install the base software, see [https://learn.hashicorp.com/tutorials/terraform/install-cli](https://learn.hashicorp.com/tutorials/terraform/install-cli) for basic installation instructions.
 
-- **kubectl >= 1.18.10 (the Kubernetes cli)**
+- **kubectl >= 1.24 (the Kubernetes cli)**
 
 	See [https://kubernetes.io/docs/tasks/tools/install-kubectl/](https://kubernetes.io/docs/tasks/tools/install-kubectl/) for installation instructions, although kubectl is usually installed as part of Docker Desktop, so if you use Docker it is likely already installed.
 
-- **helm >= 3.5.4**
+- **helm >= 3.10**
 
 	Helm is a kubernetes deployment package manager. The OCI Service Broker is packaged in a Helm chart, and so is the etcd cluster deployment.
 	See [https://helm.sh/docs/intro/install/](https://helm.sh/docs/intro/install/) to install helm locally.
@@ -65,7 +65,7 @@ This terraform deployment requires the prior installation of the following:
 Create a `terraform.tfvars` file from the `terraform.tfvars.template` file and populate the following mandatory information:
 
 ```
-## Copyright (c) 2022, Oracle and/or its affiliates.
+## Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl  
 
 tenancy_ocid     = "ocid1.tenancy.oc1..."
@@ -166,7 +166,7 @@ ssh_authorized_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtmEF/NbYdBMiF1XjTPg
 # Cluster config
 oke_cluster = {
   name                                                    = "OKE_Cluster"
-  k8s_version                                             = "v1.20.8"
+  k8s_version                                             = "v1.24.1"
   pods_cidr                                               = "10.1.0.0/16"
   services_cidr                                           = "10.2.0.0/16"
   cluster_options_add_ons_is_kubernetes_dashboard_enabled = true
@@ -207,17 +207,17 @@ secrets_encryption_key_ocid = null
 
 - **Push wcsites docker image to OCIR**
 
-	- Download latest sites docker image from [here](https://support.oracle.com/epmos/faces/ui/patch/PatchDetail.jspx?patchId=33579457).
+	- Download latest sites docker image from [here](https://support.oracle.com/epmos/faces/ui/patch/PatchDetail.jspx?patchId=35370108).
 	- Unzip the downloaded zip file.
 
 	```bash
-	$ unzip p33579457_122140_Linux-x86-64.zip
+	$ unzip p35370108_122140_Linux-x86-64.zip
 	```
 
 	Load the image archive using the docker load command.
 
 	```bash
-	$ docker load < wcsites-20210422.tar.gz
+	$ docker load < wcsites-230418.tar.gz
 	```
 
 - **Create an "Auth token" which will be used as docker password to push/pull images from OCIR**	
@@ -385,13 +385,13 @@ Login to OCI console and go to the Load Balancer created be terraform script in
 To stop Managed Servers:
 
 	```bash
-	$ kubectl patch domain wcsitesinfra -n wcsites-ns --type='json' -p='[{"op": "replace", "path": "/spec/clusters/0/replicas", "value": 0 }]'
+	$ kubectl patch cluster wcsitesinfra-wcsites-cluster -n wcsites-ns --type=merge -p '{"spec":{"replicas":0}}'
 	```
 
 	To start all configured Managed Servers:
 
 	```bash
-	$ kubectl patch domain wcsitesinfra -n wcsites-ns --type='json' -p='[{"op": "replace", "path": "/spec/clusters/0/replicas", "value": 3 }]'
+	$ kubectl patch cluster wcsitesinfra-wcsites-cluster -n wcsites-ns --type=merge -p '{"spec":{"replicas":3}}'
 	```
 
 * You can check running pods with:

FMWKubernetesMAA/OracleEnterpriseDeploymentAutomation/OracleWebCenterSites/charts/wc-sites/templates/domain.Domain.yaml

@@ -1,9 +1,9 @@
-# Copyright (c) 2022, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v8"
+apiVersion: "weblogic.oracle/v9"
 kind: Domain
 metadata:
   name: {{ .Values.domain.domainName }}
@@ -14,17 +14,17 @@ spec:
   managedServers:
   {{- if gt (.Values.domain.wcsCluster.managedServers.count | int) 0}}
   - serverName: wcsites-server1
-    serverStartPolicy: "IF_NEEDED"
+    serverStartPolicy: "IfNeeded"
   {{- end }}
   {{- if gt (.Values.domain.wcsCluster.managedServers.count | int) 1}}
   - serverName: wcsites-server2
-    serverStartPolicy: "IF_NEEDED"
+    serverStartPolicy: "IfNeeded"
   {{- end }}
   {{- if gt (.Values.domain.wcsCluster.managedServers.count | int) 2}}
   - serverName: wcsites-server3
-    serverStartPolicy: "IF_NEEDED"
+    serverStartPolicy: "IfNeeded"
   {{- end }}
- 
+
   # The WebLogic Domain Home
   domainHome: {{ .Values.domain.rootDir }}/domains/{{ .Values.domain.domainName }}
 
@@ -50,7 +50,7 @@ spec:
 
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  webLogicCredentialsSecret: 
+  webLogicCredentialsSecret:
     name: {{ .Values.domain.domainName }}-domain-credentials
 
   configuration:
@@ -73,14 +73,14 @@ spec:
   dataHome: ""
 
 
-  # serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
+  # serverStartPolicy legal values are "Never", "IfNeeded", or "AdminOnly"
   # This determines which WebLogic Servers the Operator will start up when it discovers this Domain
-  # - "NEVER" will not start any server in the domain
-  # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
-  # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
-  serverStartPolicy: "IF_NEEDED"
+  # - "Never" will not start any server in the domain
+  # - "AdminOnly" will start up only the administration server (no managed servers will be started)
+  # - "IfNeeded" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
+  serverStartPolicy: "IfNeeded"
 
-  serverPod: 
+  serverPod:
     initContainers:
       - name: server-config-update
         {{- if .Values.image.name }}
@@ -97,18 +97,18 @@ spec:
         volumeMounts:
         - name: weblogic-domain-storage-volume
           mountPath: {{ .Values.domain.rootDir }}
-      
+
     # an (optional) list of environment variable to be set on the servers
     env:
     - name: JAVA_OPTIONS
       value: "{{ .Values.domain.javaOptions }}"
     - name: USER_MEM_ARGS
       value: "-Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx1024m "
     resources:
-      requests: 
+      requests:
         memory: "12G"
         cpu: "1000m"
-      limits: 
+      limits:
         memory: "16G"
         cpu: "2000m"
     volumes:
@@ -124,39 +124,27 @@ spec:
     # serverStartState legal values are "RUNNING" or "ADMIN"
     # "RUNNING" means the listed server will be started up to "RUNNING" mode
     # "ADMIN" means the listed server will be start up to "ADMIN" mode
-    serverStartState: "RUNNING"
-    
-  # clusters is used to configure the desired behavior for starting member servers of a cluster.  
+    # serverStartState: "RUNNING"
+
+  # clusters is used to configure the desired behavior for starting member servers of a cluster.
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
-  - clusterName: {{ .Values.domain.wcsCluster.name }}
-    clusterService:
-      annotations: 
-        traefik.ingress.kubernetes.io/affinity: "true"
-        traefik.ingress.kubernetes.io/session-cookie-name: sticky
-    serverStartState: "RUNNING"
-    serverPod:
-      # Instructs Kubernetes scheduler to prefer nodes for new cluster members where there are not
-      # already members of the same cluster.
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 100
-              podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                    - key: "weblogic.clusterName"
-                      operator: In
-                      values:
-                        - $(CLUSTER_NAME)
-                topologyKey: "kubernetes.io/hostname"
-    replicas: 1
-  # The number of managed servers to start for unlisted clusters
-  # replicas: 1
-
-  # Istio
-  # configuration:
-  #   istio:
-  #     enabled: 
-  #     readinessPort: 
+  - name: { { .Values.domain.domainName } }-{{ .Values.domain.wcsCluster.name }}
 
+      # The number of managed servers to start for unlisted clusters
+      # replicas: 1
+
+---
+# This is an example of how to define a Cluster resource.
+apiVersion: weblogic.oracle/v1
+kind: Cluster
+metadata:
+  name: { { .Values.domain.domainName } }-{{ .Values.domain.wcsCluster.name }}
+  namespace: { { .Values.domain.namespace } }
+spec:
+  clusterName: { { .Values.domain.wcsCluster.name } }
+  clusterService:
+    annotations:
+      traefik.ingress.kubernetes.io/affinity: "true"
+      traefik.ingress.kubernetes.io/session-cookie-name: sticky
+  replicas: 1

FMWKubernetesMAA/OracleEnterpriseDeploymentAutomation/OracleWebCenterSites/charts/wc-sites/templates/traefik.Ingress.yaml

@@ -1,48 +1,62 @@
-# Copyright (c) 2022, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Values.domain.domainName }}-traefik
   labels:
     weblogic.resourceVersion: domain-v2
   annotations:
     kubernetes.io/ingress.class: traefik
-{{- if .Values.ingress.tls }}
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/router.middlewares: wcsites-ns-wls-proxy-ssl@kubernetescrd
-{{- end }}
+  {{- if .Values.ingress.tls }}
+traefik.ingress.kubernetes.io/router.entrypoints: websecure
+traefik.ingress.kubernetes.io/router.tls: "true"
+traefik.ingress.kubernetes.io/router.middlewares: wcsites-ns-wls-proxy-ssl@kubernetescrd
+  {{- end }}
 spec:
   rules:
-  - host: ''
-    http:
-      paths:
-      - path: /console
-        backend:
-          serviceName: '{{ .Values.domain.domainName }}-{{ .Values.domain.admin.name | lower | replace "_" "-" }}'
-          servicePort: {{ .Values.domain.admin.listenPort }}
-      - path: /em
-        backend:
-          serviceName: '{{ .Values.domain.domainName }}-{{ .Values.domain.admin.name | lower | replace "_" "-" }}'
-          servicePort: {{ .Values.domain.admin.listenPort }}
-      - path: /weblogic/ready
-        backend:
-          serviceName: '{{ .Values.domain.domainName }}-{{ .Values.domain.admin.name | lower | replace "_" "-" }}'
-          servicePort: {{ .Values.domain.admin.listenPort }}
-      - path: /sites
-        backend:
-          serviceName: '{{ .Values.domain.domainName }}-cluster-{{ .Values.domain.wcsCluster.name | lower | replace "_" "-" }}'
-          servicePort: {{ .Values.domain.wcsCluster.managedServers.listenPort  }}
-      - path: /cas
-        backend:
-          serviceName: '{{ .Values.domain.domainName }}-cluster-{{ .Values.domain.wcsCluster.name | lower | replace "_" "-" }}'
-          servicePort: {{ .Values.domain.wcsCluster.managedServers.listenPort  }}
-{{- if .Values.ingress.tls }}
-  tls:
+    - host: ''
+      http:
+        paths:
+          - path: /console
+            pathType: Prefix
+            backend:
+              service:
+                name: '{{ .Values.domain.domainName }}-{{ .Values.domain.admin.name | lower | replace "_" "-" }}'
+                port:
+                  number: {{ .Values.domain.admin.listenPort }}
+          - path: /em
+            pathType: Prefix
+            backend:
+              service:
+                name: '{{ .Values.domain.domainName }}-{{ .Values.domain.admin.name | lower | replace "_" "-" }}'
+                port:
+                  number: {{ .Values.domain.admin.listenPort }}
+          - path: /weblogic/ready
+            pathType: Prefix
+            backend:
+              service:
+                name: '{{ .Values.domain.domainName }}-{{ .Values.domain.admin.name | lower | replace "_" "-" }}'
+                port:
+                  number: {{ .Values.domain.admin.listenPort }}
+          - path: /sites
+            pathType: Prefix
+            backend:
+              service:
+                name: '{{ .Values.domain.domainName }}-cluster-{{ .Values.domain.wcsCluster.name | lower | replace "_" "-" }}'
+                port:
+                  number: {{ .Values.domain.wcsCluster.managedServers.listenPort  }}
+          - path: /cas
+            pathType: Prefix
+            backend:
+              service:
+                name: '{{ .Values.domain.domainName }}-cluster-{{ .Values.domain.wcsCluster.name | lower | replace "_" "-" }}'
+                port:
+                  number: {{ .Values.domain.wcsCluster.managedServers.listenPort  }}
+  {{- if .Values.ingress.tls }}
+tls:
   - hosts:
-    - '{{ .Values.ingress.dnsname }}'
+      - '{{ .Values.ingress.dnsname }}'
     secretName: {{ .Values.domain.domainName }}-tls-cert
-{{- end }}
-
+  {{- end }}

FMWKubernetesMAA/OracleEnterpriseDeploymentAutomation/OracleWebCenterSites/charts/wc-sites/values.schema.json

@@ -59,7 +59,7 @@
   "properties": {
     "kubernetesVersion": {
       "type": "string",
-      "enum": ["1.20", "1.19"]
+      "enum": ["1.23", "1.24"]
     },
     "image": {
       "type": "object",
@@ -234,7 +234,7 @@
         },
         "serverStartPolicy": {
           "type": "string",
-          "enum": ["NEVER", "ADMIN_ONLY", "IF_NEEDED"]
+          "enum": ["Never", "AdminOnly", "IfNeeded"]
         },
         "javaOptions": {
           "type": "string",

FMWKubernetesMAA/OracleEnterpriseDeploymentAutomation/OracleWebCenterSites/charts/wc-sites/values.yaml

@@ -1,4 +1,4 @@
-## Copyright (c) 2022, Oracle and/or its affiliates.
+## Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 # Default values for wcsites.
@@ -8,7 +8,7 @@
 nameOverride: ""
 fullnameOverride: ""
 
-kubernetesVersion: "1.20"
+kubernetesVersion: "1.24"
 
 image:
   repository: "oracle/wcsites"
@@ -74,12 +74,12 @@ domain:
   includeServerOutInPodLog: true
   httpAccessLogInLogHome: true
 
-  # serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
+  # serverStartPolicy legal values are "Never", "IfNeeded", or "AdminOnly"
   # This determines which WebLogic Servers the Operator will start up when it discovers this Domain
-  # - "NEVER" will not start any server in the domain
-  # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
-  # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
-  serverStartPolicy: IF_NEEDED
+  # - "Never" will not start any server in the domain
+  # - "AdminOnly" will start up only the administration server (no managed servers will be started)
+  # - "IfNeeded" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
+  serverStartPolicy: IfNeeded
   javaOptions: "-Dweblogic.StdoutDebugEnabled=false"
   maxManagedServerCount: 5
 
@@ -91,7 +91,7 @@ domain:
     nodePort: 30701
 
   wcsCluster:
-    name: wcsites_cluster
+    name: wcsites-cluster
     managedServers:
       count: 3
       name: wcsites-server

FMWKubernetesMAA/OracleEnterpriseDeploymentAutomation/OracleWebCenterSites/modules/k8s/inputs.tf

@@ -1,4 +1,4 @@
-## Copyright (c) 2022, Oracle and/or its affiliates.
+## Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 variable "tenancy_ocid" {}
@@ -10,7 +10,7 @@ variable "provision_cluster" {}
 
 variable "oke_cluster" {
   default = {
-    k8s_version   = "v1.20.8"
+    k8s_version   = "v1.24.1"
     pods_cidr     = "10.1.0.0/16"
     services_cidr = "10.2.0.0/16"
   }