Bump version to 3.1.1

thegridman · thegridman · commit 191d2dfd87b6 · 2020-09-28T16:35:32.000+03:00
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@
 # ----------------------------------------------------------------------------------------------------------------------
 
 # The version of the Operator being build - this should be a valid SemVer format
-VERSION ?= 3.1.0
+VERSION ?= 3.1.1
 
 # The operator version to use to run certification tests against
 CERTIFICATION_VERSION ?= $(VERSION)
@@ -1054,16 +1054,6 @@ kind:
 	docker pull $(COHERENCE_IMAGE)
 	kind load docker-image --name operator $(COHERENCE_IMAGE)
 
-# ----------------------------------------------------------------------------------------------------------------------
-# Start a Kind 1.12 cluster
-# ----------------------------------------------------------------------------------------------------------------------
-kind-12: kind-12-start kind-load
-
-kind-12-start:
-	./hack/kind.sh --image "kindest/node:v1.12.10@sha256:faeb82453af2f9373447bb63f50bae02b8020968e0889c7fa308e19b348916cb"
-	docker pull $(COHERENCE_IMAGE) || true
-	kind load docker-image --name operator $(COHERENCE_IMAGE) || true
-
 # ----------------------------------------------------------------------------------------------------------------------
 # Start a Kind 1.16 cluster
 # ----------------------------------------------------------------------------------------------------------------------
diff --git a/README.md b/README.md
@@ -40,12 +40,12 @@ to the kubernetes zone label on the associated pod.
 Kibana (EFK) stack), and Prometheus to monitor the performance, logs, and health of your clusters.
 
 -------
-The current release of the operator is 3.0.2
+The current release of the operator is 3.1.0
 
