Bump version to 3.2.0 plus minor build/test clean-ups

thegridman · thegridman · commit 6ca323d9a0a2 · 2021-06-22T17:14:35.000+03:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -8,6 +8,7 @@
 name: Operator CI
 
 on:
+  workflow_dispatch:
   push:
     branches-ignore:
     - gh-pages
diff --git a/.github/workflows/coherence-matrix.yaml b/.github/workflows/coherence-matrix.yaml
@@ -8,6 +8,7 @@
 name: Coherence Certification
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'
   push:
diff --git a/.github/workflows/compatibility-tests.yaml b/.github/workflows/compatibility-tests.yaml
@@ -8,6 +8,7 @@
 name: Backwards Compatibility Tests
 
 on:
+  workflow_dispatch:
   push:
     branches-ignore:
     - gh-pages
diff --git a/.github/workflows/k8s-matrix.yaml b/.github/workflows/k8s-matrix.yaml
@@ -8,6 +8,7 @@
 name: K8s Certification
 
 on:
+  workflow_dispatch:
   push:
     branches-ignore:
     - gh-pages
diff --git a/Makefile b/Makefile
@@ -8,11 +8,11 @@
 # ----------------------------------------------------------------------------------------------------------------------
 
 # The version of the Operator being build - this should be a valid SemVer format
-VERSION ?= 3.1.6
+VERSION ?= 3.2.0
 MVN_VERSION ?= $(VERSION)-SNAPSHOT
 
 # The version number to be replaced by this release
-PREV_VERSION ?= 3.1.2
+PREV_VERSION ?= 3.1.5
 
 # The operator version to use to run certification tests against
 CERTIFICATION_VERSION ?= $(VERSION)
@@ -224,8 +224,8 @@ help: ## Display this help.
 
 ##@ Build
 
-.PHONY: all  ## Build all the Coherence Operator artefacts
-all: java-client build-all-images helm-chart
+.PHONY: all
+all: java-client build-all-images helm-chart ## Build all the Coherence Operator artefacts
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Configure the build properties
@@ -358,8 +358,8 @@ $(BUILD_BIN)/converter-windows-amd64: $(BUILD_PROPS) $(GOS)
 # ----------------------------------------------------------------------------------------------------------------------
 # Build the Java artifacts
 # ----------------------------------------------------------------------------------------------------------------------
-.PHONY: build-mvn  ## Build the Java artefacts
-build-mvn:
+.PHONY: build-mvn
+build-mvn: ## Build the Java artefacts
 	./mvnw $(USE_MAVEN_SETTINGS) -B -f java package -DskipTests -Drevision=$(MVN_VERSION) $(MAVEN_OPTIONS)
 
 # ---------------------------------------------------------------------------
@@ -466,7 +466,7 @@ $(BUILD_OUTPUT)/certs:
 # Generate bundle manifests and metadata, then validate generated files.
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: bundle
-bundle: $(BUILD_PROPS) ensure-sdk $(GOBIN)/kustomize $(BUILD_TARGETS)/manifests
+bundle: $(BUILD_PROPS) ensure-sdk $(GOBIN)/kustomize $(BUILD_TARGETS)/manifests  ## Generate OLM bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/manager && $(GOBIN)/kustomize edit set image controller=$(OPERATOR_IMAGE)
 	kustomize build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
@@ -476,11 +476,11 @@ bundle: $(BUILD_PROPS) ensure-sdk $(GOBIN)/kustomize $(BUILD_TARGETS)/manifests
 # Build the bundle image.
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: bundle-build
-bundle-build:
+bundle-build:  ## Build the OLM image
 	docker build --no-cache -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: bundle-push
-bundle-push: ## Push the bundle image.
+bundle-push: ## Push the OLM bundle image.
 	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
 
 
@@ -517,12 +517,12 @@ endif
 # This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog-build
-catalog-build: opm ## Build a catalog image.
+catalog-build: opm ## Build an OLM catalog image.
 	$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
 
 # Push the catalog image.
 .PHONY: catalog-push
