feat(helm): add "deployment" mode in helm value

Signed-off-by: Rory Z <[email protected]>
emqx · Sep 1, 2023 · ba6492c · ba6492c
1 parent 151dc19
commit ba6492c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/.github/actions/deploy-operator/action.yaml b/.github/actions/deploy-operator/action.yaml
@@ -31,11 +31,9 @@ runs:
       helm install emqx-operator deploy/charts/emqx-operator\
         --set image.repository=$repository \
         --set image.tag=$tag \
+        --set development=true \
         --namespace emqx-operator-system \
         --create-namespace
-      kubectl patch -n emqx-operator-system deployment emqx-operator-controller-manager \
-        --type=json \
-        -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--zap-devel=true"}]'
   - name: Check operator
     shell: bash
     run: kubectl wait --for=condition=Ready pods -l "control-plane=controller-manager" -n emqx-operator-system
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -66,11 +66,9 @@ jobs:
         run: |
           helm install emqx-operator deploy/charts/emqx-operator \
             --set image.tag=${{ github.sha }} \
+            --set development=true \
             --namespace emqx-operator-system \
             --create-namespace
-          kubectl patch -n emqx-operator-system deployment emqx-operator-controller-manager \
-            --type=json \
-            -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--zap-devel=true"}]'
       - name: Check operator
         timeout-minutes: 5
         run: kubectl wait --for=condition=Ready pods -l "control-plane=controller-manager" -n emqx-operator-system

diff --git a/.github/workflows/upgrade.yaml b/.github/workflows/upgrade.yaml
@@ -70,6 +70,7 @@ jobs:
             --namespace emqx-operator-system \
             --create-namespace \
             --set image.tag=${{ github.sha }} \
+            --set development=true \
             --debug
       - name: Check operator
         env:

diff --git a/config/samples/emqx/v2beta1/emqx-full.yaml b/config/samples/emqx/v2beta1/emqx-full.yaml
@@ -24,7 +24,6 @@ spec:
     spec:
       replicas: 2
       volumeClaimTemplates:
-        storageClassName: standard
         resources:
           requests:
             storage: 20Mi

diff --git a/deploy/charts/emqx-operator/Chart.yaml b/deploy/charts/emqx-operator/Chart.yaml
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.2-rc.1
+version: 2.2.2
 
 # 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: 2.2.2-rc.1
+appVersion: 2.2.2
diff --git a/deploy/charts/emqx-operator/README.md b/deploy/charts/emqx-operator/README.md
@@ -33,6 +33,8 @@ The following table lists the configurable parameters of the cert-manager chart
 
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
+| `skipCRDs` | If `true`, skips installing CRDs | `false` |
+| `development` | Development configures the logger to use a Zap development config  (stacktraces on warnings, no sampling), otherwise a Zap production config will be used (stacktraces on errors, sampling). | `false` |
 | `image.repository` | Image repository | `emqx/emqx-operator-controller` |
 | `image.tag` | Image tag | `{{RELEASE_VERSION}}` |
 | `image.pullPolicy` | Image pull policy | `IfNotPresent` |

diff --git a/deploy/charts/emqx-operator/templates/controller-manager.yaml b/deploy/charts/emqx-operator/templates/controller-manager.yaml
@@ -27,6 +27,7 @@ spec:
         - --leader-elect
         - --metrics-bind-address=:8080
         - --health-probe-bind-address=:8081
+        - --zap-devel={{ .Values.development }}
         command:
         - /manager
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

diff --git a/deploy/charts/emqx-operator/values.yaml b/deploy/charts/emqx-operator/values.yaml
@@ -4,6 +4,11 @@
 
 skipCRDs: false
 
+# Development configures the logger to use a Zap development config
+# (stacktraces on warnings, no sampling), otherwise a Zap production
+# config will be used (stacktraces on errors, sampling).
+development: false
+
 replicaCount: 1
 
 image: