diff --git a/Makefile b/Makefile index e8899516..fd31f984 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.1 +VERSION ?= 3.5.2 MVN_VERSION ?= $(VERSION) # The version number to be replaced by this release -PREV_VERSION ?= 3.5.0 +PREV_VERSION ?= 3.5.1 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.5.0 +COMPATIBLE_VERSION ?= 3.5.1 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!) COMPATIBLE_SELECTOR ?= control-plane=coherence @@ -3000,8 +3000,7 @@ new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z 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/catalog-template.yaml - yq -i e 'select(.schema == "olm.template.basic").entries += [{"schema" : "olm.bundle", "image": "$(BUNDLE_IMAGE)"}]' $(SCRIPTS_DIR)/olm/catalog-template.yaml - + yq -i e 'select(.schema == "olm.template.basic").entries += [{"schema" : "olm.bundle", "image": "$(GITHUB_REGISTRY)/$(OPERATOR_IMAGE_NAME)-bundle:$(VERSION)"}]' $(SCRIPTS_DIR)/olm/catalog-template.yaml GIT_BRANCH="version-update-$(VERSION)" GIT_LABEL="version-update" diff --git a/config/components/helm/kustomization.yaml b/config/components/helm/kustomization.yaml index ddf23f9f..b22167a0 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.1" + app.kubernetes.io/version: "3.5.2" app.kubernetes.io/part-of: coherence-operator diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 16e4fd2f..fb37b5e5 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.1 + app.kubernetes.io/version: 3.5.2 diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index fc981bc1..d9bb132f 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.1" + app.kubernetes.io/version: "3.5.2" 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 ec5485b2..8d1981d1 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.1 + newTag: 3.5.2 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 58964090..073a8640 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.1" + version: "3.5.2" 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.1" + app.kubernetes.io/version: "3.5.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator spec: @@ -24,11 +24,11 @@ spec: labels: app: coherence-operator control-plane: coherence - version: "3.5.1" + version: "3.5.2" 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.1" + app.kubernetes.io/version: "3.5.2" app.kubernetes.io/component: manager app.kubernetes.io/part-of: coherence-operator app.kubernetes.io/created-by: controller-manager @@ -128,7 +128,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.1" + app.kubernetes.io/version: "3.5.2" affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -152,7 +152,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.1" + app.kubernetes.io/version: "3.5.2" weight: 50 - podAffinityTerm: topologyKey: "oci.oraclecloud.com/fault-domain" @@ -161,7 +161,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.1" + app.kubernetes.io/version: "3.5.2" weight: 10 - podAffinityTerm: topologyKey: "kubernetes.io/hostname" @@ -170,5 +170,5 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.1" + app.kubernetes.io/version: "3.5.2" weight: 1 diff --git a/config/manager/service.yaml b/config/manager/service.yaml index 7f333462..1fe004e4 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.1" + app.kubernetes.io/version: "3.5.2" 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.1" + app.kubernetes.io/version: "3.5.2" 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.1" + app.kubernetes.io/version: "3.5.2" 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.1" + app.kubernetes.io/version: "3.5.2" app.kubernetes.io/component: manager diff --git a/config/manager/webhook-secret.yaml b/config/manager/webhook-secret.yaml index 8573afda..aa5a48eb 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.1" + app.kubernetes.io/version: "3.5.2" 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 e9a53f4a..c017d3a5 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.1 + containerImage: container-registry.oracle.com/middleware/coherence-operator:3.5.2 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.1 + name: coherence-operator.v3.5.2 spec: apiservicedefinitions: {} customresourcedefinitions: @@ -121,4 +121,4 @@ spec: provider: name: Oracle Corporation url: https://github.com/oracle/coherence-operator - version: 3.5.1 + version: 3.5.2 diff --git a/config/network-policy/allow-metrics-traffic.yaml b/config/network-policy/allow-metrics-traffic.yaml index 23da2063..2b3dbdb3 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.1" + app.kubernetes.io/version: "3.5.2" 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 e7879a4a..447bf4d8 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.1" + app.kubernetes.io/version: "3.5.2" 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 0f20bd2d..22b6c442 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.1" + app.kubernetes.io/version: "3.5.2" 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 59d69235..63a1fce4 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.1" + app.kubernetes.io/version: "3.5.2" 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 01c5f97f..5cdf1286 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.1" + app.kubernetes.io/version: "3.5.2" 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 b6656b0e..61e08932 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.1" + app.kubernetes.io/version: "3.5.2" 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 e5de97ad..0405933a 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.1" + app.kubernetes.io/version: "3.5.2" 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 6e302830..3960e03a 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.1" + app.kubernetes.io/version: "3.5.2" 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 2fcea95d..31c857c0 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.1" + app.kubernetes.io/version: "3.5.2" 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 7c32d513..c68bdb16 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.1" + app.kubernetes.io/version: "3.5.2" 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 90613a76..d8875b1e 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.1" + app.kubernetes.io/version: "3.5.2" 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 91affc36..408c11d9 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.1" + app.kubernetes.io/version: "3.5.2" 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 740e4908..6839f83a 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.1" + app.kubernetes.io/version: "3.5.2" 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 b57a2524..1be6aa52 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.1" + app.kubernetes.io/version: "3.5.2" 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 ae9a549d..04d870f2 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.1" + app.kubernetes.io/version: "3.5.2" 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 6ffc84c3..951b2e30 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.1" + app.kubernetes.io/version: "3.5.2" 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 e3956573..b3be7367 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.1" + app.kubernetes.io/version: "3.5.2" 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 ec7970a7..4671ff0e 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.1/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.2/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 243ff3cb..e716da0d 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.1 of the Operator the manifest yaml also installs the two CRDs that the Operator uses. +As of v3.5.2 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.1/coherence-operator.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.2/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.1 of the Operator the `coherence-operator-restricted.yaml` also installs the two CRDs that the Operator uses. +As of v3.5.2 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.1/coherence-operator-restricted.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.2/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.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 +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.2/coherence.oracle.com_coherence_small.yaml +kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.5.2/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 a10ae742..2241aa2e 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.1 Versions +=== Upgrading From pre-3.5.2 Versions -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 +Before version 3.5.2 of the Coherence operator, the operator used to install the CRDs +when it started. In 3.5.2 this behaviour was changed and the operator no longer installs +the CRDs, these must be installed along with the operator. The 3.5.2 and above Helm chart includes the CRDs. -This causes an issue when performing a Helm upgrade from a pre-3.5.1 version because Helm +This causes an issue when performing a Helm upgrade from a pre-3.5.2 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 46aea2cc..37bd1cb0 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.1/coherence-operator-manifests.tar.gz[3.5.1 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.5.2/coherence-operator-manifests.tar.gz[3.5.2 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.1 of the Operator the manifest yaml also installs the two CRDs that the Operator uses. +As of v3.5.2 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.1/coherence-operator-manifests.tar.gz[3.5.1 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.5.2/coherence-operator-manifests.tar.gz[3.5.2 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.1 +cd ./manager && kustomize edit set image controller=myregistry/coherence-operator:3.5.2 ---- 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.1 +cd ./manager && kustomize edit add configmap env-vars --from-literal OPERATOR_IMAGE=myregistry/coherence-operator:3.5.2 ---- 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 256259c7..797da878 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.1 + startingCSV: coherence-operator.v3.5.2 ---- Apply the subscription yaml: diff --git a/docs/installation/016_install_tanzu.adoc b/docs/installation/016_install_tanzu.adoc index 14fe334d..19676410 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.1 \ + --url ghcr.io/oracle/coherence-operator-repo:3.5.2 \ --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.1 +coherence-operator.oracle.github.com Oracle Coherence Operator A Kubernetes operator for managing Oracle Coherence clusters 3.5.2 ---- === 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.1 \ + --version 3.5.2 \ --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.1 Reconcile succeeded +coherence coherence-operator.oracle.github.com 3.5.2 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 a81dbc7a..7caf1a4a 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.1 + 3.5.2 diff --git a/examples/095_network_policies/manifests/net-test-client.yaml b/examples/095_network_policies/manifests/net-test-client.yaml index df4dfde6..f57448b8 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.1 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.2 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 58b80173..1a386280 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.1 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.2 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 369437b8..589d89eb 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.1 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.2 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 b8c94554..e0700174 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.1" + app.kubernetes.io/version: "3.5.2" 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.1" + app.kubernetes.io/version: "3.5.2" 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.1 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.2 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 899827f1..e0c0db2f 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.1" + app.kubernetes.io/version: "3.5.2" 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.1" + app.kubernetes.io/version: "3.5.2" 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.1 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.2 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 4daae028..7d229f72 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.1 + image: container-registry.oracle.com/middleware/coherence-operator:3.5.2 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 d25b2f90..631b7115 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.1 + image: container-registry.oracle.com/middleware/coherence-operator-utils:3.5.2 condition: Ready timeout: 5m interval: 10s diff --git a/examples/400_Istio/README.adoc b/examples/400_Istio/README.adoc index 9c202d41..454cc9a4 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.1 and later work with Istio 1.9.1 and later out of the box. +Coherence clusters managed with the Coherence Operator 3.5.2 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 daefd68e..600980e5 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.1 AS Builder +FROM container-registry.oracle.com/middlewarecoherence-operator:3.5.2 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 6cf41acf..ad1e0c43 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.1 AS Builder +FROM container-registry.oracle.com/middleware/coherence-operator:3.5.2 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 be3f0f5d..d74b0e72 100644 --- a/hack/olm/catalog-template.yaml +++ b/hack/olm/catalog-template.yaml @@ -11,7 +11,11 @@ entries: - name: coherence-operator.v3.4.3 - name: coherence-operator.v3.5.0 replaces: coherence-operator.v3.4.3 + - name: coherence-operator.v3.5.1 + replaces: coherence-operator.v3.5.0 - 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 + image: ghcr.io/oracle/coherence-operator-bundle:3.5.0 + - schema: olm.bundle + image: ghcr.io/oracle/coherence-operator-bundle:3.5.1 diff --git a/helm-charts/coherence-operator/templates/deployment.yaml b/helm-charts/coherence-operator/templates/deployment.yaml index 44bdd73e..25a61be6 100644 --- a/helm-charts/coherence-operator/templates/deployment.yaml +++ b/helm-charts/coherence-operator/templates/deployment.yaml @@ -323,7 +323,7 @@ spec: control-plane: coherence app.kubernetes.io/name: coherence-operator app.kubernetes.io/instance: coherence-operator-manager - app.kubernetes.io/version: "3.5.1" + app.kubernetes.io/version: "3.5.2" {{- end }} {{- if .Values.affinity }} affinity: diff --git a/java/pom.xml b/java/pom.xml index f44c1e4b..cc4555bf 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -31,7 +31,7 @@ - 3.5.1 + 3.5.2 ${project.version} 17