-catalog-push: ## Push a catalog image.
+catalog-push: ## Push an OLM catalog image.
 	$(MAKE) docker-push IMG=$(CATALOG_IMG)
 
 
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
 images:
 - name: controller
   newName: ghcr.io/oracle/coherence-operator
-  newTag: 3.1.6
+  newTag: 3.2.0
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -7,23 +7,23 @@ metadata:
     control-plane: coherence
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.1.6"
+    app.kubernetes.io/version: "3.2.0"
     app.kubernetes.io/component: manager
     app.kubernetes.io/part-of: coherence-operator
 spec:
   selector:
     matchLabels:
       control-plane: coherence
       app.kubernetes.io/instance: coherence-operator-manager
-      app.kubernetes.io/version: "3.1.6"
+      app.kubernetes.io/version: "3.2.0"
   replicas: 1
   template:
     metadata:
       labels:
         control-plane: coherence
         app.kubernetes.io/name: coherence-operator
         app.kubernetes.io/instance: coherence-operator-manager
-        app.kubernetes.io/version: "3.1.6"
+        app.kubernetes.io/version: "3.2.0"
         app.kubernetes.io/component: manager
         app.kubernetes.io/part-of: coherence-operator
     spec:
diff --git a/config/manager/service.yaml b/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.1.6"
+    app.kubernetes.io/version: "3.2.0"
     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.1.6"
+    app.kubernetes.io/version: "3.2.0"
     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.1.6"
+    app.kubernetes.io/version: "3.2.0"
     app.kubernetes.io/component: rest
     app.kubernetes.io/part-of: coherence-operator
     app.kubernetes.io/managed-by: helm
@@ -42,5 +42,5 @@ spec:
   selector:
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.1.6"
+    app.kubernetes.io/version: "3.2.0"
     app.kubernetes.io/component: manager
diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml
@@ -48,4 +48,4 @@ spec:
   provider:
     name: Oracle
     url: https://oracle.github.io/coherence-operator/docs/latest
-  version: 3.1.6
+  version: 3.2.0
diff --git a/config/operator/config.json b/config/operator/config.json
@@ -1,4 +1,4 @@
 {
    "coherence-image": "oraclecoherence/coherence-ce:20.12",
-   "utils-image": "container-registry.oracle.com/middleware/coherence-operator:3.1.6-utils"
+   "utils-image": "container-registry.oracle.com/middleware/coherence-operator:3.2.0-utils"
 }
diff --git a/docs/about/03_quickstart.adoc b/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.1.6/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.2.0/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.
diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc
@@ -19,7 +19,7 @@ The prerequisites apply to all installation methods.
 * Access to Oracle Coherence Operator images.
 * Access to a Kubernetes v1.16.0+ cluster. The Operator test pipeline is run using Kubernetes versions v1.16 upto v1.21
 
-NOTE: ARM Support: As of version 3.1.6, the Coherence Operator is build as a multi-architecture image that supports running in Kubernetes on both Linux/amd64 and Linux/arm64. The prerequisite is that the Coherence application image used has been built to support ARM.
+NOTE: ARM Support: As of version 3.2.0, the Coherence Operator is build as a multi-architecture image that supports running in Kubernetes on both Linux/amd64 and Linux/arm64. The prerequisite is that the Coherence application image used has been built to support ARM.
 
 There are a few ways to install the Coherence Operator documented below:
 
@@ -66,7 +66,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.1.6/coherence-operator.yaml
+kubectl apply -f https://github.com/oracle/coherence-operator/releases/download/v3.2.0/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.
@@ -235,13 +235,13 @@ helm install  \
 
 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.1.6/coherence-operator-manifests.tar.gz[3.1.6 Manifests]
