Skip to content

Commit

Permalink
Prepare release v3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
thegridman committed Oct 13, 2020
1 parent 8308bd6 commit ceaf9a5
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 10 deletions.
30 changes: 29 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/<version>$(subst .,\.,$(PREV_VERSION))</version>/<version>$(VERSION)</version>/g' {} +
find java \( -name '*.pom' \) -exec sed -i '' 's/<version>$(subst .,\.,$(PREV_VERSION))</version>/<version>$(VERSION)</version>/g' {} +


# ----------------------------------------------------------------------------------------------------------------------
# Release the Coherence Operator dashboards
# ----------------------------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
8 changes: 4 additions & 4 deletions docs/installation/01_installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/jvm/030_jvm_args.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Some of the arguments and system properties above can be overridden or changed by setting values in the `Coherence` CDR spec.
4 changes: 2 additions & 2 deletions examples/deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
```
Expand Down

0 comments on commit ceaf9a5

Please sign in to comment.