Bump versions (#637)

* Bump version to 3.3.3 * Use golangci_lint v1.55.2 * Bump Helidon version * Add slf4j-simple for Spring test * Use new Coherence versions
oracle · Jan 24, 2024 · 31d9761 · 31d9761
1 parent cf40f10
commit 31d9761
Show file tree

Hide file tree

Showing 37 changed files with 154 additions and 142 deletions.
diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021, 2023, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2021, 2024, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # http://oss.oracle.com/licenses/upl.
 
@@ -49,48 +49,48 @@ jobs:
             coherenceVersion: "15.1.1-0-0-SNAPSHOT"
             coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT"
             javaVersion: 17
-            baseImage: "gcr.io/distroless/java17-debian11"
+            baseImage: "gcr.io/distroless/java17-debian12"
 
           - matrixName: "15.1.1-0-SNAPSHOT-Graal"
             coherenceVersion: "15.1.1-0-0-SNAPSHOT"
             coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT-graal"
             javaVersion: 17
-            baseImage: "gcr.io/distroless/java17-debian11"
+            baseImage: "gcr.io/distroless/java17-debian12"
 
           - matrixName: "23.09"
-            coherenceVersion: "23.09"
-            coherenceImage: "ghcr.io/oracle/coherence-ce:23.09"
+            coherenceVersion: "23.09.1"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1"
             javaVersion: 17
-            baseImage: "gcr.io/distroless/java17-debian11"
+            baseImage: "gcr.io/distroless/java17-debian12"
 
           - matrixName: "23.09-Graal"
-            coherenceVersion: "23.09"
-            coherenceImage: "ghcr.io/oracle/coherence-ce:23.09-graal"
+            coherenceVersion: "23.09.1"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1-graal"
             javaVersion: 17
-            baseImage: "gcr.io/distroless/java17-debian11"
+            baseImage: "gcr.io/distroless/java17-debian12"
 
           - matrixName: "22.06"
-            coherenceVersion: "22.06.6"
-            coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.6"
+            coherenceVersion: "22.06.7"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.7"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1-2206-SNAPSHOT"
-            coherenceVersion: "14.1.1-2206-7-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-7-SNAPSHOT"
+            coherenceVersion: "14.1.1-2206-8-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-8-SNAPSHOT"
             javaVersion: 11
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1-0-SNAPSHOT"
-            coherenceVersion: "14.1.1-0-15-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-15-SNAPSHOT"
+            coherenceVersion: "14.1.1-0-17-SNAPSHOT"
+            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-17-SNAPSHOT"
             javaVersion: 8
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1-0"
-            coherenceVersion: "14.1.1-0-15"
+            coherenceVersion: "14.1.1-0-16"
             javaVersion: 8
-            coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-15"
+            coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-16"
             baseImage: "gcr.io/distroless/java11-debian11"
 
           - matrixName: "14.1.1.0.0"
@@ -107,7 +107,7 @@ jobs:
 
           - matrixName: "12.2.1-4-SNAPSHOT"
             coherenceVersion: "12.2.1-4-20-SNAPSHOT"
-            coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-20-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
@@ -1,4 +1,4 @@
-# Copyright 2019, 2023, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2019, 2024, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # http://oss.oracle.com/licenses/upl.
 
@@ -37,6 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         compatibilityVersion:
+        - 3.3.2
         - 3.3.1
         - 3.3.0
         - 3.2.11
@@ -45,32 +46,36 @@ jobs:
         - 3.2.7
         - 3.2.6
         include:
+        - compatibilityVersion: 3.3.2
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
+          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.6"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
           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.6"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
           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.6"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
           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.6"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
           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.6"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
           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.6"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
           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.6"
+          coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
           compatibilitySelector: control-plane=coherence
           k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-# Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # http://oss.oracle.com/licenses/upl.
 #
@@ -15,17 +15,17 @@
 # ======================================================================================================================
 
 # The version of the Operator being build - this should be a valid SemVer format
-VERSION ?= 3.3.2
+VERSION ?= 3.3.3
 MVN_VERSION ?= $(VERSION)
 
 # The version number to be replaced by this release
-PREV_VERSION ?= 3.3.1
+PREV_VERSION ?= 3.3.2
 
 # 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.1
+COMPATIBLE_VERSION  ?= 3.3.2
 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!)
 COMPATIBLE_SELECTOR ?= control-plane=coherence
 
