Merge pull request #147 from catpineapple/helm_namespace

[helm] use helm install --namespace pass parameters
apache · Apr 8, 2024 · faf7ec8 · faf7ec8
2 parents 9653bad + 45f1fd7
commit faf7ec8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 20 deletions.
diff --git a/helm-charts/doris-operator/templates/_helpers.tpl b/helm-charts/doris-operator/templates/_helpers.tpl
@@ -7,7 +7,7 @@
 {{- end }}
 
 {{- define "operator.namespace" -}}
-{{- default .Release.Namespace .Values.dorisOperator.namespace }}
+{{ print .Release.Namespace }}
 {{- end }}
 
 {{- define "kube-doris.name" -}}

diff --git a/helm-charts/doris-operator/templates/namespace.yaml b/helm-charts/doris-operator/templates/namespace.yaml
diff --git a/helm-charts/doris-operator/values.yaml b/helm-charts/doris-operator/values.yaml
@@ -4,7 +4,6 @@
 
 dorisOperator:
   # the namespace of dorisoperator, if not set, the release namespace will be used.
-  namespace: "doris"
   image:
     repository: selectdb/doris.k8s-operator
     tag: 1.3.1

diff --git a/helm-charts/doris/templates/_helpers.tpl b/helm-charts/doris/templates/_helpers.tpl
@@ -3,7 +3,7 @@
 {{- end }}
 
 {{- define "doriscluster.namespace" -}}
-{{ default .Release.Namespace .Values.dorisCluster.namespace }}
+{{ print .Release.Namespace }}
 {{- end }}
 
 {{- define "kube-control.name" -}}

diff --git a/helm-charts/doris/values.yaml b/helm-charts/doris/values.yaml
@@ -3,8 +3,6 @@
 dorisCluster:
   # the name of doriscluster, if not set, the chart name will be used.
   name: "doriscluster-helm"
-  # the namespace of doriscluster, if not set, the release namespace will be used.
-  namespace: "doris"
   # annotations for doris cluster.
   annotations: {}
   # specify the cn deploy or not.