Skip to content

Commit b93bdea

Browse files
thegridmanthegridman
authored
Prepare version 3.4.1 (#670)
1 parent 0767a41 commit b93bdea

File tree

30 files changed

+92
-76
lines changed

30 files changed

+92
-76
lines changed

‎.github/workflows/coherence-matrix.yaml‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ jobs:
3535
matrixName:
3636
- "15.1.1-0-SNAPSHOT"
3737
- "15.1.1-0-SNAPSHOT-Graal"
38-
- "23.09"
39-
- "23.09-Graal"
38+
- "24.03"
39+
- "24.03-Graal"
4040
- "22.06"
41+
- "14.1.2-0-SNAPSHOT"
4142
- "14.1.1-2206-SNAPSHOT"
4243
- "14.1.1-0-SNAPSHOT"
4344
- "14.1.1-0"
@@ -57,40 +58,46 @@ jobs:
5758
javaVersion: 17
5859
baseImage: "gcr.io/distroless/java17-debian12"
5960

60-
- matrixName: "23.09"
61-
coherenceVersion: "23.09.1"
62-
coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1"
61+
- matrixName: "24.03"
62+
coherenceVersion: "24.03.1"
63+
coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1"
6364
javaVersion: 17
6465
baseImage: "gcr.io/distroless/java17-debian12"
6566

66-
- matrixName: "23.09-Graal"
67-
coherenceVersion: "23.09.1"
68-
coherenceImage: "ghcr.io/oracle/coherence-ce:23.09.1-graal"
67+
- matrixName: "24.03-Graal"
68+
coherenceVersion: "24.03.1"
69+
coherenceImage: "ghcr.io/oracle/coherence-ce:24.03.1-graal"
6970
javaVersion: 17
7071
baseImage: "gcr.io/distroless/java17-debian12"
7172

7273
- matrixName: "22.06"
73-
coherenceVersion: "22.06.7"
74-
coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.7"
74+
coherenceVersion: "22.06.9"
75+
coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.9"
7576
javaVersion: 11
7677
baseImage: "gcr.io/distroless/java11-debian11"
7778

79+
- matrixName: "14.1.2-0-SNAPSHOT"
80+
coherenceVersion: "14.1.2-0-0-SNAPSHOT"
81+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.2-0-0-SNAPSHOT"
82+
javaVersion: 17
83+
baseImage: "gcr.io/distroless/java17-debian12"
84+
7885
- matrixName: "14.1.1-2206-SNAPSHOT"
79-
coherenceVersion: "14.1.1-2206-8-SNAPSHOT"
80-
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-8-SNAPSHOT"
86+
coherenceVersion: "14.1.1-2206-10-SNAPSHOT"
87+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-10-SNAPSHOT"
8188
javaVersion: 11
8289
baseImage: "gcr.io/distroless/java11-debian11"
8390

8491
- matrixName: "14.1.1-0-SNAPSHOT"
85-
coherenceVersion: "14.1.1-0-17-SNAPSHOT"
86-
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-17-SNAPSHOT"
92+
coherenceVersion: "14.1.1-0-19-SNAPSHOT"
93+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-19-SNAPSHOT"
8794
javaVersion: 8
8895
baseImage: "gcr.io/distroless/java11-debian11"
8996

9097
- matrixName: "14.1.1-0"
91-
coherenceVersion: "14.1.1-0-16"
98+
coherenceVersion: "14.1.1-0-18"
9299
javaVersion: 8
93-
coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-16"
100+
coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-18"
94101
baseImage: "gcr.io/distroless/java11-debian11"
95102

96103
- matrixName: "14.1.1.0.0"
@@ -106,7 +113,7 @@ jobs:
106113
baseImage: "gcr.io/distroless/java11-debian11"
107114

108115
- matrixName: "12.2.1-4-SNAPSHOT"
109-
coherenceVersion: "12.2.1-4-20-SNAPSHOT"
116+
coherenceVersion: "12.2.1-4-21-SNAPSHOT"
110117
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-21-SNAPSHOT"
111118
javaVersion: 8
112119
baseImage: "gcr.io/distroless/java11-debian11"

‎.github/workflows/compatibility-tests.yaml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
compatibilityVersion:
40+
- 3.4.0
4041
- 3.3.5
4142
- 3.3.4
4243
- 3.3.3
@@ -49,48 +50,52 @@ jobs:
4950
- 3.2.7
5051
- 3.2.6
5152
include:
53+
- compatibilityVersion: 3.4.0
54+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
55+
compatibilitySelector: control-plane=coherence
56+
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
5257
- compatibilityVersion: 3.3.5
53-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
58+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
5459
compatibilitySelector: control-plane=coherence
5560
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
5661
- compatibilityVersion: 3.3.4
57-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
62+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
5863
compatibilitySelector: control-plane=coherence
5964
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
6065
- compatibilityVersion: 3.3.3
61-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
66+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
6267
compatibilitySelector: control-plane=coherence
6368
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
6469
- compatibilityVersion: 3.3.2
65-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
70+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
6671
compatibilitySelector: control-plane=coherence
6772
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
6873
- compatibilityVersion: 3.3.1
69-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
74+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
7075
compatibilitySelector: control-plane=coherence
7176
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
7277
- compatibilityVersion: 3.3.0
73-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
78+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
7479
compatibilitySelector: control-plane=coherence
7580
k8s: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
7681
- compatibilityVersion: 3.2.11
77-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
82+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
7883
compatibilitySelector: control-plane=coherence
7984
k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
8085
- compatibilityVersion: 3.2.10
81-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
86+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
8287
compatibilitySelector: control-plane=coherence
8388
k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
8489
- compatibilityVersion: 3.2.9
85-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
90+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
8691
compatibilitySelector: control-plane=coherence
8792
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
8893
- compatibilityVersion: 3.2.7
89-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
94+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
9095
compatibilitySelector: control-plane=coherence
9196
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
9297
- compatibilityVersion: 3.2.6
93-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
98+
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.9"
9499
compatibilitySelector: control-plane=coherence
95100
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
96101

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
with:
126126
upload_url: ${{ github.event.release.upload_url }}
127127
asset_path: /tmp/coherence-operator/_output/manifests/crd/coherencejob.oracle.com_coherence.yaml
128-
asset_name: coherence.oracle.com_coherence.yaml
128+
asset_name: coherencejob.oracle.com_coherence.yaml
129129
asset_content_type: text/plain
130130

131131
- name: Upload Release Small Job CRD
@@ -136,7 +136,7 @@ jobs:
136136
with:
137137
upload_url: ${{ github.event.release.upload_url }}
138138
asset_path: /tmp/coherence-operator/_output/manifests/crd-small/coherencejob.oracle.com_coherence.yaml
139-
asset_name: coherence.oracle.com_coherence_small.yaml
139+
asset_name: coherencejob.oracle.com_coherence_small.yaml
140140
asset_content_type: text/plain
141141

142142
- name: Upload Release Dashboards

‎Makefile‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
# ======================================================================================================================
1616

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

2121
# The version number to be replaced by this release
22-
PREV_VERSION ?= 3.3.5
22+
PREV_VERSION ?= 3.4.0
2323

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

2727
# The previous Operator version used to run the compatibility tests.
28-
COMPATIBLE_VERSION ?= 3.3.5
28+
COMPATIBLE_VERSION ?= 3.4.0
2929
# The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!)
3030
COMPATIBLE_SELECTOR ?= control-plane=coherence
3131

@@ -39,7 +39,7 @@ KUBERNETES_DOC_VERSION=v1.30
3939
# ----------------------------------------------------------------------------------------------------------------------
4040
# The Coherence version to build against - must be a Java 8 compatible version
4141
COHERENCE_VERSION ?= 21.12.5
42-
COHERENCE_VERSION_LTS ?= 22.06.8
42+
COHERENCE_VERSION_LTS ?= 22.06.9
4343
# The default Coherence image the Operator will run if no image is specified
4444
COHERENCE_IMAGE_REGISTRY ?= ghcr.io/oracle
4545
COHERENCE_IMAGE_NAME ?= coherence-ce
@@ -1500,8 +1500,12 @@ $(BUILD_MANIFESTS_PKG): $(TOOLS_BIN)/kustomize $(TOOLS_BIN)/yq
15001500
$(SED) -e 's/name: coherence-operator-env-vars-.*/name: coherence-operator-env-vars/g' $(BUILD_OUTPUT)/coherence-operator.yaml
15011501
cd $(BUILD_MANIFESTS)/crd && $(TOOLS_BIN)/yq --no-doc -s '.metadata.name + ".yaml"' temp.yaml
15021502
rm $(BUILD_MANIFESTS)/crd/temp.yaml
1503+
mv $(BUILD_MANIFESTS)/crd/coherence.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd/coherence.oracle.com_coherence.yaml
1504+
mv $(BUILD_MANIFESTS)/crd/coherencejob.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd/coherencejob.oracle.com_coherence.yaml
15031505
cd $(BUILD_MANIFESTS)/crd-small && $(TOOLS_BIN)/yq --no-doc -s '.metadata.name + ".yaml"' temp.yaml
15041506
rm $(BUILD_MANIFESTS)/crd-small/temp.yaml
1507+
mv $(BUILD_MANIFESTS)/crd-small/coherence.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd-small/coherence.oracle.com_coherence.yaml
1508+
mv $(BUILD_MANIFESTS)/crd-small/coherencejob.coherence.oracle.com.yaml $(BUILD_MANIFESTS)/crd-small/coherencejob.oracle.com_coherence.yaml
15051509

15061510
# ----------------------------------------------------------------------------------------------------------------------
15071511
# Delete and re-create the test namespace

‎config/crd/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ commonLabels:
4141
app.kubernetes.io/instance: coherence-operator-crd
4242
app.kubernetes.io/name: coherence-operator
4343
app.kubernetes.io/part-of: coherence-operator
44-
app.kubernetes.io/version: 3.4.0
44+
app.kubernetes.io/version: 3.4.1

‎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: ghcr.io/oracle/coherence-operator
12-
newTag: 3.4.0
12+
newTag: 3.4.1

‎config/manager/manager.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ metadata:
88
app.kubernetes.io/name: coherence-operator
99
app: coherence-operator
1010
app.kubernetes.io/instance: coherence-operator-manager
11-
app.kubernetes.io/version: "3.4.0"
12-
version: "3.4.0"
11+
app.kubernetes.io/version: "3.4.1"
12+
version: "3.4.1"
1313
app.kubernetes.io/component: manager
1414
app.kubernetes.io/part-of: coherence-operator
1515
spec:
@@ -24,8 +24,8 @@ spec:
2424
app.kubernetes.io/name: coherence-operator
2525
app: coherence-operator
2626
app.kubernetes.io/instance: coherence-operator-manager
27-
app.kubernetes.io/version: "3.4.0"
28-
version: "3.4.0"
27+
app.kubernetes.io/version: "3.4.1"
28+
version: "3.4.1"
2929
app.kubernetes.io/component: manager
3030
app.kubernetes.io/part-of: coherence-operator
3131
spec:
@@ -106,7 +106,7 @@ spec:
106106
control-plane: coherence
107107
app.kubernetes.io/name: coherence-operator
108108
app.kubernetes.io/instance: coherence-operator-manager
109-
app.kubernetes.io/version: "3.4.0"
109+
app.kubernetes.io/version: "3.4.1"
110110
affinity:
111111
podAntiAffinity:
112112
preferredDuringSchedulingIgnoredDuringExecution:
@@ -117,7 +117,7 @@ spec:
117117
control-plane: coherence
118118
app.kubernetes.io/name: coherence-operator
119119
app.kubernetes.io/instance: coherence-operator-manager
120-
app.kubernetes.io/version: "3.4.0"
120+
app.kubernetes.io/version: "3.4.1"
121121
weight: 50
122122
- podAffinityTerm:
123123
topologyKey: "oci.oraclecloud.com/fault-domain"
@@ -126,7 +126,7 @@ spec:
126126
control-plane: coherence
127127
app.kubernetes.io/name: coherence-operator
128128
app.kubernetes.io/instance: coherence-operator-manager
129-
app.kubernetes.io/version: "3.4.0"
129+
app.kubernetes.io/version: "3.4.1"
130130
weight: 10
131131
- podAffinityTerm:
132132
topologyKey: "kubernetes.io/hostname"
@@ -135,5 +135,5 @@ spec:
135135
control-plane: coherence
136136
app.kubernetes.io/name: coherence-operator
137137
app.kubernetes.io/instance: coherence-operator-manager
138-
app.kubernetes.io/version: "3.4.0"
138+
app.kubernetes.io/version: "3.4.1"
139139
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
control-plane: coherence
88
app.kubernetes.io/name: coherence-operator
99
app.kubernetes.io/instance: coherence-operator-webhook
10-
app.kubernetes.io/version: "3.4.0"
10+
app.kubernetes.io/version: "3.4.1"
1111
app.kubernetes.io/component: webhook
1212
app.kubernetes.io/part-of: coherence-operator
1313
spec:
@@ -18,7 +18,7 @@ spec:
1818
selector:
1919
app.kubernetes.io/name: coherence-operator
2020
app.kubernetes.io/instance: coherence-operator-manager
21-
app.kubernetes.io/version: "3.4.0"
21+
app.kubernetes.io/version: "3.4.1"
2222
app.kubernetes.io/component: manager
2323
---
2424
apiVersion: v1
@@ -30,7 +30,7 @@ metadata:
3030
control-plane: coherence
3131
app.kubernetes.io/name: coherence-operator
3232
app.kubernetes.io/instance: coherence-operator-rest
33-
app.kubernetes.io/version: "3.4.0"
33+
app.kubernetes.io/version: "3.4.1"
3434
app.kubernetes.io/component: rest
3535
app.kubernetes.io/part-of: coherence-operator
3636
spec:
@@ -41,5 +41,5 @@ spec:
4141
selector:
4242
app.kubernetes.io/name: coherence-operator
4343
app.kubernetes.io/instance: coherence-operator-manager
44-
app.kubernetes.io/version: "3.4.0"
44+
app.kubernetes.io/version: "3.4.1"
4545
app.kubernetes.io/component: manager

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ metadata:
1111
description: >-
1212
Coherence Operator implements features to assist with deploying and
1313
managing Coherence clusters in a Kubernetes environment.
14-
containerImage: 'ghcr.io/oracle/coherence-operator:3.4.0'
14+
containerImage: 'ghcr.io/oracle/coherence-operator:3.4.1'
1515
support: ''
1616
repository: 'https://github.com/oracle/coherence-operator'
1717
operators.operatorframework.io/builder: operator-sdk-v1.0.0
1818
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
19-
name: coherence-operator.v3.4.0
19+
name: coherence-operator.v3.4.1
2020
namespace: placeholder
2121
spec:
2222
apiservicedefinitions: {}
@@ -65,4 +65,4 @@ spec:
6565
provider:
6666
name: Oracle
6767
url: https://oracle.github.io/coherence-operator/docs/latest
68-
version: 3.4.0
68+
version: 3.4.1

‎docs/about/03_quickstart.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If you want the default Coherence Operator installation then the simplest soluti
2121
2222
[source,bash]
2323
----
24-
kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.0/coherence-operator.yaml
24+
kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.1/coherence-operator.yaml
2525
----
2626
2727
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.

0 commit comments

Comments
 (0)