diff --git a/helm-charts/doris-operator/templates/_helpers.tpl b/helm-charts/doris-operator/templates/_helpers.tpl index 022d4d4a..b2c66940 100644 --- 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 deleted file mode 100644 index 165bf61f..00000000 --- a/helm-charts/doris-operator/templates/namespace.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{ $namespacefind := (lookup "v1" "Namespace" "" (printf ( include "operator.namespace" .))) }} -{{ if not $namespacefind }} -apiVersion: v1 -kind: Namespace -metadata: - annotations: - "helm.sh/resource-policy": keep - labels: - control-plane: {{ template "kube-doris.name" . }}-operator - app.kubernetes.io/name: namespace - app.kubernetes.io/instance: {{ template "kube-doris.name" . }} - app.kubernetes.io/component: {{ template "kube-doris.name" . }}-operator - app.kubernetes.io/part-of: {{ template "kube-doris.name" . }}-operator - name: {{ template "operator.namespace" . }} -{{ end }} \ No newline at end of file diff --git a/helm-charts/doris-operator/values.yaml b/helm-charts/doris-operator/values.yaml index 8c7bc73c..e8bfd0da 100644 --- 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 index 4e4998f1..32ca62a9 100644 --- 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 index e41a9abf..dee644a0 100644 --- 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.