From ceaf9a53e1698a6c247399c6cd892a72ee2342a5 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Tue, 13 Oct 2020 10:59:53 +0300 Subject: [PATCH] Prepare release v3.1.1 --- Makefile | 30 +++++++++++++++++++++++++- README.md | 4 ++-- docs/installation/01_installation.adoc | 8 +++---- docs/jvm/030_jvm_args.adoc | 2 +- examples/deployment/README.md | 4 ++-- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 8337e1c14..015b8dd9f 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ # The version of the Operator being build - this should be a valid SemVer format VERSION ?= 3.1.1 +# The version number to be replaced by this release +PREV_VERSION ?= 3.1.0 + # The operator version to use to run certification tests against CERTIFICATION_VERSION ?= $(VERSION) @@ -194,7 +197,7 @@ CRD_V1 ?= $(shell kubectl api-versions | grep '^apiextensions.k8s.io/v TEST_SSL_SECRET := coherence-ssl-secret .PHONY: all -all: build-all-images +all: build-all-images helm-chart # ---------------------------------------------------------------------------------------------------------------------- # Configure the build properties @@ -1320,6 +1323,31 @@ serve-docs: cd $(BUILD_OUTPUT)/docs; \ python -m SimpleHTTPServer 8080 + +# ---------------------------------------------------------------------------------------------------------------------- +# Pre-Release Tasks +# Update the version numbers in the documentation to be the version about to be released +# ---------------------------------------------------------------------------------------------------------------------- +.PHONY: pre-release +pre-release: + sed -i '' 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' README.md + find docs \( -name '*.adoc' -o -name '*.md' \) -exec sed -i '' 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' {} + + find examples \( -name '*.adoc' -o -name '*.md' -o -name '*.yaml' \) -exec sed -i '' 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' {} + + +# ---------------------------------------------------------------------------------------------------------------------- +# Post-Release Tasks +# Update the version numbers +# ---------------------------------------------------------------------------------------------------------------------- +.PHONY: post-release +post-release: new-version manifests generate build-all-images + +.PHONY: new-version +new-version: + sed -i '' 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' config/operator/config.json + find config \( -name '*.yaml' \) -exec sed -i '' 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' {} + + find java \( -name '*.pom' \) -exec sed -i '' 's/$(subst .,\.,$(PREV_VERSION))/$(VERSION)/g' {} + + + # ---------------------------------------------------------------------------------------------------------------------- # Release the Coherence Operator dashboards # ---------------------------------------------------------------------------------------------------------------------- diff --git a/README.md b/README.md index 6798b00f7..009580db6 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,10 @@ to the kubernetes zone label on the associated pod. Kibana (EFK) stack), and Prometheus to monitor the performance, logs, and health of your clusters. ------- -Documentation for the Coherence Operator is available [here](https://oracle.github.io/coherence-operator/docs/3.1.0) +Documentation for the Coherence Operator is available [here](https://oracle.github.io/coherence-operator/docs/3.1.1) The fastest way to experience the operator is to follow the -[Quick Start guide](https://oracle.github.io/coherence-operator/docs/3.1.0/#/about/03_quickstart). +[Quick Start guide](https://oracle.github.io/coherence-operator/docs/3.1.1/#/about/03_quickstart). ------- # Need more help? Have a suggestion? Come and say "Hello!" diff --git a/docs/installation/01_installation.adoc b/docs/installation/01_installation.adoc index a6faa38ac..fee18cb46 100644 --- a/docs/installation/01_installation.adoc +++ b/docs/installation/01_installation.adoc @@ -187,13 +187,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.0/coherence-operator-manifests-3.1.0.tar.gz[3.1.0 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.1.1/coherence-operator-manifests-3.1.1.tar.gz[3.1.1 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.0/coherence-operator-manifests-3.1.0.tar.gz[3.1.0 Manifests] +https://github.com/oracle/coherence-operator/releases/download/v3.1.1/coherence-operator-manifests-3.1.1.tar.gz[3.1.1 Manifests] from the release page and unpack the file, which should produce a directory called `manifests` with a structure like this: [source] @@ -233,14 +233,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.0 +cd ./manager && kustomize edit set image controller=container-registry.oracle.com/middleware/coherence-operator:3.1.1 ---- 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.0-utils +cd ./manager && kustomize edit add configmap env-vars --from-literal UTILS_IMAGE=container-registry.oracle.com/middleware/coherence-operator:3.1.1-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/jvm/030_jvm_args.adoc b/docs/jvm/030_jvm_args.adoc index f860dff00..3d106a746 100644 --- a/docs/jvm/030_jvm_args.adoc +++ b/docs/jvm/030_jvm_args.adoc @@ -90,4 +90,4 @@ The Coherence Operator will add the following JVM arguments by default: -XX:+PrintNMTStatistics ---- -Some of the arguments and system properties above can be overridden or changed by setting values in the `Coherence` CDR spec. \ No newline at end of file +Some of the arguments and system properties above can be overridden or changed by setting values in the `Coherence` CDR spec. diff --git a/examples/deployment/README.md b/examples/deployment/README.md index 69d9194a7..4d21b138f 100644 --- a/examples/deployment/README.md +++ b/examples/deployment/README.md @@ -38,7 +38,7 @@ You can use `kubectl create` for any of the examples to install that one directl ## Coherence Operator Quick Start -Ensure you have followed all the [Quick Start Guide](https://oracle.github.io/coherence-operator/docs/3.1.0/#/about/03_quickstart) including the +Ensure you have followed all the [Quick Start Guide](https://oracle.github.io/coherence-operator/docs/3.1.1/#/about/03_quickstart) including the prerequisites and have been able to successfully install the Coherence Operator and a Coherence Cluster. ## Software Versions @@ -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 ```