Prepare version 3.4.1 (#670)

oracle · Sep 26, 2024 · b93bdea · b93bdea
1 parent 0767a41
commit b93bdea
Show file tree

Hide file tree

Showing 30 changed files with 92 additions and 76 deletions.
diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml
@@ -35,9 +35,10 @@ jobs:
         matrixName:
           - "15.1.1-0-SNAPSHOT"
           - "15.1.1-0-SNAPSHOT-Graal"
-          - "23.09"
-          - "23.09-Graal"
+          - "24.03"
+          - "24.03-Graal"
           - "22.06"
+          - "14.1.2-0-SNAPSHOT"
           - "14.1.1-2206-SNAPSHOT"
           - "14.1.1-0-SNAPSHOT"
           - "14.1.1-0"
@@ -57,40 +58,46 @@ jobs:
             javaVersion: 17
             baseImage: "gcr.io/distroless/java17-debian12"
 
-          - matrixName: "23.09"
-            coherenceVersion: "23.09.1"
-            coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1"
+          - matrixName: "24.03"
+            coherenceVersion: "24.03.1"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1"
             javaVersion: 17
             baseImage: "gcr.io/distroless/java17-debian12"
 
-          - matrixName: "23.09-Graal"
-            coherenceVersion: "23.09.1"
-            coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1-graal"
+          - matrixName: "24.03-Graal"
+            coherenceVersion: "24.03.1"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1-graal"
             javaVersion: 17
             baseImage: "gcr.io/distroless/java17-debian12"
 
           - matrixName: "22.06"
-            coherenceVersion: "22.06.7"
-            coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.7"
+            coherenceVersion: "22.06.9"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.9"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
 
+          - matrixName: "14.1.2-0-SNAPSHOT"
+            coherenceVersion: "14.1.2-0-0-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.2-0-0-SNAPSHOT"
+            javaVersion: 17
+            baseImage: "gcr.io/distroless/java17-debian12"
+
           - matrixName: "14.1.1-2206-SNAPSHOT"
-            coherenceVersion: "14.1.1-2206-8-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-8-SNAPSHOT"
+            coherenceVersion: "14.1.1-2206-10-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-10-SNAPSHOT"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1-0-SNAPSHOT"
-            coherenceVersion: "14.1.1-0-17-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-17-SNAPSHOT"
+            coherenceVersion: "14.1.1-0-19-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-19-SNAPSHOT"
             javaVersion: 8
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1-0"
-            coherenceVersion: "14.1.1-0-16"
+            coherenceVersion: "14.1.1-0-18"
             javaVersion: 8
-            coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-16"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-18"
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1.0.0"
@@ -106,7 +113,7 @@ jobs:
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "12.2.1-4-SNAPSHOT"
-            coherenceVersion: "12.2.1-4-20-SNAPSHOT"
+            coherenceVersion: "12.2.1-4-21-SNAPSHOT"
             coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-21-SNAPSHOT"
             javaVersion: 8
             baseImage: "gcr.io/distroless/java11-debian11"

diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml
@@ -37,6 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         compatibilityVersion:
+        - 3.4.0
         - 3.3.5
         - 3.3.4
         - 3.3.3
@@ -49,48 +50,52 @@ jobs:
         - 3.2.7
         - 3.2.6
         include:
+        - compatibilityVersion: 3.4.0
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
+          compatibilitySelector: control-plane=coherence
+          k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
         - compatibilityVersion: 3.3.5
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
         - compatibilityVersion: 3.3.4
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
         - compatibilityVersion: 3.3.3
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
         - compatibilityVersion: 3.3.2
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
         - compatibilityVersion: 3.3.1
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
         - compatibilityVersion: 3.3.0
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
         - compatibilityVersion: 3.2.11
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
         - compatibilityVersion: 3.2.10
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
         - compatibilityVersion: 3.2.9
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
         - compatibilityVersion: 3.2.7
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
         - compatibilityVersion: 3.2.6
-          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -125,7 +125,7 @@ jobs:
       with:
         upload_url: ${{ github.event.release.upload_url }}
         asset_path: /tmp/coherence-operator/_output/manifests/crd/coherencejob.oracle.com_coherence.yaml
-        asset_name: coherence.oracle.com_coherence.yaml
+        asset_name: coherencejob.oracle.com_coherence.yaml
         asset_content_type: text/plain
 
     - name: Upload Release Small Job CRD
@@ -136,7 +136,7 @@ jobs:
       with:
         upload_url: ${{ github.event.release.upload_url }}
         asset_path: /tmp/coherence-operator/_output/manifests/crd-small/coherencejob.oracle.com_coherence.yaml
-        asset_name: coherence.oracle.com_coherence_small.yaml
+        asset_name: coherencejob.oracle.com_coherence_small.yaml
         asset_content_type: text/plain
 
     - name: Upload Release Dashboards

diff --git a/Makefile b/Makefile
@@ -15,17 +15,17 @@
 # ======================================================================================================================
 
 # The version of the Operator being build - this should be a valid SemVer format
-VERSION ?= 3.4.0
+VERSION ?= 3.4.1
 MVN_VERSION ?= $(VERSION)
 
 # The version number to be replaced by this release
-PREV_VERSION ?= 3.3.5
+PREV_VERSION ?= 3.4.0
 
 # The operator version to use to run certification tests against
 CERTIFICATION_VERSION ?= $(VERSION)
 
 # The previous Operator version used to run the compatibility tests.
-COMPATIBLE_VERSION  ?= 3.3.5
+COMPATIBLE_VERSION  ?= 3.4.0
 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!)
 COMPATIBLE_SELECTOR ?= control-plane=coherence
 