@@ -38,11 +38,12 @@ KUBERNETES_DOC_VERSION=v1.28
 # The Coherence image to use for deployments that do not specify an image
 # ----------------------------------------------------------------------------------------------------------------------
 # The Coherence version to build against - must be a Java 8 compatible version
-COHERENCE_VERSION ?= 21.12.5
+COHERENCE_VERSION     ?= 21.12.5
+COHERENCE_VERSION_LTS ?= 22.06.7
 # The default Coherence image the Operator will run if no image is specified
 COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
 COHERENCE_IMAGE_NAME     ?= coherence-ce
-COHERENCE_IMAGE_TAG      ?= 22.06.6
+COHERENCE_IMAGE_TAG      ?= $(COHERENCE_VERSION_LTS)
 COHERENCE_IMAGE          ?= $(COHERENCE_IMAGE_REGISTRY)/$(COHERENCE_IMAGE_NAME):$(COHERENCE_IMAGE_TAG)
 # The Java version that tests will be compiled to.
 # This should match the version required by the COHERENCE_IMAGE version
@@ -87,7 +88,7 @@ OPERATOR_SDK_VERSION := v1.9.0
 # Options to append to the Maven command
 # ----------------------------------------------------------------------------------------------------------------------
 MAVEN_OPTIONS ?= -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
-MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) -Dcoherence.test.base.image=$(COHERENCE_TEST_BASE_IMAGE) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS)
+MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) -Dcoherence.version.2206=$(COHERENCE_VERSION_LTS) -Dcoherence.test.base.image=$(COHERENCE_TEST_BASE_IMAGE) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS)
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Operator image names
@@ -2139,7 +2140,7 @@ get-istio: $(BUILD_PROPS)
 # ----------------------------------------------------------------------------------------------------------------------
 $(TOOLS_BIN)/golangci-lint:
 	@mkdir -p $(TOOLS_BIN)
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v1.52.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v1.55.2
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Display the full version string for the artifacts that would be built.

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.3.2
+  app.kubernetes.io/version: 3.3.3
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.3.2
+  newTag: 3.3.3
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.3.2"
-    version: "3.3.2"
+    app.kubernetes.io/version: "3.3.3"
+    version: "3.3.3"
     app.kubernetes.io/component: manager
     app.kubernetes.io/part-of: coherence-operator
 spec:
@@ -24,7 +24,7 @@ spec:
         app.kubernetes.io/name: coherence-operator
         app: coherence-operator
         app.kubernetes.io/instance: coherence-operator-manager
-        app.kubernetes.io/version: "3.3.2"
+        app.kubernetes.io/version: "3.3.3"
         version: "3.3.2"
         app.kubernetes.io/component: manager
         app.kubernetes.io/part-of: coherence-operator

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.3.2"
+    app.kubernetes.io/version: "3.3.3"
     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.3.2"
+    app.kubernetes.io/version: "3.3.3"
     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.3.2"
+    app.kubernetes.io/version: "3.3.3"
     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.3.2"
+    app.kubernetes.io/version: "3.3.3"
     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.3.2'
+    containerImage: 'ghcr.io/oracle/coherence-operator:3.3.3'
     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.3.2
+  name: coherence-operator.v3.3.3
   namespace: placeholder
 spec:
   apiservicedefinitions: {}

diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024, Oracle and/or its affiliates.
     Licensed under the Universal Permissive License v 1.0 as shown at
     http://oss.oracle.com/licenses/upl.
 
@@ -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.3.2/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.3/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/about/04_coherence_spec.adoc b/docs/about/04_coherence_spec.adoc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024, Oracle and/or its affiliates.
     Licensed under the Universal Permissive License v 1.0 as shown at
     http://oss.oracle.com/licenses/upl.
 

diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024, Oracle and/or its affiliates.
     Licensed under the Universal Permissive License v 1.0 as shown at
     http://oss.oracle.com/licenses/upl.
 
@@ -149,7 +149,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.3.1/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.3/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.
@@ -652,13 +652,13 @@ helm delete coherence-operator --namespace <namespace>
 
 If you want to use yaml directly to install the operator, with something like `kubectl`, you can use the manifest files
 published with the GitHub release at this link:
-https://github.com/oracle/coherence-operator/releases/download/v3.3.1/coherence-operator-manifests.tar.gz[3.3.1 Manifests]
+https://github.com/oracle/coherence-operator/releases/download/v3.3.3/coherence-operator-manifests.tar.gz[3.3.3 Manifests]
 
 These manifest files are for use with a tool called Kustomize, which is built into `kubectl`
 see the documentation here: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/
 
 Download the
-https://github.com/oracle/coherence-operator/releases/download/v3.3.1/coherence-operator-manifests.tar.gz[3.3.1 Manifests]
+https://github.com/oracle/coherence-operator/releases/download/v3.3.3/coherence-operator-manifests.tar.gz[3.3.3 Manifests]
 from the release page and unpack the file, which should produce a directory called `manifests` with a structure like this:
 
 [source]
@@ -711,14 +711,14 @@ Change the name of the Operator image by running the command below, changing the
 that you are using for the Operator, for example if you have the images in a custom registry
 [source,bash]
 ----
-cd ./manager && kustomize edit set image controller=myregistry/coherence-operator:3.3.1
+cd ./manager && kustomize edit set image controller=myregistry/coherence-operator:3.3.3
 ----
 
 Change the name of the Operator image by running the command below, changing the image name to the registry and image name
 that you are using for the Operator utilities image
 [source,bash]
 ----
-cd ./manager && kustomize edit add configmap env-vars --from-literal OPERATOR_IMAGE=myregistry/coherence-operator:3.3.1
+cd ./manager && kustomize edit add configmap env-vars --from-literal OPERATOR_IMAGE=myregistry/coherence-operator:3.3.3
 ----
 
 Change the name of the default Coherence image. If you are always going to be deploying your own application images then this
@@ -796,7 +796,7 @@ This can be done using the Tanzu CLI.
 [source,bash]
 ----
 tanzu package repository add coherence-repo \
-    --url ghcr.io/oracle/coherence-operator-repo:3.3.1 \
+    --url ghcr.io/oracle/coherence-operator-repo:3.3.3 \
     --namespace coherence \
     --create-namespace
 ----
@@ -826,7 +826,7 @@ which should include the Operator package, `coherence-operator.oracle.github.com
 [source,bash]
 ----
 NAME                                  DISPLAY-NAME               SHORT-DESCRIPTION                                             LATEST-VERSION
-coherence-operator.oracle.github.com  Oracle Coherence Operator  A Kubernetes operator for managing Oracle Coherence clusters  3.3.1
+coherence-operator.oracle.github.com  Oracle Coherence Operator  A Kubernetes operator for managing Oracle Coherence clusters  3.3.3
 ----
 
 === Install the Coherence Operator Package
@@ -837,7 +837,7 @@ Once the Coherence Operator repository has been installed, the `coherence-operat
 ----
 tanzu package install coherence \
     --package-name coherence-operator.oracle.github.com \
-    --version 3.3.1 \
+    --version 3.3.3 \
     --namespace coherence
 ----
 
@@ -853,7 +853,7 @@ which should display the Coherence Operator package.
 [source,bash]
 ----
 NAME       PACKAGE-NAME                          PACKAGE-VERSION  STATUS
-coherence  coherence-operator.oracle.github.com  3.3.1            Reconcile succeeded
+coherence  coherence-operator.oracle.github.com  3.3.3            Reconcile succeeded
 ----
 
 The Operator is now installed and ready to mage Coherence clusters.