-Documentation for the Coherence Operator is available [here](https://oracle.github.io/coherence-operator/docs/3.0.2)
+Documentation for the Coherence Operator is available [here](https://oracle.github.io/coherence-operator/docs/3.1.0)
 
 The fastest way to experience the operator is to follow the 
-[Quick Start guide](https://oracle.github.io/coherence-operator/docs/3.0.2/#/about/03_quickstart).
+[Quick Start guide](https://oracle.github.io/coherence-operator/docs/3.1.0/#/about/03_quickstart).
 -------
 
 # Need more help? Have a suggestion? Come and say "Hello!"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
 images:
 - name: controller
   newName: container-registry.oracle.com/middleware/coherence-operator
-  newTag: 3.1.0
+  newTag: 3.1.1
diff --git a/config/manifests/bases/coherence-operator.clusterserviceversion.yaml b/config/manifests/bases/coherence-operator.clusterserviceversion.yaml
@@ -6,7 +6,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.0.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: coherence-operator.v3.1.0
+  name: coherence-operator.v3.1.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -43,9 +43,9 @@ spec:
   - coherence
   links:
   - name: Coherence Operator
-    url: https://oracle.github.io/coherence-operator/docs/3.1.0
+    url: https://oracle.github.io/coherence-operator/docs/3.1.1
   maturity: alpha
   provider:
     name: Oracle
-    url: https://oracle.github.io/coherence-operator/docs/3.1.0
-  version: 3.1.0
+    url: https://oracle.github.io/coherence-operator/docs/3.1.1
+  version: 3.1.1
diff --git a/config/operator/config.json b/config/operator/config.json
@@ -1,4 +1,4 @@
 {
    "coherence-image": "oraclecoherence/coherence-ce:20.06.1",
-   "utils-image": "container-registry.oracle.com/middleware/coherence-operator:3.1.0-utils"
+   "utils-image": "container-registry.oracle.com/middleware/coherence-operator:3.1.1-utils"
 }
diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc
@@ -14,7 +14,7 @@ easily be installed into a Kubernetes cluster.
 == Prerequisites
 
 * Access to Oracle Coherence Docker images, or self-built Coherence images.
-* Access to a Kubernetes v1.12.0+ cluster. The Operator test pipeline runs on Kubernetes tested on v1.12 upto v1.19
+* Access to a Kubernetes v1.13.0+ cluster. The Operator test pipeline runs on Kubernetes tested on v1.13 upto v1.19
 
 NOTE: OpenShift - the Coherence Operator works without modification on OpenShift, but some versions
 of the Coherence images will not work out of the box.
@@ -104,12 +104,12 @@ in the values file can be set, for example:
 ----
 helm install  \
     --namespace <namespace> \
-    --set image=images.com/coherence/coherence-operator:3.1.0 <1>
+    --set image=images.com/coherence/coherence-operator:3.1.1 <1>
     coherence-operator \
     coherence/coherence-operator
 ----
 
-<1> The image used to run the Operator will be `images.com/coherence/coherence-operator:3.1.0`.
+<1> The image used to run the Operator will be `images.com/coherence/coherence-operator:3.1.1`.
 
 === Image Pull Secrets
 
diff --git a/docs/metrics/030_importing.adoc b/docs/metrics/030_importing.adoc
@@ -25,7 +25,7 @@ then obtain the dashboards from the `dashboards/` directory.
 
 [source,bash]
 ----
-VERSION=3.1.0
+VERSION=3.1.1
 curl https://oracle.github.io/coherence-operator/dashboards/${VERSION}/coherence-dashboards.tar.gz \
     -o coherence-dashboards.tar.gz
 tar -zxvf coherence-dashboards.tar.gz
@@ -125,7 +125,7 @@ the following commands can be used:
 
 [source,bash]
 ----
-VERSION=3.1.0
+VERSION=3.1.1
 kubectl -n monitoring create \
     -f https://oracle.github.io/coherence-operator/dashboards/${VERSION}/coherence-grafana-dashboards.yaml
 ----
@@ -139,7 +139,7 @@ URL to `coherence-grafana-legacy-dashboards.yaml`, for example:
 
 [source,bash]
 ----
-VERSION=3.1.0
+VERSION=3.1.1
 kubectl -n monitoring create \
     -f https://oracle.github.io/coherence-operator/dashboards/${VERSION}/coherence-grafana-legacy-dashboards.yaml
 ----
@@ -152,7 +152,7 @@ Operator release the following commands can be used:
 
 [source,bash]
 ----
-VERSION=3.1.0
+VERSION=3.1.1
 curl https://oracle.github.io/coherence-operator/dashboards/${VERSION}/coherence-dashboards.tar.gz \
     -o coherence-dashboards.tar.gz
 tar -zxvf coherence-dashboards.tar.gz
diff --git a/examples/autoscaler/README.adoc b/examples/autoscaler/README.adoc
@@ -96,8 +96,8 @@ cd coherence-operator/examples
 ==== Prerequisites
 * Java 11+ JDK either [OpenJDK](https://adoptopenjdk.net/) or [Oracle JDK](https://www.oracle.com/java/technologies/javase-downloads.html)
 * [Docker](https://docs.docker.com/install/) version 17.03+.
-* [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.12.0+ .
-* Access to a Kubernetes v1.12.0+ cluster.
+* [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.13.0+ .
+* Access to a Kubernetes v1.13.0+ cluster.
 * [Helm](https://helm.sh/docs/intro/install/) version 3.2.4+
 
 Building the project requires [Maven](https://maven.apache.org) version 3.6.0+.
diff --git a/examples/autoscaler/pom.xml b/examples/autoscaler/pom.xml
@@ -12,13 +12,13 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>autoscaler-example</artifactId>
   <name>Coherence Operator Autoscaler Example</name>
-  <version>3.1.0</version>
+  <version>3.1.1</version>
 
   <properties>
     <docker.version>${project.version}</docker.version>
diff --git a/examples/deployment/README.md b/examples/deployment/README.md
@@ -48,8 +48,8 @@ Ensure you have the following software installed:
 * Java 11+ JDK either [OpenJDK](https://adoptopenjdk.net/) or [Oracle JDK](https://www.oracle.com/java/technologies/javase-downloads.html)
 * [Maven](https://maven.apache.org) version 3.6.0+
 * [Docker](https://docs.docker.com/install/) version 17.03+.
-* [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.12.0+ .
-* Access to a Kubernetes v1.12.0+ cluster.
+* [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.13.0+ but ideally the latest version .
+* Access to a Kubernetes v1.13.0+ cluster.
 * [Helm](https://helm.sh/docs/intro/install/) version 3.2.4+ (2.14.3+ supported, see notes) 
 
 > Note: Ensure that your local Kubernetes is enabled. If you are running Docker using Docker Desktop, select Enable Kubernetes in the Settings menu.
@@ -108,7 +108,7 @@ This will result in the following Docker image being created which contains the
 artifacts to be use by all deployments.
 
 ```console
-deployment-example:3.1.0
+deployment-example:3.1.1
 ```   
 
 > Note: If you are running against a remote Kubernetes cluster, you need to tag and 
@@ -281,7 +281,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 1
 ```
@@ -393,7 +393,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   application:
     main: com.oracle.coherence.examples.Main
@@ -683,7 +683,7 @@ install any of the examples above.
    
     kubectl -n coherence-example label configmap demo-grafana-datasource grafana_datasource=1  
 
-    kubectl -n coherence-example create -f https://oracle.github.io/coherence-operator/dashboards/3.1.0/coherence-grafana-dashboards.yaml
+    kubectl -n coherence-example create -f https://oracle.github.io/coherence-operator/dashboards/3.1.1/coherence-grafana-dashboards.yaml
 
     kubectl -n coherence-example label configmap coherence-grafana-dashboards grafana_dashboard=1
     ```        
diff --git a/examples/deployment/pom.xml b/examples/deployment/pom.xml
@@ -12,13 +12,13 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>deployment-example</artifactId>
   <name>Coherence Operator Deployment Example</name>
-  <version>3.1.0</version>
+  <version>3.1.1</version>
 
   <properties>
     <docker.version>${project.version}</docker.version>
diff --git a/examples/deployment/src/main/yaml/example-cluster-app.yaml b/examples/deployment/src/main/yaml/example-cluster-app.yaml
@@ -25,7 +25,7 @@ spec:
     cacheConfig: storage-cache-config.xml
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 3
 ---
@@ -52,7 +52,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 1
 ---
@@ -79,7 +79,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   application:
     main: com.oracle.coherence.examples.Main
diff --git a/examples/deployment/src/main/yaml/example-cluster-persistence.yaml b/examples/deployment/src/main/yaml/example-cluster-persistence.yaml
@@ -33,7 +33,7 @@ spec:
         resources:
           requests:
             storage: 1Gi
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 3
 ---
@@ -60,7 +60,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 1
 ---
@@ -87,7 +87,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   application:
     main: com.oracle.coherence.examples.Main
diff --git a/examples/deployment/src/main/yaml/example-cluster-proxy.yaml b/examples/deployment/src/main/yaml/example-cluster-proxy.yaml
@@ -25,7 +25,7 @@ spec:
     cacheConfig: storage-cache-config.xml
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 3
 ---
@@ -52,6 +52,6 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 1
diff --git a/examples/deployment/src/main/yaml/example-cluster.yaml b/examples/deployment/src/main/yaml/example-cluster.yaml
@@ -25,6 +25,6 @@ spec:
     cacheConfig: storage-cache-config.xml
     metrics:
       enabled: true
-  image: deployment-example:3.1.0
+  image: deployment-example:3.1.1
   imagePullPolicy: Always
   replicas: 3
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -12,7 +12,7 @@
   <groupId>com.oracle.coherence.kubernetes</groupId>
   <artifactId>examples-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.0</version>
+  <version>3.1.1</version>
 
   <description>Oracle Coherence Operator Examples Project</description>
   <name>Oracle Coherence Operator Examples Parent</name>
diff --git a/helm-charts/coherence-operator/README.md b/helm-charts/coherence-operator/README.md
@@ -14,7 +14,7 @@ This chart install a coherence-operator deployment on a
 package manager.
 
 ## Prerequisites
-* Kubernetes 1.12 or above
+* Kubernetes 1.13 or above
 * Helm 3 or above
 
 ## Installing the Chart
diff --git a/java/coherence-utils/pom.xml b/java/coherence-utils/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
   </parent>
 
   <artifactId>coherence-utils</artifactId>
diff --git a/java/docs/pom.xml b/java/docs/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
   </parent>
 
   <artifactId>operator-docs</artifactId>
diff --git a/java/operator-test-spring/pom.xml b/java/operator-test-spring/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
   </parent>
 
   <artifactId>operator-test-spring</artifactId>
diff --git a/java/operator-test/pom.xml b/java/operator-test/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
   </parent>
 
   <artifactId>operator-test</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
@@ -16,7 +16,7 @@
   <groupId>com.oracle.coherence.kubernetes</groupId>
   <artifactId>operator-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.0</version>
+  <version>3.1.1</version>
 
   <description>Oracle Coherence Kubernetes Operator Project</description>
   <name>coherence-operator parent</name>

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