Skip to content

Commit

Permalink
chore(release): change version for release
Browse files Browse the repository at this point in the history
  • Loading branch information
Rory-Z committed Feb 16, 2022
1 parent 34a396f commit 32377cd
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build config/default | kubectl delete -f -

pre-release: manifests kustomize ## Pre-release preparation
sed -i -r 's|^appVersion:.*|appVersion: $(shell ./get-version)|g' deploy/charts/emqx-operator/Chart.yaml

cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build config/default > deploy/manifests/emqx-operator-controller.yaml

CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: emqx/emqx-operator-controller
newTag: 1.1.1
newTag: 1.1.2
2 changes: 1 addition & 1 deletion deploy/charts/emqx-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ version: 1.0.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 1.1.1
appVersion: 1.1.2
2 changes: 1 addition & 1 deletion deploy/manifests/emqx-operator-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7904,7 +7904,7 @@ spec:
- --leader-elect
command:
- /manager
image: emqx/emqx-operator-controller:1.1.1
image: emqx/emqx-operator-controller:1.1.2
livenessProbe:
httpGet:
path: /healthz
Expand Down
6 changes: 3 additions & 3 deletions docs/user-guides/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ We using [cert manager](https://github.com/jetstack/cert-manager) for provisioni
The default static configuration can be installed as follows:

```shell
$ kubectl apply -f https://raw.githubusercontent.com/emqx/emqx-operator/1.1.1/config/samples/operator/controller.yaml
$ kubectl apply -f https://raw.githubusercontent.com/emqx/emqx-operator/1.1.2/config/samples/operator/controller.yaml
```

### Installing with Helm
Expand Down Expand Up @@ -50,7 +50,7 @@ $ kubectl apply -f https://raw.githubusercontent.com/emqx/emqx-operator/1.1.1/co
1. Create EMQX Custom Resource file like this

```shell
$ cat https://raw.githubusercontent.com/emqx/emqx-operator/1.1.1/config/samples/emqx/v1beta2/emqx.yaml
$ cat https://raw.githubusercontent.com/emqx/emqx-operator/1.1.2/config/samples/emqx/v1beta2/emqx.yaml

apiVersion: apps.emqx.io/v1beta2
kind: EmqxBroker
Expand Down Expand Up @@ -130,7 +130,7 @@ $ kubectl apply -f https://raw.githubusercontent.com/emqx/emqx-operator/1.1.1/co
2. Deploy EMQX Custom Resource and check EMQX status

```shell
$ kubectl apply https://raw.githubusercontent.com/emqx/emqx-operator/1.1.1/config/samples/emqx/v1beta2/emqx.yaml
$ kubectl apply https://raw.githubusercontent.com/emqx/emqx-operator/1.1.2/config/samples/emqx/v1beta2/emqx.yaml
emqx.apps.emqx.io/emqx created

$ kubectl get pods
Expand Down
2 changes: 1 addition & 1 deletion get-version
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
# ensure dir
cd -P -- "$(dirname -- "$0")"

if [ "$(git describe --tag | egrep "^[0-9]+\.[0-9]+\.[0-9]$")" != "" ]; then
if git describe --tag | egrep -q "^[0-9]+\.[0-9]+\.[0-9]$"; then
git describe --tag
else
git rev-parse --short HEAD
Expand Down

0 comments on commit 32377cd

Please sign in to comment.