diff --git a/charts/enterprise/blocky/questions.yaml b/charts/enterprise/blocky/questions.yaml index 8040f2250fc..ab3b95cfd7b 100644 --- a/charts/enterprise/blocky/questions.yaml +++ b/charts/enterprise/blocky/questions.yaml @@ -113,6 +113,37 @@ questions: type: string required: true default: "" + - variable: additionalBootstrapDns + group: App Configuration + label: Additional Bootstrap DNS + schema: + type: list + show_if: [[ "bootstrapDns", "!=", {"upstream": "", "ips": []} ]] + default: [] + items: + - variable: additionalBootstrapDnsEntry + label: Additional Bootstrap DNS Entry + schema: + additional_attrs: true + type: dict + attrs: + - variable: upstream + label: Upstream + schema: + type: string + default: "" + - variable: ips + label: IPs + schema: + type: list + default: [] + items: + - variable: ipEntry + label: IP Entry + schema: + type: string + required: true + default: "" - variable: filtering group: App Configuration label: Filtering diff --git a/charts/enterprise/blocky/templates/_blockyConfig.tpl b/charts/enterprise/blocky/templates/_blockyConfig.tpl index de2a61808ff..a15e0bcff12 100644 --- a/charts/enterprise/blocky/templates/_blockyConfig.tpl +++ b/charts/enterprise/blocky/templates/_blockyConfig.tpl @@ -99,15 +99,25 @@ hostsFile: {{- if or .Values.bootstrapDns.upstream .Values.bootstrapDns.ips }} bootstrapDns: -{{- if .Values.bootstrapDns.upstream }} - upstream: {{ .Values.bootstrapDns.upstream }} -{{- end }} -{{- if .Values.bootstrapDns.ips }} - ips: -{{- range $id, $value := .Values.bootstrapDns.ips }} - - {{ $value }} -{{- end }} -{{- end }} + {{- if .Values.bootstrapDns.upstream }} + - upstream: {{ .Values.bootstrapDns.upstream }} + {{- end }} + {{- if .Values.bootstrapDns.ips }} + ips: + {{- range $id, $value := .Values.bootstrapDns.ips }} + - {{ $value }} + {{- end }} + {{- end }} + {{/* Add additional Bootstrap DNS */}} + {{- range .Values.additionalBootstrapDns }} + {{- with .upstream }} + - upstream: {{ . }} + {{- end }} + {{- range $id, $value := .ips }} + ips: + - {{ $value }} + {{- end }} + {{- end }} {{- end }} {{- if or .Values.filtering.filtering }} diff --git a/charts/enterprise/blocky/values.yaml b/charts/enterprise/blocky/values.yaml index 455d30c8053..10ceafc7e8a 100644 --- a/charts/enterprise/blocky/values.yaml +++ b/charts/enterprise/blocky/values.yaml @@ -140,6 +140,12 @@ bootstrapDns: # -- IP's linked to upstream DoT/DoH DNS name ips: [] +# -- set additional bootstrap dns (not needed, only used if bootstrapDns is set) +additionalBootstrapDns: + [] + # - upstream: "" + # ips: [] + # -- Return empty answer for these queries filtering: # -- Ensures filtering by query type