Skip to content

Commit

Permalink
chore(release): pre release 1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Rory-Z committed Mar 11, 2022
1 parent 18f8c52 commit cac5ab5
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check-helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Check helm version
on:
push:
paths:
- deploy/charts/**
- deploy/charts/emqx-operator/templates/**
pull_request:
paths:
- deploy/charts/**
- deploy/charts/emqx-operator/templates/**

jobs:
check-helm-version:
Expand Down
15 changes: 1 addition & 14 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
## Release Note 🍻


**Now we no longer support the creation of new v1beta1 resources,but existing v1beta1 resources are not affected**

### Features 🌈

- For EMQX 4.4, a DNS cluster is used by default, no additional `serviceAccount` needs to be created, EMQX 4.3 still uses the k8s APIServer cluster
- The Telegraf container can now run more robustly
- Add `postStart` for Telegraf container
- The EMQX container can now be terminated more gracefully
- Add `terminationGracePeriodSeconds` for EMQX container
- Add `preStop` command for EMQX container

### Fixes 🛠

- Fix `ACL` not work in emqx enterprise modules
- Fix can not use latest tag for emqx image
- Fix `.spec.listener.certificate.*.data` not work
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.4
newTag: 1.1.5
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.3
# 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.4
appVersion: 1.1.5
2 changes: 1 addition & 1 deletion deploy/manifests/emqx-operator-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8474,7 +8474,7 @@ spec:
- --leader-elect
command:
- /manager
image: emqx/emqx-operator-controller:1.1.4
image: emqx/emqx-operator-controller:1.1.5
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/getting-started/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ We using [cert manager](https://github.com/jetstack/cert-manager) for provisioni
The default static configuration can be installed as follows:

```shell
$ curl -f -L "https://github.com/emqx/emqx-operator/releases/download/1.1.4/emqx-operator-controller.yaml" | kubectl apply -f -
$ curl -f -L "https://github.com/emqx/emqx-operator/releases/download/1.1.5/emqx-operator-controller.yaml" | kubectl apply -f -
```

### Installing with Helm
Expand Down
2 changes: 1 addition & 1 deletion docs/zh_CN/getting-started/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
安装默认静态配置文件

```bash
$ curl -f -L "https://github.com/emqx/emqx-operator/releases/download/1.1.4/emqx-operator-controller.yaml" | kubectl apply -f -
$ curl -f -L "https://github.com/emqx/emqx-operator/releases/download/1.1.5/emqx-operator-controller.yaml" | kubectl apply -f -
```

### 通过 Helm 安装
Expand Down
17 changes: 9 additions & 8 deletions scripts/pre-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ KUSTOMIZE=${PWD}/bin/kustomize
pushd config/manager && ${KUSTOMIZE} edit set image controller="emqx/emqx-operator-controller:${tag}" && popd
${KUSTOMIZE} build config/default > deploy/manifests/emqx-operator-controller.yaml

# Default case for Linux sed,just use "-i"
sedi=(-i)
case "$(uname)" in
# For macOS, use two parameters
Darwin*) sedi=(-i "")
# Default case for GUN sed, use "sed -i"
SED_REPLACE="sed -i "
case $(sed --help 2>&1) in
*GNU*) SED_REPLACE="sed -i ";;
*BusyBox*) SED_REPLACE="sed -i ";;
*) SED_REPLACE="sed -i '' ";;
esac

sed "${sedi[@]}" "s|https://github.com/emqx/emqx-operator/releases/download/.*/emqx-operator-controller.yaml|https://github.com/emqx/emqx-operator/releases/download/${tag}/emqx-operator-controller.yaml|g" docs/en_US/getting-started/getting-started.md
sed "${sedi[@]}" "s|https://github.com/emqx/emqx-operator/releases/download/.*/emqx-operator-controller.yaml|https://github.com/emqx/emqx-operator/releases/download/${tag}/emqx-operator-controller.yaml|g" docs/zh_CN/getting-started/getting-started.md
sed "${sedi[@]}" -r "s|^appVersion:.*|appVersion: ${tag}|g" deploy/charts/emqx-operator/Chart.yaml
${SED_REPLACE} "s|https://github.com/emqx/emqx-operator/releases/download/.*/emqx-operator-controller.yaml|https://github.com/emqx/emqx-operator/releases/download/${tag}/emqx-operator-controller.yaml|g" docs/en_US/getting-started/getting-started.md
${SED_REPLACE} "s|https://github.com/emqx/emqx-operator/releases/download/.*/emqx-operator-controller.yaml|https://github.com/emqx/emqx-operator/releases/download/${tag}/emqx-operator-controller.yaml|g" docs/zh_CN/getting-started/getting-started.md
${SED_REPLACE} -r "s|^appVersion:.*|appVersion: ${tag}|g" deploy/charts/emqx-operator/Chart.yaml

0 comments on commit cac5ab5

Please sign in to comment.