From 70dc931668263c464ead088d457671e7730fd8d5 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Tue, 13 May 2025 20:45:05 +0300 Subject: [PATCH] Version update to 3.5.1 --- Makefile | 12 +++++------- config/components/helm/kustomization.yaml | 2 +- config/crd/kustomization.yaml | 2 +- config/default/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 16 ++++++++-------- config/manager/service.yaml | 8 ++++---- config/manager/webhook-secret.yaml | 2 +- ...coherence-operator.clusterserviceversion.yaml | 6 +++--- config/network-policy/allow-metrics-traffic.yaml | 2 +- config/prometheus/monitor.yaml | 2 +- config/rbac/cluster_role.yaml | 2 +- config/rbac/cluster_role_binding.yaml | 2 +- config/rbac/coherence_editor_role.yaml | 2 +- config/rbac/coherence_viewer_role.yaml | 2 +- config/rbac/coherencejob_editor_role.yaml | 2 +- config/rbac/coherencejob_viewer_role.yaml | 2 +- config/rbac/leader_election_role.yaml | 2 +- config/rbac/leader_election_role_binding.yaml | 2 +- config/rbac/metrics_auth_role.yaml | 2 +- config/rbac/metrics_auth_role_binding.yaml | 2 +- config/rbac/metrics_reader_role.yaml | 2 +- config/rbac/node_viewer_role.yaml | 2 +- config/rbac/node_viewer_role_binding.yaml | 2 +- config/rbac/role_binding.yaml | 2 +- config/rbac/service_account.yaml | 2 +- docs/about/03_quickstart.adoc | 2 +- docs/installation/011_install_manifests.adoc | 12 ++++++------ docs/installation/012_install_helm.adoc | 10 +++++----- docs/installation/013_install_kustomize.adoc | 10 +++++----- docs/installation/014_install_openshift.adoc | 2 +- docs/installation/016_install_tanzu.adoc | 8 ++++---- docs/installation/020_RBAC.adoc | 2 +- docs/installation/070_webhooks.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 +- hack/olm/catalog-template.yaml | 4 ++++ .../coherence-operator/templates/deployment.yaml | 2 +- java/pom.xml | 2 +- 51 files changed, 91 insertions(+), 89 deletions(-) diff --git a/Makefile b/Makefile index 2a548703b..38c1c0ae9 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.5.0 +VERSION ?= 3.5.1 MVN_VERSION ?= $(VERSION) # The version number to be replaced by this release -PREV_VERSION ?= 3.4.3 +PREV_VERSION ?= 3.5.0 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.3 +COMPATIBLE_VERSION ?= 3.5.0 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!) COMPATIBLE_SELECTOR ?= control-plane=coherence @@ -2999,8 +2999,8 @@ new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z find config \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + find helm-charts \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} + $(SED) -e 's/$(subst .,\.,$(VERSION))<\/revision>/$(NEXT_VERSION)<\/revision>/g' java/pom.xml - yq -i e 'select(.schema == "olm.template.basic").entries[] |= select(.schema == "olm.channel" and .name == "stable").entries += [{"name" : "coherence-operator.v$(VERSION)", "replaces": "coherence-operator.v$(PREV_VERSION)"}]' $(SCRIPTS_DIR)/olm/olm-catalog-template.yaml - yq -i e 'select(.schema == "olm.template.basic").entries += [{"schema" : "olm.bundle", "image": "$(BUNDLE_IMAGE)"}]' $(SCRIPTS_DIR)/olm/olm-catalog-template.yaml + yq -i e 'select(.schema == "olm.template.basic").entries[] |= select(.schema == "olm.channel" and .name == "stable").entries += [{"name" : "coherence-operator.v$(VERSION)", "replaces": "coherence-operator.v$(PREV_VERSION)"}]' $(SCRIPTS_DIR)/olm/catalog-template.yaml + yq -i e 'select(.schema == "olm.template.basic").entries += [{"schema" : "olm.bundle", "image": "$(BUNDLE_IMAGE)"}]' $(SCRIPTS_DIR)/olm/catalog-template.yaml GIT_BRANCH="version-update-$(VERSION)" @@ -3008,8 +3008,6 @@ GIT_LABEL="version-update" .PHONY: new-version-pr new-version-pr: ## Create a PR to update the version - git config user.email "action@github.com" - git config user.name "GitHub Action" git checkout -b $(GIT_BRANCH) git commit -am "Version update to $(VERSION)" git push --set-upstream origin $(GIT_BRANCH) diff --git a/config/components/helm/kustomization.yaml b/config/components/helm/kustomization.yaml index 1f470defe..ddf23f9f5 100644 --- a/config/components/helm/kustomization.yaml +++ b/config/components/helm/kustomization.yaml @@ -5,5 +5,5 @@ labels: - pairs: control-plane: coherence app.kubernetes.io/name: coherence-operator - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 3e4d10f23..16e4fd2f7 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -44,4 +44,4 @@ labels: app.kubernetes.io/part-of: coherence-operator commonLabels: - app.kubernetes.io/version: 3.5.0 + app.kubernetes.io/version: 3.5.1 diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index f79dcebfb..fc981bc15 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -26,7 +26,7 @@ labels: - pairs: control-plane: coherence app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator # Patch the SERVICE_NAME env var in the Operator Deployment diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 978014432..ec5485b29 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,4 +9,4 @@ resources: images: - name: controller newName: container-registry.oracle.com/middleware/coherence-operator - newTag: 3.5.0 + newTag: 3.5.1 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index a421dc941..64ccd371d 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -6,11 +6,11 @@ metadata: labels: app: coherence-operator control-plane: coherence - version: "3.5.0" + version: "3.5.1" app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator spec: @@ -23,11 +23,11 @@ spec: labels: app: coherence-operator control-plane: coherence - version: "3.5.0" + version: "3.5.1" app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator app.kubernetes.io/created-by: controller-manager @@ -127,7 +127,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -151,7 +151,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" weight: 50 - podAffinityTerm: topologyKey: "oci.oraclecloud.com/fault-domain" @@ -160,7 +160,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" weight: 10 - podAffinityTerm: topologyKey: "kubernetes.io/hostname" @@ -169,5 +169,5 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" weight: 1 diff --git a/config/manager/service.yaml b/config/manager/service.yaml index 39fe6351c..7f3334626 100644 --- a/config/manager/service.yaml +++ b/config/manager/service.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize app.kubernetes.io/instance: coherence-operator-webhook - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: webhook app.kubernetes.io/part-of: coherence-operator spec: @@ -19,7 +19,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: manager --- apiVersion: v1 @@ -31,7 +31,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-rest - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: rest app.kubernetes.io/part-of: coherence-operator spec: @@ -43,5 +43,5 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: manager diff --git a/config/manager/webhook-secret.yaml b/config/manager/webhook-secret.yaml index 330be3cee..8573afda3 100644 --- a/config/manager/webhook-secret.yaml +++ b/config/manager/webhook-secret.yaml @@ -11,5 +11,5 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml index b647f046c..e9a53f4af 100644 --- a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml @@ -8,7 +8,7 @@ metadata: capabilities: Full Lifecycle categories: Database certified: "false" - containerImage: container-registry.oracle.com/middleware/coherence-operator:3.5.0 + containerImage: container-registry.oracle.com/middleware/coherence-operator:3.5.1 description: The Oracle Coherence Kubernetes Operator enables easy management of Coherence clusters in a Kubernetes environment. features.operators.openshift.io/cnf: "false" @@ -29,7 +29,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/oracle/coherence-operator support: Oracle Corporation - name: coherence-operator.v3.5.0 + name: coherence-operator.v3.5.1 spec: apiservicedefinitions: {} customresourcedefinitions: @@ -121,4 +121,4 @@ spec: provider: name: Oracle Corporation url: https://github.com/oracle/coherence-operator - version: 3.5.0 + version: 3.5.1 diff --git a/config/network-policy/allow-metrics-traffic.yaml b/config/network-policy/allow-metrics-traffic.yaml index 18963eb6f..23da2063e 100644 --- a/config/network-policy/allow-metrics-traffic.yaml +++ b/config/network-policy/allow-metrics-traffic.yaml @@ -8,7 +8,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator name: allow-metrics-traffic namespace: system diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 6adfe48dc..e7879a4a3 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator name: controller-manager-metrics-monitor namespace: system diff --git a/config/rbac/cluster_role.yaml b/config/rbac/cluster_role.yaml index 18e002f19..0f20bd2d3 100644 --- a/config/rbac/cluster_role.yaml +++ b/config/rbac/cluster_role.yaml @@ -10,7 +10,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator rules: - apiGroups: diff --git a/config/rbac/cluster_role_binding.yaml b/config/rbac/cluster_role_binding.yaml index a83cda974..59d69235f 100644 --- a/config/rbac/cluster_role_binding.yaml +++ b/config/rbac/cluster_role_binding.yaml @@ -10,7 +10,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/coherence_editor_role.yaml b/config/rbac/coherence_editor_role.yaml index d1d59a24d..01c5f97f2 100644 --- a/config/rbac/coherence_editor_role.yaml +++ b/config/rbac/coherence_editor_role.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator name: coherence-editor-role rules: diff --git a/config/rbac/coherence_viewer_role.yaml b/config/rbac/coherence_viewer_role.yaml index 3d101e849..b6656b0e8 100644 --- a/config/rbac/coherence_viewer_role.yaml +++ b/config/rbac/coherence_viewer_role.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator name: coherence-viewer-role rules: diff --git a/config/rbac/coherencejob_editor_role.yaml b/config/rbac/coherencejob_editor_role.yaml index 7044cfd42..e5de97ad1 100644 --- a/config/rbac/coherencejob_editor_role.yaml +++ b/config/rbac/coherencejob_editor_role.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator name: coherencejob-editor-role rules: diff --git a/config/rbac/coherencejob_viewer_role.yaml b/config/rbac/coherencejob_viewer_role.yaml index 24312eb8c..6e302830a 100644 --- a/config/rbac/coherencejob_viewer_role.yaml +++ b/config/rbac/coherencejob_viewer_role.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator name: coherencejob-viewer-role rules: diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml index 7435a3860..2fcea95d3 100644 --- a/config/rbac/leader_election_role.yaml +++ b/config/rbac/leader_election_role.yaml @@ -7,7 +7,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator rules: - apiGroups: diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index d5dae6ea5..7c32d5130 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/metrics_auth_role.yaml b/config/rbac/metrics_auth_role.yaml index 776eb3f9b..90613a76b 100644 --- a/config/rbac/metrics_auth_role.yaml +++ b/config/rbac/metrics_auth_role.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator rules: - apiGroups: diff --git a/config/rbac/metrics_auth_role_binding.yaml b/config/rbac/metrics_auth_role_binding.yaml index c41c220bc..91affc36f 100644 --- a/config/rbac/metrics_auth_role_binding.yaml +++ b/config/rbac/metrics_auth_role_binding.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/metrics_reader_role.yaml b/config/rbac/metrics_reader_role.yaml index d2f123e5e..740e4908c 100644 --- a/config/rbac/metrics_reader_role.yaml +++ b/config/rbac/metrics_reader_role.yaml @@ -6,7 +6,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator rules: - nonResourceURLs: diff --git a/config/rbac/node_viewer_role.yaml b/config/rbac/node_viewer_role.yaml index 54388d585..b57a25243 100644 --- a/config/rbac/node_viewer_role.yaml +++ b/config/rbac/node_viewer_role.yaml @@ -12,7 +12,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator rules: - apiGroups: diff --git a/config/rbac/node_viewer_role_binding.yaml b/config/rbac/node_viewer_role_binding.yaml index 5705fd997..ae9a549d8 100644 --- a/config/rbac/node_viewer_role_binding.yaml +++ b/config/rbac/node_viewer_role_binding.yaml @@ -12,7 +12,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index 9dd5f3f38..6ffc84c35 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -10,7 +10,7 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml index e579aee64..e39565732 100644 --- a/config/rbac/service_account.yaml +++ b/config/rbac/service_account.yaml @@ -9,6 +9,6 @@ metadata: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/part-of: coherence-operator imagePullSecrets: [] \ No newline at end of file diff --git a/docs/about/03_quickstart.adoc b/docs/about/03_quickstart.adoc index 80c5deb00..90d095c03 100644 --- a/docs/about/03_quickstart.adoc +++ b/docs/about/03_quickstart.adoc @@ -23,7 +23,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.5.0/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.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/011_install_manifests.adoc b/docs/installation/011_install_manifests.adoc index 1c99d4040..243ff3cbc 100644 --- a/docs/installation/011_install_manifests.adoc +++ b/docs/installation/011_install_manifests.adoc @@ -15,7 +15,7 @@ apply the manifests from the Operator release. [NOTE] ==== -As of v3.5.0 of the Operator the manifest yaml also installs the two CRDs that the Operator uses. +As of v3.5.1 of the Operator the manifest yaml also installs the two CRDs that the Operator uses. In previous releases the Operator would install the CRDs when it started but this behaviour is disabled by default when installing with the manifest yaml. ==== @@ -25,7 +25,7 @@ the installation has all the RBAC permissions required to install all the resour [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.0/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.1/coherence-operator.yaml ---- This will create a namespace called `coherence` and install the CRDs and the Operator into the namespace, @@ -80,7 +80,7 @@ The Operator installed with this yaml [NOTE] ==== -As of v3.5.0 of the Operator the `coherence-operator-restricted.yaml` also installs the two CRDs that the Operator uses. +As of v3.5.1 of the Operator the `coherence-operator-restricted.yaml` also installs the two CRDs that the Operator uses. In previous releases the Operator would install the CRDs when it started but this behaviour is disabled by default when installing with the manifest yaml. ==== @@ -90,7 +90,7 @@ the installation has all the RBAC permissions required to install all the resour [source,bash] ---- -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.0/coherence-operator-restricted.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.1/coherence-operator-restricted.yaml ---- [IMPORTANT] ==== @@ -110,8 +110,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.5.0/coherence.oracle.com_coherence_small.yaml -kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.0/coherencejob.oracle.com_coherence_small.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.1/coherence.oracle.com_coherence_small.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.1/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/012_install_helm.adoc b/docs/installation/012_install_helm.adoc index 8d31cd262..a10ae7427 100644 --- a/docs/installation/012_install_helm.adoc +++ b/docs/installation/012_install_helm.adoc @@ -518,14 +518,14 @@ The command above will use all the default configurations, but the usual methods values to the install can be used. [#helm-upgrade-350] -=== Upgrading From pre-3.5.0 Versions +=== Upgrading From pre-3.5.1 Versions -Before version 3.5.0 of the Coherence operator, the operator used to install the CRDs -when it started. In 3.5.0 this behaviour was changed and the operator no longer installs -the CRDs, these must be installed along with the operator. The 3.5.0 and above Helm chart +Before version 3.5.1 of the Coherence operator, the operator used to install the CRDs +when it started. In 3.5.1 this behaviour was changed and the operator no longer installs +the CRDs, these must be installed along with the operator. The 3.5.1 and above Helm chart includes the CRDs. -This causes an issue when performing a Helm upgrade from a pre-3.5.0 version because Helm +This causes an issue when performing a Helm upgrade from a pre-3.5.1 version because Helm did not install the CRDs. When attempting an upgrade Helm will display an error similar to the one below: diff --git a/docs/installation/013_install_kustomize.adoc b/docs/installation/013_install_kustomize.adoc index 3acc5673d..46aea2cc4 100644 --- a/docs/installation/013_install_kustomize.adoc +++ b/docs/installation/013_install_kustomize.adoc @@ -13,20 +13,20 @@ 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.5.0/coherence-operator-manifests.tar.gz[3.5.0 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.5.1/coherence-operator-manifests.tar.gz[3.5.1 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/ [NOTE] ==== -As of v3.5.0 of the Operator the manifest yaml also installs the two CRDs that the Operator uses. +As of v3.5.1 of the Operator the manifest yaml also installs the two CRDs that the Operator uses. In previous releases the Operator would install the CRDs when it started but this behaviour is disabled by default when installing with the manifest yaml. ==== Download the -https://github.com/oracle/coherence-operator/releases/download/v3.5.0/coherence-operator-manifests.tar.gz[3.5.0 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.5.1/coherence-operator-manifests.tar.gz[3.5.1 Manifests] from the release page and unpack the file, which should produce a directory called `manifests` with a structure like this: [source] @@ -79,14 +79,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.5.0 +cd ./manager && kustomize edit set image controller=myregistry/coherence-operator:3.5.1 ---- 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.5.0 +cd ./manager && kustomize edit add configmap env-vars --from-literal OPERATOR_IMAGE=myregistry/coherence-operator:3.5.1 ---- Change the name of the default Coherence image. If you are always going to be deploying your own application images then this diff --git a/docs/installation/014_install_openshift.adoc b/docs/installation/014_install_openshift.adoc index ec93b593e..256259c7c 100644 --- a/docs/installation/014_install_openshift.adoc +++ b/docs/installation/014_install_openshift.adoc @@ -41,7 +41,7 @@ spec: name: coherence-operator source: coherence-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: coherence-operator.v3.5.0 + startingCSV: coherence-operator.v3.5.1 ---- Apply the subscription yaml: diff --git a/docs/installation/016_install_tanzu.adoc b/docs/installation/016_install_tanzu.adoc index 0d537cc13..14fe334d5 100644 --- a/docs/installation/016_install_tanzu.adoc +++ b/docs/installation/016_install_tanzu.adoc @@ -28,7 +28,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.5.0 \ + --url ghcr.io/oracle/coherence-operator-repo:3.5.1 \ --namespace coherence \ --create-namespace ---- @@ -58,7 +58,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.5.0 +coherence-operator.oracle.github.com Oracle Coherence Operator A Kubernetes operator for managing Oracle Coherence clusters 3.5.1 ---- === Install the Coherence Operator Package @@ -69,7 +69,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.5.0 \ + --version 3.5.1 \ --namespace coherence ---- @@ -85,7 +85,7 @@ which should display the Coherence Operator package. [source,bash] ---- NAME PACKAGE-NAME PACKAGE-VERSION STATUS -coherence coherence-operator.oracle.github.com 3.5.0 Reconcile succeeded +coherence coherence-operator.oracle.github.com 3.5.1 Reconcile succeeded ---- The Operator is now installed and ready to mage Coherence clusters. diff --git a/docs/installation/020_RBAC.adoc b/docs/installation/020_RBAC.adoc index b95490830..24a66a462 100644 --- a/docs/installation/020_RBAC.adoc +++ b/docs/installation/020_RBAC.adoc @@ -38,7 +38,7 @@ The two methods of installing the Operator discussed in the < com.google.cloud.tools jib-maven-plugin - 3.5.0 + 3.5.1 diff --git a/examples/095_network_policies/manifests/net-test-client.yaml b/examples/095_network_policies/manifests/net-test-client.yaml index 90e7f6068..df4dfde65 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: container-registry.oracle.com/middleware/coherence-operator:3.5.0 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.1 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 d7fd83d22..58b801737 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: container-registry.oracle.com/middleware/coherence-operator:3.5.0 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.1 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 be2f3df34..369437b8c 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: container-registry.oracle.com/middleware/coherence-operator:3.5.0 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.1 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 2e433feaf..b8c945540 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.5.0" + app.kubernetes.io/version: "3.5.1" 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.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: server spec: containers: - name: net-test - image: container-registry.oracle.com/middleware/coherence-operator:3.5.0 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.1 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 ef47defeb..899827f1e 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.5.0" + app.kubernetes.io/version: "3.5.1" 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.5.0" + app.kubernetes.io/version: "3.5.1" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator coherenceNetTest: operator-client spec: containers: - name: net-test - image: container-registry.oracle.com/middleware/coherence-operator:3.5.0 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.1 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 5e7e7929c..4daae0280 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: container-registry.oracle.com/middleware/coherence-operator:3.5.0 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.1 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 daf42cf3b..d25b2f908 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: container-registry.oracle.com/middleware/coherence-operator-utils:3.5.0 + image: container-registry.oracle.com/middleware/coherence-operator-utils:3.5.1 condition: Ready timeout: 5m interval: 10s diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index 6f6555f59..6dd4cef95 100644 --- a/examples/400_Istio/README.adoc +++ b/examples/400_Istio/README.adoc @@ -12,7 +12,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.5.0 and later work with Istio 1.9.1 and later out of the box. +Coherence clusters managed with the Coherence Operator 3.5.1 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 68dd3147a..daefd68e6 100644 --- a/examples/no-operator/04_istio/Dockerfile +++ b/examples/no-operator/04_istio/Dockerfile @@ -1,4 +1,4 @@ -FROM container-registry.oracle.com/middlewarecoherence-operator:3.5.0 AS Builder +FROM container-registry.oracle.com/middlewarecoherence-operator:3.5.1 AS Builder FROM container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1 COPY --from=Builder /files /files diff --git a/examples/no-operator/04_istio/README.adoc b/examples/no-operator/04_istio/README.adoc index 443de4125..6cf41acf2 100644 --- a/examples/no-operator/04_istio/README.adoc +++ b/examples/no-operator/04_istio/README.adoc @@ -476,7 +476,7 @@ Various utilities are copied from the Operator image into the base. [source] .Dockerfile ---- -FROM container-registry.oracle.com/middleware/coherence-operator:3.5.0 AS Builder +FROM container-registry.oracle.com/middleware/coherence-operator:3.5.1 AS Builder FROM container-registry.oracle.com/middleware/coherence-ce:14.1.2-0-1 COPY --from=Builder /files /files diff --git a/hack/olm/catalog-template.yaml b/hack/olm/catalog-template.yaml index 7906a36a4..be3f0f5dd 100644 --- a/hack/olm/catalog-template.yaml +++ b/hack/olm/catalog-template.yaml @@ -9,5 +9,9 @@ entries: package: coherence-operator entries: - name: coherence-operator.v3.4.3 + - name: coherence-operator.v3.5.0 + replaces: coherence-operator.v3.4.3 - schema: olm.bundle image: ghcr.io/oracle/coherence-operator-bundle:3.4.3 + - schema: olm.bundle + image: container-registry.oracle.com/middleware/coherence-operator-bundle:3.5.0 diff --git a/helm-charts/coherence-operator/templates/deployment.yaml b/helm-charts/coherence-operator/templates/deployment.yaml index 661798c42..4a944189d 100644 --- a/helm-charts/coherence-operator/templates/deployment.yaml +++ b/helm-charts/coherence-operator/templates/deployment.yaml @@ -302,7 +302,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.0" + app.kubernetes.io/version: "3.5.1" {{- end }} {{- if .Values.affinity }} affinity: diff --git a/java/pom.xml b/java/pom.xml index 323247d49..f44c1e4b3 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -31,7 +31,7 @@ - 3.5.0 + 3.5.1 ${project.version} 17