From 7947f6b0e284b97ef41a2a1bf3e5f42b1b3be00f Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Sat, 15 Feb 2025 20:33:36 +0300 Subject: [PATCH] Bump version to 3.4.3 --- .github/workflows/compatibility-tests.yaml | 10 ++++++++++ Makefile | 6 +++--- config/crd/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 16 ++++++++-------- config/manager/service.yaml | 8 ++++---- ...coherence-operator.clusterserviceversion.yaml | 6 +++--- docs/about/03_quickstart.adoc | 2 +- docs/installation/01_installation.adoc | 8 ++++---- docs/installation/07_webhooks.adoc | 2 +- docs/installation/09_RBAC.adoc | 2 +- docs/metrics/020_metrics.adoc | 2 +- docs/networking/020_dual_stack.adoc | 4 ++-- docs/other/041_global_labels.adoc | 2 +- examples/015_simple_image/README.adoc | 2 +- .../manifests/net-test-client.yaml | 2 +- .../manifests/net-test-coherence-server.yaml | 2 +- .../manifests/net-test-coherence.yaml | 2 +- .../manifests/net-test-operator-server.yaml | 6 +++--- .../manifests/net-test-operator.yaml | 6 +++--- .../manifests/net-test-webhook.yaml | 2 +- examples/300_helm/chart/values.yaml | 2 +- examples/400_Istio/README.adoc | 2 +- examples/no-operator/04_istio/Dockerfile | 2 +- examples/no-operator/04_istio/README.adoc | 2 +- .../coherence-operator/templates/deployment.yaml | 2 +- java/pom.xml | 2 +- 27 files changed, 58 insertions(+), 48 deletions(-) diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml index 16bdffd66..6dc2fb87a 100644 --- a/.github/workflows/compatibility-tests.yaml +++ b/.github/workflows/compatibility-tests.yaml @@ -37,6 +37,8 @@ jobs: fail-fast: false matrix: compatibilityVersion: + - 3.4.2 + - 3.4.1 - 3.4.0 - 3.3.5 - 3.3.4 @@ -50,6 +52,14 @@ jobs: - 3.2.7 - 3.2.6 include: + - compatibilityVersion: 3.4.2 + coherence-image: "ghcr.io/oracle/coherence-ce:14.1.2-0-1" + compatibilitySelector: control-plane=coherence + k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 + - compatibilityVersion: 3.4.1 + coherence-image: "ghcr.io/oracle/coherence-ce:14.1.2-0-1" + compatibilitySelector: control-plane=coherence + k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 - compatibilityVersion: 3.4.0 coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10" compatibilitySelector: control-plane=coherence diff --git a/Makefile b/Makefile index c293724ab..55e1ac1ad 100644 --- a/Makefile +++ b/Makefile @@ -15,18 +15,18 @@ # ====================================================================================================================== # The version of the Operator being build - this should be a valid SemVer format -VERSION ?= 3.4.2 +VERSION ?= 3.4.3 MVN_VERSION ?= $(VERSION) # The version number to be replaced by this release -PREV_VERSION ?= 3.4.1 +PREV_VERSION ?= 3.4.2 NEXT_VERSION := $(shell sh ./hack/next-version.sh "$(VERSION)") # 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.4.1 +COMPATIBLE_VERSION ?= 3.4.2 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!) COMPATIBLE_SELECTOR ?= control-plane=coherence diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index bd4b57bcf..1b75c7dab 100644 --- 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.2 + app.kubernetes.io/version: 3.4.3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 74fc18407..24f912f3d 100644 --- 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.2 + newTag: 3.4.3 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index a166252c3..cf262b3ef 100644 --- 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.2" - version: "3.4.2" + app.kubernetes.io/version: "3.4.3" + version: "3.4.3" 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.2" - version: "3.4.2" + app.kubernetes.io/version: "3.4.3" + version: "3.4.3" 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.2" + app.kubernetes.io/version: "3.4.3" 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.2" + app.kubernetes.io/version: "3.4.3" 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.2" + app.kubernetes.io/version: "3.4.3" 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.2" + app.kubernetes.io/version: "3.4.3" weight: 1 diff --git a/config/manager/service.yaml b/config/manager/service.yaml index 3635c946f..a06e574ea 100644 --- 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.2" + app.kubernetes.io/version: "3.4.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.4.2" + app.kubernetes.io/version: "3.4.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.4.2" + app.kubernetes.io/version: "3.4.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.4.2" + app.kubernetes.io/version: "3.4.3" app.kubernetes.io/component: manager diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml index f73d27dc8..e8d1a8c5c 100644 --- 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.2' + containerImage: 'ghcr.io/oracle/coherence-operator:3.4.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.4.2 + name: coherence-operator.v3.4.3 namespace: placeholder spec: apiservicedefinitions: {} @@ -65,4 +65,4 @@ spec: provider: name: Oracle url: https://oracle.github.io/coherence-operator/docs/latest - version: 3.4.2 + version: 3.4.3 diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc index 0c626a1a4..30183df8b 100644 --- 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.2/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.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/installation/01_installation.adoc b/docs/installation/01_installation.adoc index ceb7e854e..96eab5e3d 100644 --- a/docs/installation/01_installation.adoc +++ b/docs/installation/01_installation.adoc @@ -152,7 +152,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.2/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.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. @@ -196,7 +196,7 @@ The Operator installed with this yaml [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.2/coherence-operator-restricted.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.3/coherence-operator-restricted.yaml ---- [IMPORTANT] @@ -215,8 +215,8 @@ The Operator release artifacts include small versions of the two CRDs which can [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.2/coherence.oracle.com_coherence_small.yaml -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.2/coherencejob.oracle.com_coherence_small.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.3/coherence.oracle.com_coherence_small.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.3/coherencejob.oracle.com_coherence_small.yaml ---- The small versions of the CRDs are identical to the full versions but hav a cut down OpenAPI spec with a lot of comments diff --git a/docs/installation/07_webhooks.adoc b/docs/installation/07_webhooks.adoc index f53291921..7163650b4 100644 --- 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.2/coherence-operator.yaml \ +curl -L https://github.com/oracle/coherence-operator/releases/download/v3.4.3/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 index 56e2b7eb0..67104c892 100644 --- 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 < com.google.cloud.tools jib-maven-plugin - 3.4.2 + 3.4.3 diff --git a/examples/095_network_policies/manifests/net-test-client.yaml b/examples/095_network_policies/manifests/net-test-client.yaml index afa6cf94e..a6cc0d0dd 100644 --- a/examples/095_network_policies/manifests/net-test-client.yaml +++ b/examples/095_network_policies/manifests/net-test-client.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.2 + image: ghcr.io/oracle/coherence-operator:3.4.3 env: - name: HOST value: net-test-coherence-server.coh-test.svc diff --git a/examples/095_network_policies/manifests/net-test-coherence-server.yaml b/examples/095_network_policies/manifests/net-test-coherence-server.yaml index 78f537239..4adedeec6 100644 --- a/examples/095_network_policies/manifests/net-test-coherence-server.yaml +++ b/examples/095_network_policies/manifests/net-test-coherence-server.yaml @@ -43,7 +43,7 @@ metadata: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.2 + image: ghcr.io/oracle/coherence-operator:3.4.3 ports: - containerPort: 9612 name: metrics diff --git a/examples/095_network_policies/manifests/net-test-coherence.yaml b/examples/095_network_policies/manifests/net-test-coherence.yaml index 1e14c69df..46b14945e 100644 --- a/examples/095_network_policies/manifests/net-test-coherence.yaml +++ b/examples/095_network_policies/manifests/net-test-coherence.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.2 + image: ghcr.io/oracle/coherence-operator:3.4.3 env: - name: CLUSTER_HOST value: net-test-coherence-server.coh-test.svc diff --git a/examples/095_network_policies/manifests/net-test-operator-server.yaml b/examples/095_network_policies/manifests/net-test-operator-server.yaml index d216a0e53..0440cc280 100644 --- a/examples/095_network_policies/manifests/net-test-operator-server.yaml +++ b/examples/095_network_policies/manifests/net-test-operator-server.yaml @@ -6,7 +6,7 @@ spec: selector: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.2" + app.kubernetes.io/version: "3.4.3" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: server @@ -27,14 +27,14 @@ metadata: labels: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.2" + app.kubernetes.io/version: "3.4.3" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: server spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.2 + image: ghcr.io/oracle/coherence-operator:3.4.3 ports: - containerPort: 8000 name: operator diff --git a/examples/095_network_policies/manifests/net-test-operator.yaml b/examples/095_network_policies/manifests/net-test-operator.yaml index 9d380b452..4e43e65f5 100644 --- a/examples/095_network_policies/manifests/net-test-operator.yaml +++ b/examples/095_network_policies/manifests/net-test-operator.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.2" + app.kubernetes.io/version: "3.4.3" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: operator-client @@ -15,14 +15,14 @@ spec: labels: app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.2" + app.kubernetes.io/version: "3.4.3" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: operator-client spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.2 + image: ghcr.io/oracle/coherence-operator:3.4.3 env: - name: CLUSTER_HOST value: net-test-coherence-server.coh-test.svc diff --git a/examples/095_network_policies/manifests/net-test-webhook.yaml b/examples/095_network_policies/manifests/net-test-webhook.yaml index b8ce77c2d..747aef388 100644 --- a/examples/095_network_policies/manifests/net-test-webhook.yaml +++ b/examples/095_network_policies/manifests/net-test-webhook.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: net-test - image: ghcr.io/oracle/coherence-operator:3.4.2 + image: ghcr.io/oracle/coherence-operator:3.4.3 env: - name: OPERATOR_HOST value: net-test-operator-server.coherence.svc diff --git a/examples/300_helm/chart/values.yaml b/examples/300_helm/chart/values.yaml index e94799cb7..4e8f497ca 100644 --- a/examples/300_helm/chart/values.yaml +++ b/examples/300_helm/chart/values.yaml @@ -5,7 +5,7 @@ operator: namespace: coherence service: coherence-operator-rest port: 8000 - image: ghcr.io/oracle/coherence-operator-utils:3.4.2 + image: ghcr.io/oracle/coherence-operator-utils:3.4.3 condition: Ready timeout: 5m interval: 10s diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index 456c1c23e..4c96013a4 100644 --- a/examples/400_Istio/README.adoc +++ b/examples/400_Istio/README.adoc @@ -10,7 +10,7 @@ == Using Coherence with Istio You can run the Coherence cluster and manage them using the Coherence Operator alongside https://istio.io[Istio]. -Coherence clusters managed with the Coherence Operator 3.4.2 and later work with Istio 1.9.1 and later out of the box. +Coherence clusters managed with the Coherence Operator 3.4.3 and later work with Istio 1.9.1 and later out of the box. Coherence caches can be accessed from outside the Coherence cluster via Coherence*Extend, REST, and other supported Coherence clients. Using Coherence clusters with Istio does not require the Coherence Operator to also be using Istio (and vice-versa) . diff --git a/examples/no-operator/04_istio/Dockerfile b/examples/no-operator/04_istio/Dockerfile index 02aa695e6..bf6a9fb32 100644 --- a/examples/no-operator/04_istio/Dockerfile +++ b/examples/no-operator/04_istio/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/oracle/coherence-operator:3.4.2 AS Builder +FROM ghcr.io/oracle/coherence-operator:3.4.3 AS Builder FROM ghcr.io/oracle/coherence-ce:22.06.10 COPY --from=Builder /files /files diff --git a/examples/no-operator/04_istio/README.adoc b/examples/no-operator/04_istio/README.adoc index c0a4f899b..8a72281c8 100644 --- a/examples/no-operator/04_istio/README.adoc +++ b/examples/no-operator/04_istio/README.adoc @@ -474,7 +474,7 @@ Various utilities are copied from the Operator image into the base. [source] .Dockerfile ---- -FROM ghcr.io/oracle/coherence-operator:3.4.2 AS Builder +FROM ghcr.io/oracle/coherence-operator:3.4.3 AS Builder FROM ghcr.io/oracle/coherence-ce:22.06.7 COPY --from=Builder /files /files diff --git a/helm-charts/coherence-operator/templates/deployment.yaml b/helm-charts/coherence-operator/templates/deployment.yaml index e471ee6e3..9cedc86b9 100644 --- a/helm-charts/coherence-operator/templates/deployment.yaml +++ b/helm-charts/coherence-operator/templates/deployment.yaml @@ -287,7 +287,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.4.2" + app.kubernetes.io/version: "3.4.3" {{- end }} {{- if .Values.affinity }} affinity: diff --git a/java/pom.xml b/java/pom.xml index 0be363740..c57d9047e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -33,7 +33,7 @@ - 3.4.2 + 3.4.3 ${project.version} 17