+https://github.com/oracle/coherence-operator/releases/download/v3.2.0/coherence-operator-manifests.tar.gz[3.2.0 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.1.6/coherence-operator-manifests.tar.gz[3.1.6 Manifests]
+https://github.com/oracle/coherence-operator/releases/download/v3.2.0/coherence-operator-manifests.tar.gz[3.2.0 Manifests]
 from the release page and unpack the file, which should produce a directory called `manifests` with a structure like this:
 
 [source]
@@ -281,14 +281,14 @@ Change the name of the Operator image by running the command below, changing the
 that you are using for the Operator
 [source,bash]
 ----
-cd ./manager && kustomize edit set image controller=container-registry.oracle.com/middleware/coherence-operator:3.1.6
+cd ./manager && kustomize edit set image controller=container-registry.oracle.com/middleware/coherence-operator:3.2.0
 ----
 
 Change the name of the Operator utilities 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 UTILS_IMAGE=container-registry.oracle.com/middleware/coherence-operator:3.1.6-utils
+cd ./manager && kustomize edit add configmap env-vars --from-literal UTILS_IMAGE=container-registry.oracle.com/middleware/coherence-operator:3.2.0-utils
 ----
 
 Change the name of the default Coherence image. If you are always going to be deploying your own application images then this
diff --git a/docs/installation/09_RBAC.adoc b/docs/installation/09_RBAC.adoc
@@ -36,7 +36,7 @@ The two methods of installing the Operator discussed in the <<installation/01_in
 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.1.6/coherence-operator-manifests.tar.gz[3.1.6 Manifests]
+https://github.com/oracle/coherence-operator/releases/download/v3.2.0/coherence-operator-manifests.tar.gz[3.2.0 Manifests]
 
 You MUST ensure that the CRD manifests match the version of the Operator being installed.
 
diff --git a/helm-charts/coherence-operator/templates/deployment.yaml b/helm-charts/coherence-operator/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
   selector:
     app.kubernetes.io/name: coherence-operator
     app.kubernetes.io/instance: coherence-operator-manager
-    app.kubernetes.io/version: "3.1.6"
+    app.kubernetes.io/version: "3.2.0"
     app.kubernetes.io/component: manager
 ---
 apiVersion: v1
@@ -75,7 +75,7 @@ spec:
       control-plane: coherence
       app.kubernetes.io/name: coherence-operator
       app.kubernetes.io/instance: coherence-operator-manager
-      app.kubernetes.io/version: "3.1.6"
+      app.kubernetes.io/version: "3.2.0"
       app.kubernetes.io/component: manager
   template:
     metadata:
diff --git a/java/pom.xml b/java/pom.xml
@@ -31,7 +31,7 @@
     </modules>
 
     <properties>
-        <revision>3.1.6</revision>
+        <revision>3.2.0</revision>
         <operator.version>${project.version}</operator.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -83,7 +83,7 @@
         <version.plugin.exec>3.0.0</version.plugin.exec>
         <version.plugin.helidon-build-tools>2.0.0-M3</version.plugin.helidon-build-tools>
         <version.plugin.javadoc>3.1.1</version.plugin.javadoc>
-        <version.plugin.jib>2.8.0</version.plugin.jib>
+        <version.plugin.jib>3.1.1</version.plugin.jib>
         <version.plugin.maven.assembly>3.1.1</version.plugin.maven.assembly>
         <version.plugin.maven.compiler>3.7.0</version.plugin.maven.compiler>
         <version.plugin.maven.dependency>3.1.1</version.plugin.maven.dependency>
diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -498,6 +498,7 @@ func start(details *RunDetails) (string, *exec.Cmd, error) {
 		}
 	}
 
