Skip to content

Commit

Permalink
Update version to 3.3.5 (#649)
Browse files Browse the repository at this point in the history
* Update version to 3.3.5

* Update JIB to 3.4.2
  • Loading branch information
thegridman committed May 7, 2024
1 parent cf66b67 commit 99bc8e0
Show file tree
Hide file tree
Showing 25 changed files with 57 additions and 52 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/compatibility-tests.yaml
Expand Up @@ -37,6 +37,7 @@ jobs:
fail-fast: false
matrix:
compatibilityVersion:
- 3.3.4
- 3.3.3
- 3.3.2
- 3.3.1
Expand All @@ -47,6 +48,10 @@ jobs:
- 3.2.7
- 3.2.6
include:
- compatibilityVersion: 3.3.4
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
compatibilitySelector: control-plane=coherence
k8s: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
- compatibilityVersion: 3.3.3
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.7"
compatibilitySelector: control-plane=coherence
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -15,17 +15,17 @@
# ======================================================================================================================

# The version of the Operator being build - this should be a valid SemVer format
VERSION ?= 3.3.4
VERSION ?= 3.3.5
MVN_VERSION ?= $(VERSION)

# The version number to be replaced by this release
PREV_VERSION ?= 3.3.3
PREV_VERSION ?= 3.3.4

# 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.3.3
COMPATIBLE_VERSION ?= 3.3.4
# 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 @@ -1567,7 +1567,7 @@ create-ssl-secrets: $(BUILD_OUTPUT)/certs
##@ KinD

KIND_CLUSTER ?= operator
KIND_IMAGE ?= "kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72"
KIND_IMAGE ?= "kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
CALICO_TIMEOUT ?= 300s

# ----------------------------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Expand Up @@ -41,4 +41,4 @@ commonLabels:
app.kubernetes.io/instance: coherence-operator-crd
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/part-of: coherence-operator
app.kubernetes.io/version: 3.3.4
app.kubernetes.io/version: 3.3.5
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Expand Up @@ -9,4 +9,4 @@ resources:
images:
- name: controller
newName: ghcr.io/oracle/coherence-operator
newTag: 3.3.4
newTag: 3.3.5
14 changes: 7 additions & 7 deletions config/manager/manager.yaml
Expand Up @@ -8,8 +8,8 @@ metadata:
app.kubernetes.io/name: coherence-operator
app: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
version: "3.3.5"
app.kubernetes.io/component: manager
app.kubernetes.io/part-of: coherence-operator
spec:
Expand All @@ -24,8 +24,8 @@ spec:
app.kubernetes.io/name: coherence-operator
app: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
version: "3.3.5"
app.kubernetes.io/component: manager
app.kubernetes.io/part-of: coherence-operator
spec:
Expand Down Expand Up @@ -107,7 +107,7 @@ spec:
control-plane: coherence
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
weight: 50
- podAffinityTerm:
topologyKey: "oci.oraclecloud.com/fault-domain"
Expand All @@ -116,7 +116,7 @@ spec:
control-plane: coherence
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
weight: 10
- podAffinityTerm:
topologyKey: "kubernetes.io/hostname"
Expand All @@ -125,5 +125,5 @@ spec:
control-plane: coherence
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
weight: 1
8 changes: 4 additions & 4 deletions config/manager/service.yaml
Expand Up @@ -7,7 +7,7 @@ metadata:
control-plane: coherence
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-webhook
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: webhook
app.kubernetes.io/part-of: coherence-operator
spec:
Expand All @@ -18,7 +18,7 @@ spec:
selector:
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: manager
---
apiVersion: v1
Expand All @@ -30,7 +30,7 @@ metadata:
control-plane: coherence
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-rest
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: rest
app.kubernetes.io/part-of: coherence-operator
spec:
Expand All @@ -41,5 +41,5 @@ spec:
selector:
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: manager
Expand Up @@ -11,12 +11,12 @@ metadata:
description: >-
Coherence Operator implements features to assist with deploying and
managing Coherence clusters in a Kubernetes environment.
containerImage: 'ghcr.io/oracle/coherence-operator:3.3.4'
containerImage: 'ghcr.io/oracle/coherence-operator:3.3.5'
support: ''
repository: 'https://github.com/oracle/coherence-operator'
operators.operatorframework.io/builder: operator-sdk-v1.0.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
name: coherence-operator.v3.3.4
name: coherence-operator.v3.3.5
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -65,4 +65,4 @@ spec:
provider:
name: Oracle
url: https://oracle.github.io/coherence-operator/docs/latest
version: 3.3.4
version: 3.3.5
2 changes: 1 addition & 1 deletion docs/about/03_quickstart.adoc
Expand Up @@ -21,7 +21,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.3.4/coherence-operator.yaml
kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.5/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
18 changes: 9 additions & 9 deletions docs/installation/01_installation.adoc
Expand Up @@ -149,7 +149,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.3.4/coherence-operator.yaml
kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.3.5/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 Expand Up @@ -652,13 +652,13 @@ helm delete coherence-operator --namespace <namespace>
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.3.4/coherence-operator-manifests.tar.gz[3.3.4 Manifests]
https://github.com/oracle/coherence-operator/releases/download/v3.3.5/coherence-operator-manifests.tar.gz[3.3.5 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/
Download the
https://github.com/oracle/coherence-operator/releases/download/v3.3.4/coherence-operator-manifests.tar.gz[3.3.4 Manifests]
https://github.com/oracle/coherence-operator/releases/download/v3.3.5/coherence-operator-manifests.tar.gz[3.3.5 Manifests]
from the release page and unpack the file, which should produce a directory called `manifests` with a structure like this:
[source]
Expand Down Expand Up @@ -711,14 +711,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.3.4
cd ./manager && kustomize edit set image controller=myregistry/coherence-operator:3.3.5
----
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.3.4
cd ./manager && kustomize edit add configmap env-vars --from-literal OPERATOR_IMAGE=myregistry/coherence-operator:3.3.5
----
Change the name of the default Coherence image. If you are always going to be deploying your own application images then this
Expand Down Expand Up @@ -796,7 +796,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.3.3 \
--url ghcr.io/oracle/coherence-operator-repo:3.3.5 \
--namespace coherence \
--create-namespace
----
Expand Down Expand Up @@ -826,7 +826,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.3.3
coherence-operator.oracle.github.com Oracle Coherence Operator A Kubernetes operator for managing Oracle Coherence clusters 3.3.5
----
=== Install the Coherence Operator Package
Expand All @@ -837,7 +837,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.3.3 \
--version 3.3.5 \
--namespace coherence
----
Expand All @@ -853,7 +853,7 @@ which should display the Coherence Operator package.
[source,bash]
----
NAME PACKAGE-NAME PACKAGE-VERSION STATUS
coherence coherence-operator.oracle.github.com 3.3.3 Reconcile succeeded
coherence coherence-operator.oracle.github.com 3.3.5 Reconcile succeeded
----
The Operator is now installed and ready to mage Coherence clusters.
4 changes: 2 additions & 2 deletions docs/installation/07_webhooks.adoc
Expand Up @@ -63,7 +63,7 @@ If installing the operator using the manifest yaml file first replace the occurr
For example:
[source,bash]
----
curl -L https://github.com/oracle/coherence-operator/releases/download/v3.3.4/coherence-operator.yaml \
curl -L https://github.com/oracle/coherence-operator/releases/download/v3.3.5/coherence-operator.yaml \
-o coherence-operator.yaml
sed -i s/self-signed/cert-manager/g coherence-operator.yaml
kubectl apply -f coherence-operator.yaml
Expand Down Expand Up @@ -149,7 +149,7 @@ If installing the operator using the manifest yaml file first replace the occurr
For example:
[source,bash]
----
curl -L https://github.com/oracle/coherence-operator/releases/download/v3.3.4/coherence-operator.yaml \
curl -L https://github.com/oracle/coherence-operator/releases/download/v3.3.5/coherence-operator.yaml \
-o coherence-operator.yaml
sed -i s/self-signed/manual/g coherence-operator.yaml
kubectl apply -f coherence-operator.yaml
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/09_RBAC.adoc
Expand Up @@ -36,7 +36,7 @@ The two methods of installing the Operator discussed in the <<docs/installation/
Before installing the Operator, with either method described below, the CRDs MUST be manually installed from the Operator manifest files.
The manifest files are published with the GitHub release at this link:
https://github.com/oracle/coherence-operator/releases/download/v3.3.4/coherence-operator-manifests.tar.gz[3.3.4 Manifests]
https://github.com/oracle/coherence-operator/releases/download/v3.3.5/coherence-operator-manifests.tar.gz[3.3.5 Manifests]
You MUST ensure that the CRD manifests match the version of the Operator being installed.
Expand Down
2 changes: 1 addition & 1 deletion docs/other/041_global_labels.adoc
Expand Up @@ -94,7 +94,7 @@ When installing the Operator using the manifest yaml files, additional command l
by manually editing the yaml file before installing.
Download the yaml manifest file from the GitHub repo
https://github.com/oracle/coherence-operator/releases/download/v3.3.4/coherence-operator.yaml
https://github.com/oracle/coherence-operator/releases/download/v3.3.5/coherence-operator.yaml
Find the section of the yaml file the defines the Operator container args, the default looks like this
Expand Down
2 changes: 1 addition & 1 deletion examples/015_simple_image/README.adoc
Expand Up @@ -110,7 +110,7 @@ In the `build.gradle` file we add JIB to the `plugins` section.
----
plugins {
id 'java'
id 'com.google.cloud.tools.jib' version '3.3.4'
id 'com.google.cloud.tools.jib' version '3.3.5'
}
----
Expand Down
2 changes: 1 addition & 1 deletion examples/015_simple_image/build.gradle
Expand Up @@ -6,7 +6,7 @@

plugins {
id 'java'
id 'com.google.cloud.tools.jib' version '3.3.4'
id 'com.google.cloud.tools.jib' version '3.3.5'
}

group = 'com.oracle.coherence.examples'
Expand Down
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: net-test
image: ghcr.io/oracle/coherence-operator:3.3.4
image: ghcr.io/oracle/coherence-operator:3.3.5
env:
- name: HOST
value: net-test-coherence-server.coh-test.svc
Expand Down
Expand Up @@ -43,7 +43,7 @@ metadata:
spec:
containers:
- name: net-test
image: ghcr.io/oracle/coherence-operator:3.3.4
image: ghcr.io/oracle/coherence-operator:3.3.5
ports:
- containerPort: 9612
name: metrics
Expand Down
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
containers:
- name: net-test
image: ghcr.io/oracle/coherence-operator:3.3.4
image: ghcr.io/oracle/coherence-operator:3.3.5
env:
- name: CLUSTER_HOST
value: net-test-coherence-server.coh-test.svc
Expand Down
Expand Up @@ -6,7 +6,7 @@ spec:
selector:
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: manager
app.kubernetes.io/part-of: coherence-operator
coherenceNetTest: server
Expand All @@ -27,14 +27,14 @@ metadata:
labels:
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: manager
app.kubernetes.io/part-of: coherence-operator
coherenceNetTest: server
spec:
containers:
- name: net-test
image: ghcr.io/oracle/coherence-operator:3.3.4
image: ghcr.io/oracle/coherence-operator:3.3.5
ports:
- containerPort: 8000
name: operator
Expand Down
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: manager
app.kubernetes.io/part-of: coherence-operator
coherenceNetTest: operator-client
Expand All @@ -15,14 +15,14 @@ spec:
labels:
app.kubernetes.io/name: coherence-operator
app.kubernetes.io/instance: coherence-operator-manager
app.kubernetes.io/version: "3.3.4"
app.kubernetes.io/version: "3.3.5"
app.kubernetes.io/component: manager
app.kubernetes.io/part-of: coherence-operator
coherenceNetTest: operator-client
spec:
containers:
- name: net-test
image: ghcr.io/oracle/coherence-operator:3.3.4
image: ghcr.io/oracle/coherence-operator:3.3.5
env:
- name: CLUSTER_HOST
value: net-test-coherence-server.coh-test.svc
Expand Down
Expand Up @@ -12,7 +12,7 @@ spec:
spec:
containers:
- name: net-test
image: ghcr.io/oracle/coherence-operator:3.3.4
image: ghcr.io/oracle/coherence-operator:3.3.5
env:
- name: OPERATOR_HOST
value: net-test-operator-server.coherence.svc
Expand Down

0 comments on commit 99bc8e0

Please sign in to comment.