Skip to content

Version update to 3.5.1 #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -2999,17 +2999,15 @@ 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/<revision>$(subst .,\.,$(VERSION))<\/revision>/<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)"
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)
Expand Down
2 changes: 1 addition & 1 deletion config/components/helm/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:
images:
- name: controller
newName: container-registry.oracle.com/middleware/coherence-operator
newTag: 3.5.0
newTag: 3.5.1
16 changes: 8 additions & 8 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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
8 changes: 4 additions & 4 deletions config/manager/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion config/manager/webhook-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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:
Expand Down Expand Up @@ -121,4 +121,4 @@ spec:
provider:
name: Oracle Corporation
url: https://github.com/oracle/coherence-operator
version: 3.5.0
version: 3.5.1
2 changes: 1 addition & 1 deletion config/network-policy/allow-metrics-traffic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/cluster_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/cluster_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/coherence_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/coherence_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/coherencejob_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/coherencejob_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/leader_election_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/metrics_auth_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/metrics_auth_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/metrics_reader_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/node_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/node_viewer_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
2 changes: 1 addition & 1 deletion docs/about/03_quickstart.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading