Skip to content

Commit 5432962

Browse files
author
Jonathan Knight
authored
Version update to 3.5.1 (oracle#746)
1 parent a1c4a0c commit 5432962

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+91
-89
lines changed

‎Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
# ======================================================================================================================
1616

1717
# The version of the Operator being build - this should be a valid SemVer format
18-
VERSION ?= 3.5.0
18+
VERSION ?= 3.5.1
1919
MVN_VERSION ?= $(VERSION)
2020

2121
# The version number to be replaced by this release
22-
PREV_VERSION ?= 3.4.3
22+
PREV_VERSION ?= 3.5.0
2323
NEXT_VERSION := $(shell sh ./hack/next-version.sh "$(VERSION)")
2424

2525
# The operator version to use to run certification tests against
2626
CERTIFICATION_VERSION ?= $(VERSION)
2727

2828
# The previous Operator version used to run the compatibility tests.
29-
COMPATIBLE_VERSION ?= 3.4.3
29+
COMPATIBLE_VERSION ?= 3.5.0
3030
# The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!)
3131
COMPATIBLE_SELECTOR ?= control-plane=coherence
3232

@@ -2999,17 +2999,15 @@ new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z
29992999
find config \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} +
30003000
find helm-charts \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} +
30013001
$(SED) -e 's/<revision>$(subst .,\.,$(VERSION))<\/revision>/<revision>$(NEXT_VERSION)<\/revision>/g' java/pom.xml
3002-
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
3003-
yq -i e 'select(.schema == "olm.template.basic").entries += [{"schema" : "olm.bundle", "image": "$(BUNDLE_IMAGE)"}]' $(SCRIPTS_DIR)/olm/olm-catalog-template.yaml
3002+
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
3003+
yq -i e 'select(.schema == "olm.template.basic").entries += [{"schema" : "olm.bundle", "image": "$(BUNDLE_IMAGE)"}]' $(SCRIPTS_DIR)/olm/catalog-template.yaml
30043004

30053005

30063006
GIT_BRANCH="version-update-$(VERSION)"
30073007
GIT_LABEL="version-update"
30083008

30093009
.PHONY: new-version-pr
30103010
new-version-pr: ## Create a PR to update the version
3011-
git config user.email "action@github.com"
3012-
git config user.name "GitHub Action"
30133011
git checkout -b $(GIT_BRANCH)
30143012
git commit -am "Version update to $(VERSION)"
30153013
git push --set-upstream origin $(GIT_BRANCH)

‎config/components/helm/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ labels:
55
- pairs:
66
control-plane: coherence
77
app.kubernetes.io/name: coherence-operator
8-
app.kubernetes.io/version: "3.5.0"
8+
app.kubernetes.io/version: "3.5.1"
99
app.kubernetes.io/part-of: coherence-operator

‎config/crd/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ labels:
4444
app.kubernetes.io/part-of: coherence-operator
4545

4646
commonLabels:
47-
app.kubernetes.io/version: 3.5.0
47+
app.kubernetes.io/version: 3.5.1

‎config/default/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ labels:
2626
- pairs:
2727
control-plane: coherence
2828
app.kubernetes.io/managed-by: kustomize
29-
app.kubernetes.io/version: "3.5.0"
29+
app.kubernetes.io/version: "3.5.1"
3030
app.kubernetes.io/part-of: coherence-operator
3131

3232
# Patch the SERVICE_NAME env var in the Operator Deployment

‎config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ resources:
99
images:
1010
- name: controller
1111
newName: container-registry.oracle.com/middleware/coherence-operator
12-
newTag: 3.5.0
12+
newTag: 3.5.1

‎config/manager/manager.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ metadata:
66
labels:
77
app: coherence-operator
88
control-plane: coherence
9-
version: "3.5.0"
9+
version: "3.5.1"
1010
app.kubernetes.io/name: coherence-operator
1111
app.kubernetes.io/managed-by: kustomize
1212
app.kubernetes.io/instance: coherence-operator-manager
13-
app.kubernetes.io/version: "3.5.0"
13+
app.kubernetes.io/version: "3.5.1"
1414
app.kubernetes.io/component: manager
1515
app.kubernetes.io/part-of: coherence-operator
1616
spec:
@@ -23,11 +23,11 @@ spec:
2323
labels:
2424
app: coherence-operator
2525
control-plane: coherence
26-
version: "3.5.0"
26+
version: "3.5.1"
2727
app.kubernetes.io/name: coherence-operator
2828
app.kubernetes.io/managed-by: kustomize
2929
app.kubernetes.io/instance: coherence-operator-manager
30-
app.kubernetes.io/version: "3.5.0"
30+
app.kubernetes.io/version: "3.5.1"
3131
app.kubernetes.io/component: manager
3232
app.kubernetes.io/part-of: coherence-operator
3333
app.kubernetes.io/created-by: controller-manager
@@ -127,7 +127,7 @@ spec:
127127
control-plane: coherence
128128
app.kubernetes.io/name: coherence-operator
129129
app.kubernetes.io/instance: coherence-operator-manager
130-
app.kubernetes.io/version: "3.5.0"
130+
app.kubernetes.io/version: "3.5.1"
131131
affinity:
132132
nodeAffinity:
133133
requiredDuringSchedulingIgnoredDuringExecution:
@@ -151,7 +151,7 @@ spec:
151151
control-plane: coherence
152152
app.kubernetes.io/name: coherence-operator
153153
app.kubernetes.io/instance: coherence-operator-manager
154-
app.kubernetes.io/version: "3.5.0"
154+
app.kubernetes.io/version: "3.5.1"
155155
weight: 50
156156
- podAffinityTerm:
157157
topologyKey: "oci.oraclecloud.com/fault-domain"
@@ -160,7 +160,7 @@ spec:
160160
control-plane: coherence
161161
app.kubernetes.io/name: coherence-operator
162162
app.kubernetes.io/instance: coherence-operator-manager
163-
app.kubernetes.io/version: "3.5.0"
163+
app.kubernetes.io/version: "3.5.1"
164164
weight: 10
165165
- podAffinityTerm:
166166
topologyKey: "kubernetes.io/hostname"
@@ -169,5 +169,5 @@ spec:
169169
control-plane: coherence
170170
app.kubernetes.io/name: coherence-operator
171171
app.kubernetes.io/instance: coherence-operator-manager
172-
app.kubernetes.io/version: "3.5.0"
172+
app.kubernetes.io/version: "3.5.1"
173173
weight: 1

‎config/manager/service.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/name: coherence-operator
88
app.kubernetes.io/managed-by: kustomize
99
app.kubernetes.io/instance: coherence-operator-webhook
10-
app.kubernetes.io/version: "3.5.0"
10+
app.kubernetes.io/version: "3.5.1"
1111
app.kubernetes.io/component: webhook
1212
app.kubernetes.io/part-of: coherence-operator
1313
spec:
@@ -19,7 +19,7 @@ spec:
1919
control-plane: coherence
2020
app.kubernetes.io/name: coherence-operator
2121
app.kubernetes.io/instance: coherence-operator-manager
22-
app.kubernetes.io/version: "3.5.0"
22+
app.kubernetes.io/version: "3.5.1"
2323
app.kubernetes.io/component: manager
2424
---
2525
apiVersion: v1
@@ -31,7 +31,7 @@ metadata:
3131
control-plane: coherence
3232
app.kubernetes.io/name: coherence-operator
3333
app.kubernetes.io/instance: coherence-operator-rest
34-
app.kubernetes.io/version: "3.5.0"
34+
app.kubernetes.io/version: "3.5.1"
3535
app.kubernetes.io/component: rest
3636
app.kubernetes.io/part-of: coherence-operator
3737
spec:
@@ -43,5 +43,5 @@ spec:
4343
control-plane: coherence
4444
app.kubernetes.io/name: coherence-operator
4545
app.kubernetes.io/instance: coherence-operator-manager
46-
app.kubernetes.io/version: "3.5.0"
46+
app.kubernetes.io/version: "3.5.1"
4747
app.kubernetes.io/component: manager

‎config/manager/webhook-secret.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ metadata:
1111
control-plane: coherence
1212
app.kubernetes.io/name: coherence-operator
1313
app.kubernetes.io/managed-by: kustomize
14-
app.kubernetes.io/version: "3.5.0"
14+
app.kubernetes.io/version: "3.5.1"
1515
app.kubernetes.io/part-of: coherence-operator

‎config/manifests/bases/coherence-operator.clusterserviceversion.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
capabilities: Full Lifecycle
99
categories: Database
1010
certified: "false"
11-
containerImage: container-registry.oracle.com/middleware/coherence-operator:3.5.0
11+
containerImage: container-registry.oracle.com/middleware/coherence-operator:3.5.1
1212
description: The Oracle Coherence Kubernetes Operator enables easy management
1313
of Coherence clusters in a Kubernetes environment.
1414
features.operators.openshift.io/cnf: "false"
@@ -29,7 +29,7 @@ metadata:
2929
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
3030
repository: https://github.com/oracle/coherence-operator
3131
support: Oracle Corporation
32-
name: coherence-operator.v3.5.0
32+
name: coherence-operator.v3.5.1
3333
spec:
3434
apiservicedefinitions: {}
3535
customresourcedefinitions:
@@ -121,4 +121,4 @@ spec:
121121
provider:
122122
name: Oracle Corporation
123123
url: https://github.com/oracle/coherence-operator
124-
version: 3.5.0
124+
version: 3.5.1

‎config/network-policy/allow-metrics-traffic.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
control-plane: coherence
99
app.kubernetes.io/name: coherence-operator
1010
app.kubernetes.io/managed-by: kustomize
11-
app.kubernetes.io/version: "3.5.0"
11+
app.kubernetes.io/version: "3.5.1"
1212
app.kubernetes.io/part-of: coherence-operator
1313
name: allow-metrics-traffic
1414
namespace: system

0 commit comments

Comments
 (0)