@@ -39,7 +39,7 @@ KUBERNETES_DOC_VERSION=v1.30
 # ----------------------------------------------------------------------------------------------------------------------
 # The Coherence version to build against - must be a Java 8 compatible version
 COHERENCE_VERSION     ?= 21.12.5
-COHERENCE_VERSION_LTS ?= 22.06.8
+COHERENCE_VERSION_LTS ?= 22.06.9
 # The default Coherence image the Operator will run if no image is specified
 COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
 COHERENCE_IMAGE_NAME     ?= coherence-ce
@@ -1500,8 +1500,12 @@ $(BUILD_MANIFESTS_PKG): $(TOOLS_BIN)/kustomize $(TOOLS_BIN)/yq
 	$(SED) -e 's/name: coherence-operator-env-vars-.*/name: coherence-operator-env-vars/g' $(BUILD_OUTPUT)/coherence-operator.yaml
 	cd $(BUILD_MANIFESTS)/crd && $(TOOLS_BIN)/yq --no-doc -s '.metadata.name + ".yaml"' temp.yaml
 	rm $(BUILD_MANIFESTS)/crd/temp.yaml
+	mv $(BUILD_MANIFESTS)/crd/coherence.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd/coherence.oracle.com_coherence.yaml
+	mv $(BUILD_MANIFESTS)/crd/coherencejob.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd/coherencejob.oracle.com_coherence.yaml
 	cd $(BUILD_MANIFESTS)/crd-small && $(TOOLS_BIN)/yq --no-doc -s '.metadata.name + ".yaml"' temp.yaml
 	rm $(BUILD_MANIFESTS)/crd-small/temp.yaml
+	mv $(BUILD_MANIFESTS)/crd-small/coherence.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd-small/coherence.oracle.com_coherence.yaml
+	mv $(BUILD_MANIFESTS)/crd-small/coherencejob.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd-small/coherencejob.oracle.com_coherence.yaml
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Delete and re-create the test namespace

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -41,4 +41,4 @@ commonLabels:
   app.kubernetes.io/instance: coherence-operator-crd
   app.kubernetes.io/name: coherence-operator
   app.kubernetes.io/part-of: coherence-operator
-  app.kubernetes.io/version: 3.4.0
+  app.kubernetes.io/version: 3.4.1
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -9,4 +9,4 @@ resources:
 images:
 - name: controller
   newName: ghcr.io/oracle/coherence-operator
-  newTag: 3.4.0
+  newTag: 3.4.1
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/name: coherence-operator
     app: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.4.0"
-    version: "3.4.0"
+    app.kubernetes.io/version: "3.4.1"
+    version: "3.4.1"
     app.kubernetes.io/component: manager
     app.kubernetes.io/part-of: coherence-operator
 spec:
@@ -24,8 +24,8 @@ spec:
         app.kubernetes.io/name: coherence-operator
         app: coherence-operator
         app.kubernetes.io/instance: coherence-operator-manager
-        app.kubernetes.io/version: "3.4.0"
-        version: "3.4.0"
+        app.kubernetes.io/version: "3.4.1"
+        version: "3.4.1"
         app.kubernetes.io/component: manager
         app.kubernetes.io/part-of: coherence-operator
     spec:
@@ -106,7 +106,7 @@ spec:
               control-plane: coherence
               app.kubernetes.io/name: coherence-operator
               app.kubernetes.io/instance: coherence-operator-manager
-              app.kubernetes.io/version: "3.4.0"
+              app.kubernetes.io/version: "3.4.1"
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -117,7 +117,7 @@ spec:
                     control-plane: coherence
                     app.kubernetes.io/name: coherence-operator
                     app.kubernetes.io/instance: coherence-operator-manager
-                    app.kubernetes.io/version: "3.4.0"
+                    app.kubernetes.io/version: "3.4.1"
               weight: 50
             - podAffinityTerm:
                 topologyKey: "oci.oraclecloud.com/fault-domain"
@@ -126,7 +126,7 @@ spec:
                     control-plane: coherence
                     app.kubernetes.io/name: coherence-operator
                     app.kubernetes.io/instance: coherence-operator-manager
-                    app.kubernetes.io/version: "3.4.0"
+                    app.kubernetes.io/version: "3.4.1"
               weight: 10
             - podAffinityTerm:
                 topologyKey: "kubernetes.io/hostname"
@@ -135,5 +135,5 @@ spec:
                     control-plane: coherence
                     app.kubernetes.io/name: coherence-operator
                     app.kubernetes.io/instance: coherence-operator-manager
-                    app.kubernetes.io/version: "3.4.0"
+                    app.kubernetes.io/version: "3.4.1"
               weight: 1
diff --git a/config/manager/service.yaml b/config/manager/service.yaml
@@ -7,7 +7,7 @@ metadata:
     control-plane: coherence
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-webhook
-    app.kubernetes.io/version: "3.4.0"
+    app.kubernetes.io/version: "3.4.1"
     app.kubernetes.io/component: webhook
     app.kubernetes.io/part-of: coherence-operator
 spec:
@@ -18,7 +18,7 @@ spec:
   selector:
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.4.0"
+    app.kubernetes.io/version: "3.4.1"
     app.kubernetes.io/component: manager
 ---
 apiVersion: v1
@@ -30,7 +30,7 @@ metadata:
     control-plane: coherence
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-rest
-    app.kubernetes.io/version: "3.4.0"
+    app.kubernetes.io/version: "3.4.1"
     app.kubernetes.io/component: rest
     app.kubernetes.io/part-of: coherence-operator
 spec:
@@ -41,5 +41,5 @@ spec:
   selector:
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.4.0"
+    app.kubernetes.io/version: "3.4.1"
     app.kubernetes.io/component: manager
diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml
@@ -11,12 +11,12 @@ metadata:
     description: >-
       Coherence Operator implements features to assist with deploying and
       managing Coherence clusters in a Kubernetes environment.
-    containerImage: 'ghcr.io/oracle/coherence-operator:3.4.0'
+    containerImage: 'ghcr.io/oracle/coherence-operator:3.4.1'
     support: ''
     repository: 'https://github.com/oracle/coherence-operator'
     operators.operatorframework.io/builder: operator-sdk-v1.0.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: coherence-operator.v3.4.0
+  name: coherence-operator.v3.4.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -65,4 +65,4 @@ spec:
   provider:
     name: Oracle
     url: https://oracle.github.io/coherence-operator/docs/latest
-  version: 3.4.0
+  version: 3.4.1
diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc
@@ -21,7 +21,7 @@ If you want the default Coherence Operator installation then the simplest soluti
 
 [source,bash]
 ----
-kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.1/coherence-operator.yaml
 ----
 
 This will create a namespace called `coherence` and install the Operator into it along with all the required `ClusterRole` and `RoleBinding` resources. The `coherence` namespace can be changed by downloading and editing the yaml file.

diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc
@@ -150,7 +150,7 @@ If you want the default Coherence Operator installation then the simplest soluti
 
 [source,bash]
 ----
-kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.1/coherence-operator.yaml
 ----
 
 This will create a namespace called `coherence` and install the Operator into it along with all the required `ClusterRole` and `RoleBinding` resources. The `coherence` namespace can be changed by downloading and editing the yaml file.

diff --git a/docs/installation/07_webhooks.adoc b/docs/installation/07_webhooks.adoc
@@ -63,7 +63,7 @@ If installing the operator using the manifest yaml file first replace the occurr
 For example:
 [source,bash]
 ----
-curl -L https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml \
+curl -L https://github.com/oracle/coherence-operator/releases/download/v3.4.1/coherence-operator.yaml \
     -o coherence-operator.yaml
 sed -i s/self-signed/cert-manager/g coherence-operator.yaml
 kubectl apply -f coherence-operator.yaml

diff --git a/docs/installation/09_RBAC.adoc b/docs/installation/09_RBAC.adoc
@@ -36,7 +36,7 @@ The two methods of installing the Operator discussed in the <<docs/installation/
 Before installing the Operator, with either method described below, the CRDs MUST be manually installed from the Operator manifest files.
 
 The manifest files are published with the GitHub release at this link:
-https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator-manifests.tar.gz[3.3.5 Manifests]
+https://github.com/oracle/coherence-operator/releases/download/v3.4.1/coherence-operator-manifests.tar.gz[3.3.5 Manifests]
 
 You MUST ensure that the CRD manifests match the version of the Operator being installed.
 

diff --git a/docs/metrics/020_metrics.adoc b/docs/metrics/020_metrics.adoc
@@ -30,7 +30,7 @@ documentation for full details on the available metrics.
 
 === Important Note Regarding Prometheus Metrics Prefix
 
-From version 3.4.0 of the Coherence Operator, the packaged Grafana dashboards no longer use the **vendor:** prefix for querying Prometheus metrics.
+From version 3.4.1 of the Coherence Operator, the packaged Grafana dashboards no longer use the **vendor:** prefix for querying Prometheus metrics.
 This prefix was deprecated a number of releases ago and the default, of legacy metrics, in Coherence and will be removed in the most recent
 Coherence releases after this Operator release.
 

diff --git a/docs/other/041_global_labels.adoc b/docs/other/041_global_labels.adoc
@@ -142,7 +142,7 @@ When installing the Operator using the manifest yaml files, additional command l
 by manually editing the yaml file before installing.
 
 Download the yaml manifest file from the GitHub repo
-https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml
+https://github.com/oracle/coherence-operator/releases/download/v3.4.1/coherence-operator.yaml
 
 Find the section of the yaml file the defines the Operator container args, the default looks like this