fix(blocky): fix additional bootstap dns (#8029)

**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 #8014
⚒️ Fixes #7990

**⚙️ 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._
This commit is contained in:
Stavros Kois 2023-04-15 15:12:31 +03:00 committed by GitHub
parent 2b4194c958
commit 926084c29d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 10 deletions

View File

@ -25,7 +25,7 @@ sources:
- https://0xerr0r.github.io/blocky/
- https://github.com/0xERR0R/blocky
- https://github.com/Mozart409/blocky-frontend
version: 5.0.15
version: 5.0.16
annotations:
truecharts.org/catagories: |
- network

View File

@ -439,12 +439,22 @@ questions:
schema:
type: string
default: 2s
- variable: failStartOnListError
label: Fail Start on List Error
description: Fail to start if at least one list can't be downloaded or opened
- variable: startStrategy
label: Start Strategy
description: |
blocking: all blocking lists will be loaded before DNS resolution starts.</br>
failOnError: like blocking but blocky will shut down if any download fails.</br>
fast: DNS resolution starts immediately without blocking which will be enabled after list load is completed
schema:
type: boolean
default: false
type: string
default: blocking
enum:
- value: blocking
description: Blocking
- value: failOnError
description: Fail On Error
- value: fast
description: Fast
- variable: processingConcurrency
label: Processing Concurrency
description: Sets how many list-groups can be processed at the same time

View File

@ -113,9 +113,11 @@ bootstrapDns:
{{- with .upstream }}
- upstream: {{ . }}
{{- end }}
{{- range $id, $value := .ips }}
{{- if .ips }}
ips:
{{- range $id, $value := .ips }}
- {{ $value }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
@ -204,7 +206,7 @@ blocking:
downloadTimeout: {{ .Values.blocking.downloadTimeout }}
downloadAttempts: {{ .Values.blocking.downloadAttempts }}
downloadCooldown: {{ .Values.blocking.downloadCooldown }}
failStartOnListError: {{ .Values.blocking.failStartOnListError }}
startStrategy: {{ .Values.blocking.startStrategy }}
processingConcurrency: {{ .Values.blocking.processingConcurrency }}
{{- if .Values.blocking.whitelist }}
whiteLists:

View File

@ -207,8 +207,8 @@ blocking:
downloadAttempts: 3
# -- Sets the block download cooldown
downloadCooldown: 2s
# -- Set to fail start of lists cannot be downloaded
failStartOnListError: false
# -- Set the start strategy (blocking | failOnError | fast)
startStrategy: blocking
# -- Sets how many list-groups can be processed at the same time
processingConcurrency: 4
# -- Add blocky whitelists