Skip to content

fix(helm): wire watchNamespaces value into operator ConfigMap #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtomaszon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(helm): wire watchNamespaces value into operator ConfigMap #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions deploy/helm/clickhouse-operator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,25 @@ null
{{- tpl (toYaml (dict $k $v)) $root }}
{{ end }}
{{- end }}

{{/*
altinity-clickhouse-operator.configmap-files merges watchNamespaces into the
operator config before rendering the ConfigMap data block.

This exists because configs.files.config.yaml.watch.namespaces.include is
deep inside a nested structure — Helm's values merge cannot target it
directly. Instead we deepCopy the files map, patch the nested value in-place,
and pass the result to configmap-data.

Arguments (list): root context, configs.files, watchNamespaces list
*/}}
{{- define "altinity-clickhouse-operator.configmap-files" -}}
{{- $root := index . 0 -}}
{{- $files := deepCopy (index . 1) -}}
{{- $watchNamespaces := index . 2 -}}
{{- if $watchNamespaces -}}
{{- $namespaces := index (index (index $files "config.yaml") "watch") "namespaces" -}}
{{- $_ := set $namespaces "include" $watchNamespaces -}}
{{- end -}}
{{- include "altinity-clickhouse-operator.configmap-data" (list $root $files) -}}
{{- end -}}
2 changes: 1 addition & 1 deletion ...helm/clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-files.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ metadata:
namespace: {{ include "altinity-clickhouse-operator.namespace" . }}
labels: {{ include "altinity-clickhouse-operator.labels" . | nindent 4 }}
annotations: {{ include "altinity-clickhouse-operator.annotations" . | nindent 4 }}
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.files) | nindent 2 }}
data: {{ include "altinity-clickhouse-operator.configmap-files" (list . .Values.configs.files .Values.watchNamespaces) | nindent 2 }}
5 changes: 5 additions & 0 deletions deploy/helm/clickhouse-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ podAnnotations:
prometheus.io/scrape: 'true'
clickhouse-operator-metrics/port: '9999'
clickhouse-operator-metrics/scrape: 'true'
# watchNamespaces -- namespaces where the operator watches for ClickHouseInstallation resources.
# If empty, the operator watches only its own namespace (or all namespaces when running in kube-system).
# Use [".*"] to watch all namespaces.
# Example: watchNamespaces: ["clickhouse", "my-other-namespace"]
watchNamespaces: []
# nameOverride -- override name of the chart
nameOverride: ""
# fullnameOverride -- full name of the chart.
Expand Down