+	details.AddArg(fmt.Sprintf("-Dcoherence.k8s.operator.diagnostics.dir=%s", jvmDir))
 	details.AddArg(fmt.Sprintf("-XX:HeapDumpPath=%s/heap-dumps/%s-%s.hprof", jvmDir, member, podUID))
 
 	if details.IsEnvTrue(v1.EnvVarJvmJmxmpEnabled) {
diff --git a/pkg/runner/runner_test.go b/pkg/runner/runner_test.go
@@ -123,6 +123,7 @@ func AppendCommonExpectedArgs(args []string) []string {
 		"-Dcoherence.distributed.persistence-mode=on-demand",
 		"-Dcoherence.override=k8s-coherence-nossl-override.xml",
 		"-Dcoherence.ipmonitor.pingtimeout=0",
+		"-Dcoherence.k8s.operator.diagnostics.dir=/coherence-operator/jvm/unknown/unknown",
 		"-XX:HeapDumpPath=/coherence-operator/jvm/unknown/unknown/heap-dumps/unknown-unknown.hprof",
 		"-XX:+UseG1GC",
 		"-Dcoherence.ttl=0",
diff --git a/test/e2e/helper/e2e-helpers.go b/test/e2e/helper/e2e-helpers.go
@@ -77,7 +77,10 @@ func (in TestContext) Logf(format string, a ...interface{}) {
 
 func (in TestContext) CleanupAfterTest(t *testing.T) {
 	t.Cleanup(func() {
-		DumpOperatorLogs(t, in)
+		if t.Failed() {
+			// dump the logs if the test failed
+			DumpOperatorLogs(t, in)
+		}
 		in.Cleanup()
 	})
 }
@@ -873,6 +876,7 @@ func DumpOperatorLogs(t *testing.T, ctx TestContext) {
 }
 
 func DumpState(ctx TestContext, namespace, dir string) {
+	dumpEvents(namespace, dir, ctx)
 	dumpCoherences(namespace, dir, ctx)
 	dumpStatefulSets(namespace, dir, ctx)
 	dumpServices(namespace, dir, ctx)
@@ -882,6 +886,65 @@ func DumpState(ctx TestContext, namespace, dir string) {
 	dumpServiceAccounts(namespace, dir, ctx)
 }
 
+func dumpEvents(namespace, dir string, ctx TestContext) {
+	const message = "Could not dump events for namespace %s due to %s"
+	list, err := ctx.KubeClient.CoreV1().Events(namespace).List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		ctx.Logf(message, namespace, err.Error())
+		return
+	}
+
+	logsDir, err := EnsureLogsDir(dir)
+	if err != nil {
+		ctx.Logf(message, namespace, err.Error())
+		return
+	}
+
+	listFile, err := os.Create(logsDir + string(os.PathSeparator) + "events.json")
+	if err != nil {
+		ctx.Logf(message, namespace, err.Error())
+		return
+	}
+
+	_, err = fmt.Fprint(listFile, "[\n")
+	if err != nil {
+		ctx.Logf(message, namespace, err.Error())
+		return
+	}
+
+	fn := func() { _ = listFile.Close() }
+	defer fn()
+
+	if len(list.Items) > 0 {
+		for i, item := range list.Items {
+			if i > 0 {
+				_, err = fmt.Fprint(listFile, ",\n")
+				if err != nil {
+					ctx.Logf(message, namespace, err.Error())
+					return
+				}
+			}
+
+			d, err := json.MarshalIndent(item, "", "    ")
+			if err != nil {
+				ctx.Logf(message, namespace, err.Error())
+				return
+			}
+			_, err = fmt.Fprint(listFile, string(d))
+			if err != nil {
+				ctx.Logf(message, namespace, err.Error())
+				return
+			}
+		}
+	}
+
+	_, err = fmt.Fprint(listFile, "]")
+	if err != nil {
+		ctx.Logf(message, namespace, err.Error())
+		return
+	}
+}
+
 func dumpCoherences(namespace, dir string, ctx TestContext) {
 	const message = "Could not dump Coherence resource for namespace %s due to %s"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"coherence-image": "oraclecoherence/coherence-ce:20.12",`
`3`		`- "utils-image": "container-registry.oracle.com/middleware/coherence-operator:3.1.6-utils"`
	`3`	`+ "utils-image": "container-registry.oracle.com/middleware/coherence-operator:3.2.0-utils"`
`4`	`4`	`}`