Merge branch 'main' into aylei/rollout-outdated-direct-pod

matrixorigin · Aug 22, 2024 · a845c70 · a845c70
2 parents 3396226 + 90cbe43
commit a845c70
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/charts/matrixone-operator/Chart.yaml b/charts/matrixone-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: matrixone-operator
 description: Matrixone Kubernetes Operator
 type: application
-version: 1.2.0-alpha.7
+version: 1.2.0-alpha.8
 appVersion: 0.1.0
 kubeVersion: ">=1.19.0-0"
 icon: https://raw.githubusercontent.com/matrixorigin/artwork/main/docs/overview/logo.png

diff --git a/charts/matrixone-operator/templates/deployment.yaml b/charts/matrixone-operator/templates/deployment.yaml
@@ -48,8 +48,10 @@ spec:
           image: {{ include "matrixone-operator.image" . }}
           command:
           - /manager
+          {{- with .Values.args }}
           args:
-          - -leader-elect
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- range $key, $value :=  .Values.env }}

diff --git a/charts/matrixone-operator/values.yaml b/charts/matrixone-operator/values.yaml
@@ -78,6 +78,10 @@ kruise:
     image:
       repository: openkruise/kruise-manager
 
+# operator arguments
+args:
+  - -leader-elect
+
 defaultArgs:
   - name: logService
     values: