feat(blocky): allow additional bootstrapdns (#7816)

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  #7797

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

** App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
This commit is contained in:
Stavros Kois
2023-03-22 07:48:58 +01:00
committed by GitHub
parent 112ed337ca
commit 6706109023
3 changed files with 56 additions and 9 deletions
+31
View File
@@ -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
@@ -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 }}
+6
View File
@@ -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