Update version to 3.4.2 (#683)

Dockerfile

@@ -13,11 +13,13 @@ ARG operator_image
 
 LABEL "com.oracle.coherence.application"="operator"
 LABEL "com.oracle.coherence.version"="$version"
+LABEL "org.opencontainers.image.description"="The Oracle Coherece Kubernetes Operator image ($target)"
+LABEL "org.opencontainers.image.source"="https://github.com/oracle/coherence-operator"
 
 ENV COHERENCE_IMAGE=$coherence_image \
     OPERATOR_IMAGE=$operator_image
 
-COPY bin/linux/$target/*                                  /files/
+COPY bin/linux/$target/*                                               /files/
 COPY java/coherence-operator/target/docker/lib/*.jar                   /files/lib/
 COPY java/coherence-operator/target/docker/logging/logging.properties  /files/logging/logging.properties
 

Makefile

@@ -15,17 +15,18 @@
 # ======================================================================================================================
 
 # The version of the Operator being build - this should be a valid SemVer format
-VERSION ?= 3.4.1
+VERSION ?= 3.4.2
 MVN_VERSION ?= $(VERSION)
 
 # The version number to be replaced by this release
-PREV_VERSION ?= 3.4.0
+PREV_VERSION ?= 3.4.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.4.0
+COMPATIBLE_VERSION  ?= 3.4.1
 # The selector to use to find Operator Pods of the COMPATIBLE_VERSION (do not put in double quotes!!)
 COMPATIBLE_SELECTOR ?= control-plane=coherence
 
@@ -61,7 +62,7 @@ TEST_COHERENCE_GID ?= com.oracle.coherence.ce
 # The current working directory
 CURRDIR := $(shell pwd)
 
-GH_TOKEN ?= 
+GH_TOKEN ?=
 ifeq ("$(GH_TOKEN)", "")
   GH_AUTH := 'Foo: Bar'
 else
@@ -364,7 +365,7 @@ ISTIO_VERSION ?=
 # ----------------------------------------------------------------------------------------------------------------------
 # The version of Tanzu to install, leave empty for the latest
 TANZU_VERSION ?=
-TANZU =  
+TANZU =
 
 # ======================================================================================================================
 # Makefile targets start here
@@ -420,11 +421,15 @@ $(BUILD_PROPS):
 # Clean-up all of the build artifacts
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: clean
-clean: ## Cleans the build 
+clean: ## Cleans the build
 	-rm -rf $(BUILD_OUTPUT) || true
 	-rm -rf $(BUILD_BIN) || true
 	-rm -rf bundle || true
+	rm config/crd/bases/*.yaml || true
+	rm -rf config/crd-small || true
 	rm pkg/data/zz_generated_*.go || true
+	rm pkg/data/assets/*.yaml || true
+	rm pkg/data/assets/*.json || true
 	./mvnw -f java clean $(MAVEN_BUILD_OPTS)
 	./mvnw -f examples clean $(MAVEN_BUILD_OPTS)
 
@@ -2074,7 +2079,7 @@ ifeq ($(OPERATOR_RELEASE_IMAGE), $(OPERATOR_IMAGE))
 		--amend $(OPERATOR_IMAGE)-amd64 \
 		--amend $(OPERATOR_IMAGE)-arm64
 	docker manifest annotate $(OPERATOR_IMAGE) $(OPERATOR_IMAGE)-arm64 --arch arm64
-	docker manifest push $(OPERATOR_IMAGE) 
+	docker manifest push $(OPERATOR_IMAGE)
 else
 	@echo "Tagging $(OPERATOR_IMAGE)-amd64 as $(OPERATOR_RELEASE_IMAGE)-amd64"
 	docker tag $(OPERATOR_IMAGE)-amd64 $(OPERATOR_RELEASE_IMAGE)-amd64
@@ -2354,6 +2359,10 @@ serve-docs:
 	cd $(BUILD_OUTPUT)/docs; \
 	python -m SimpleHTTPServer 8080
 
+# ======================================================================================================================
+# Release targets
+# ======================================================================================================================
+##@ Release Targets
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Pre-Release Tasks
@@ -2373,23 +2382,6 @@ pre-release:
 .PHONY: post-release
 post-release: check-new-version new-version
 
-.PHONY: check-new-version
-check-new-version:
-ifeq (, $(NEW_VERSION))
-	@echo "You must specify the NEW_VERSION parameter"
-	exit 1
-else
-	@echo "Updating version from $(VERSION) to $(NEW_VERSION)"
-endif
-
-.PHONY: new-version
-new-version:
-	$(SED) 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' MAKEFILE
-	$(SED) 's/$(subst .,\.,$(VERSION))/$(NEW_VERSION)/g' MAKEFILE
-	find config \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEW_VERSION)/g' {} +
-	find java \( -name 'pom.xml' \) -exec $(SED) 's/<version>$(subst .,\.,$(VERSION))<\/version>/<version>$(NEW_VERSION)<\/version>/g' {} +
-
-
 # ----------------------------------------------------------------------------------------------------------------------
 # Release the Coherence Operator dashboards
 # ----------------------------------------------------------------------------------------------------------------------
@@ -2498,14 +2490,50 @@ push-snapshot-docs: $(BUILD_TARGETS)/generate $(BUILD_TARGETS)/manifests docs
 # Release the Coherence Operator.
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: release
-release:
+release: ## Release the Operator
 ifeq (true, $(RELEASE_DRY_RUN))
 release: build-all-images release-ghpages
 	@echo "release dry-run: would have pushed images"
 else
 release: build-all-images push-release-images release-ghpages
 endif
 
+# ----------------------------------------------------------------------------------------------------------------------
+# Update the Operator version and all references to the previous version
+# ----------------------------------------------------------------------------------------------------------------------
+.PHONY: new-version
+new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z specified)
+	$(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' MAKEFILE
+	$(SED) 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' MAKEFILE
+	find docs \( -name '*.adoc' -o -name '*.yaml' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} +
+	find examples \( -name 'pom.xml' \) -exec $(SED) 's/<version>$(subst .,\.,$(VERSION))<\/version>/<version>$(NEXT_VERSION)<\/version>/g' {} +
+	find examples \( -name '*.adoc' -o -name 'Dockerfile' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} +
+	find examples \( -name '*.yaml' -o -name '*.json' \) -exec $(SED) 's/$(subst .,\.,$(VERSION))/$(NEXT_VERSION)/g' {} +
+	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
+
+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 "[email protected]"
+	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)
+
+	gh label create "$(GIT_LABEL)" \
+		--description "Pull requests with version update" \
+		--force \
+	|| true
+
+	gh pr create \
+		--title "Version update to $(VERSION)" \
+		--body "Current pull request contains version update to version $(VERSION)" \
+		--label "$(GIT_LABEL)" \
+		--head $(GIT_BRANCH)
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Create the third-party license file

config/crd/kustomization.yaml

@@ -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.4.1
+  app.kubernetes.io/version: 3.4.2

config/manager/kustomization.yaml

@@ -9,4 +9,4 @@ resources:
 images:
 - name: controller
   newName: ghcr.io/oracle/coherence-operator
-  newTag: 3.4.1
+  newTag: 3.4.2

config/manager/manager.yaml

@@ -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.4.1"
-    version: "3.4.1"
+    app.kubernetes.io/version: "3.4.2"
+    version: "3.4.2"
     app.kubernetes.io/component: manager
     app.kubernetes.io/part-of: coherence-operator
 spec:
@@ -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.4.1"
-        version: "3.4.1"
+        app.kubernetes.io/version: "3.4.2"
+        version: "3.4.2"
         app.kubernetes.io/component: manager
         app.kubernetes.io/part-of: coherence-operator
     spec:
@@ -106,7 +106,7 @@ spec:
               control-plane: coherence
               app.kubernetes.io/name: coherence-operator
               app.kubernetes.io/instance: coherence-operator-manager
-              app.kubernetes.io/version: "3.4.1"
+              app.kubernetes.io/version: "3.4.2"
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -117,7 +117,7 @@ spec:
                     control-plane: coherence
                     app.kubernetes.io/name: coherence-operator
                     app.kubernetes.io/instance: coherence-operator-manager
-                    app.kubernetes.io/version: "3.4.1"
+                    app.kubernetes.io/version: "3.4.2"
               weight: 50
             - podAffinityTerm:
                 topologyKey: "oci.oraclecloud.com/fault-domain"
@@ -126,7 +126,7 @@ spec:
                     control-plane: coherence
                     app.kubernetes.io/name: coherence-operator
                     app.kubernetes.io/instance: coherence-operator-manager
-                    app.kubernetes.io/version: "3.4.1"
+                    app.kubernetes.io/version: "3.4.2"
               weight: 10
             - podAffinityTerm:
                 topologyKey: "kubernetes.io/hostname"
@@ -135,5 +135,5 @@ spec:
                     control-plane: coherence
                     app.kubernetes.io/name: coherence-operator
                     app.kubernetes.io/instance: coherence-operator-manager
-                    app.kubernetes.io/version: "3.4.1"
+                    app.kubernetes.io/version: "3.4.2"
               weight: 1

config/manager/service.yaml

@@ -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.4.1"
+    app.kubernetes.io/version: "3.4.2"
     app.kubernetes.io/component: webhook
     app.kubernetes.io/part-of: coherence-operator
 spec:
@@ -18,7 +18,7 @@ spec:
   selector:
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.4.1"
+    app.kubernetes.io/version: "3.4.2"
     app.kubernetes.io/component: manager
 ---
 apiVersion: v1
@@ -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.4.1"
+    app.kubernetes.io/version: "3.4.2"
     app.kubernetes.io/component: rest
     app.kubernetes.io/part-of: coherence-operator
 spec:
@@ -41,5 +41,5 @@ spec:
   selector:
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.4.1"
+    app.kubernetes.io/version: "3.4.2"
     app.kubernetes.io/component: manager

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

@@ -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.4.1'
+    containerImage: 'ghcr.io/oracle/coherence-operator:3.4.2'
     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.4.1
+  name: coherence-operator.v3.4.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -65,4 +65,4 @@ spec:
   provider:
     name: Oracle
     url: https://oracle.github.io/coherence-operator/docs/latest
-  version: 3.4.1
+  version: 3.4.2

docs/about/03_quickstart.adoc

@@ -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.4.1/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.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.

docs/installation/01_installation.adoc

@@ -150,7 +150,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.4.1/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.4.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.

docs/installation/07_webhooks.adoc

@@ -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.4.1/coherence-operator.yaml \
+curl -L https://github.com/oracle/coherence-operator/releases/download/v3.4.2/coherence-operator.yaml \
     -o coherence-operator.yaml
 sed -i s/self-signed/cert-manager/g coherence-operator.yaml
 kubectl apply -f coherence-operator.yaml

docs/installation/09_RBAC.adoc

@@ -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.4.1/coherence-operator-manifests.tar.gz[3.3.5 Manifests]
+https://github.com/oracle/coherence-operator/releases/download/v3.4.2/coherence-operator-manifests.tar.gz[3.3.5 Manifests]
 
 You MUST ensure that the CRD manifests match the version of the Operator being installed.
 

docs/metrics/020_metrics.adoc

@@ -30,7 +30,7 @@ documentation for full details on the available metrics.
 
 === Important Note Regarding Prometheus Metrics Prefix
 
-From version 3.4.1 of the Coherence Operator, the packaged Grafana dashboards no longer use the **vendor:** prefix for querying Prometheus metrics.
+From version 3.4.2 of the Coherence Operator, the packaged Grafana dashboards no longer use the **vendor:** prefix for querying Prometheus metrics.
 This prefix was deprecated a number of releases ago and the default, of legacy metrics, in Coherence and will be removed in the most recent
 Coherence releases after this Operator release.
 

docs/networking/020_dual_stack.adoc

@@ -98,7 +98,7 @@ spec:
           fieldPath: status.podIP
 ----
 
-* Since Operator 3.4.1 it is possible to configure the IP family for the WKA Service. The `spec.coherence.wka.ipFamily`
+* Since Operator 3.4.2 it is possible to configure the IP family for the WKA Service. The `spec.coherence.wka.ipFamily`
 field can be set to either "IPv4" or "IPv6". This will cause Coherence to bind to the relevant IP address type.
 
 For example, the yaml below will cause Coherence to bind to the IPv6 address.
@@ -116,7 +116,7 @@ spec:
       ipFamily: IPv6
 ----
 
-Since Operator 3.4.1 it is also possible to configure the IP families used by the headless service created for the StatefulSet
+Since Operator 3.4.2 it is also possible to configure the IP families used by the headless service created for the StatefulSet
 if this is required.
 
 The yaml below will configure WKA to use only IPv6, the headless Service created for the StatefulSet will be

docs/other/041_global_labels.adoc

@@ -142,7 +142,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.4.1/coherence-operator.yaml
+https://github.com/oracle/coherence-operator/releases/download/v3.4.2/coherence-operator.yaml
 
 Find the section of the yaml file the defines the Operator container args, the default looks like this
 

examples/015_simple_image/README.adoc

@@ -98,7 +98,7 @@ In the `pom.xml` file we add JIB to the `plugins` section.
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
             </plugin>
         </plugins>
     </build>

examples/095_network_policies/manifests/net-test-client.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: net-test
-        image: ghcr.io/oracle/coherence-operator:3.4.1
+        image: ghcr.io/oracle/coherence-operator:3.4.2
         env:
           - name: HOST
             value: net-test-coherence-server.coh-test.svc

examples/095_network_policies/manifests/net-test-coherence-server.yaml

@@ -43,7 +43,7 @@ metadata:
 spec:
   containers:
   - name: net-test
-    image: ghcr.io/oracle/coherence-operator:3.4.1
+    image: ghcr.io/oracle/coherence-operator:3.4.2
     ports:
     - containerPort: 9612
       name: metrics

examples/095_network_policies/manifests/net-test-coherence.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: net-test
-        image: ghcr.io/oracle/coherence-operator:3.4.1
+        image: ghcr.io/oracle/coherence-operator:3.4.2
         env:
           - name: CLUSTER_HOST
             value: net-test-coherence-server.coh-test.svc