diff --git a/.github/workflows/check-helm.yaml b/.github/workflows/check-helm.yaml index 933cf524f..2d692e4a8 100644 --- a/.github/workflows/check-helm.yaml +++ b/.github/workflows/check-helm.yaml @@ -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: diff --git a/RELEASE.md b/RELEASE.md index 022b1b87c..024818bde 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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 \ No newline at end of file +- Fix `.spec.listener.certificate.*.data` not work \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index bcef6f074..81726728d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: emqx/emqx-operator-controller - newTag: 1.1.4 + newTag: 1.1.5 diff --git a/deploy/charts/emqx-operator/Chart.yaml b/deploy/charts/emqx-operator/Chart.yaml index bf0017c99..e7e074b0b 100644 --- a/deploy/charts/emqx-operator/Chart.yaml +++ b/deploy/charts/emqx-operator/Chart.yaml @@ -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 \ No newline at end of file +appVersion: 1.1.5 \ No newline at end of file diff --git a/deploy/manifests/emqx-operator-controller.yaml b/deploy/manifests/emqx-operator-controller.yaml index e6dc40fbe..9144c9922 100644 --- a/deploy/manifests/emqx-operator-controller.yaml +++ b/deploy/manifests/emqx-operator-controller.yaml @@ -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 diff --git a/docs/en_US/getting-started/getting-started.md b/docs/en_US/getting-started/getting-started.md index 5df80ae7a..1170c7865 100644 --- a/docs/en_US/getting-started/getting-started.md +++ b/docs/en_US/getting-started/getting-started.md @@ -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 diff --git a/docs/zh_CN/getting-started/getting-started.md b/docs/zh_CN/getting-started/getting-started.md index 5589f97ff..713f3527a 100644 --- a/docs/zh_CN/getting-started/getting-started.md +++ b/docs/zh_CN/getting-started/getting-started.md @@ -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 ๅฎ‰่ฃ… diff --git a/scripts/pre-release.sh b/scripts/pre-release.sh index 4562840f3..de7875890 100755 --- a/scripts/pre-release.sh +++ b/scripts/pre-release.sh @@ -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