diff --git a/charts/blocky/Chart.lock b/charts/blocky/Chart.lock index 8229f7e..e223e2e 100644 --- a/charts/blocky/Chart.lock +++ b/charts/blocky/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: redis repository: https://charts.bitnami.com/bitnami - version: 18.1.5 -digest: sha256:d8d9ee032ba0c958a9be74acbbf314624c4e5a5a262ee8a629e444a6e8dd5639 -generated: "2023-10-17T22:44:27.58782527+09:00" + version: 19.6.2 +digest: sha256:a60a74f866edd50736d77fa85ddc9e47029f225a0dc7ab7bd6a1b8fbf83b29c3 +generated: "2024-07-17T11:11:24.547306326+09:00" diff --git a/charts/blocky/Chart.yaml b/charts/blocky/Chart.yaml index 9465f85..684fd1b 100644 --- a/charts/blocky/Chart.yaml +++ b/charts/blocky/Chart.yaml @@ -15,16 +15,16 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.22.3 +version: 0.24.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.22" +appVersion: "v0.24" dependencies: - name: redis condition: redis.enabled - version: 18.1.5 + version: 19.6.2 repository: https://charts.bitnami.com/bitnami diff --git a/charts/blocky/templates/configmap.yaml b/charts/blocky/templates/configmap.yaml index 8174e60..77bca3c 100644 --- a/charts/blocky/templates/configmap.yaml +++ b/charts/blocky/templates/configmap.yaml @@ -32,6 +32,9 @@ data: {{- with .Values.customDNS.mapping }} mapping: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.customDNS.zone }} + zone: {{ . }} + {{- end }} {{- end }} {{- if .Values.conditional.customize }} @@ -51,8 +54,8 @@ data: {{- if .Values.blocking.customize }} blocking: - blackLists: {{- toYaml .Values.blocking.blackLists | nindent 8 }} - whiteLists: {{- toYaml .Values.blocking.whiteLists | nindent 8 }} + denylists: {{- toYaml .Values.blocking.denylists | nindent 8 }} + allowlists: {{- toYaml .Values.blocking.allowlists | nindent 8 }} clientGroupsBlock: {{- toYaml .Values.blocking.clientGroupsBlock | nindent 8 }} blockType: {{ .Values.blocking.blockType }} blockTTL: {{ .Values.blocking.blockTTL }} @@ -161,7 +164,7 @@ data: {{- if .Values.hostsFile.customize }} hostsFile: - filePath: {{ .Values.hostsFile.filePath }} + sources: {{- toYaml .Values.hostsFile.sources | nindent 6 }} hostsTTL: {{ .Values.hostsFile.hostsTTL }} refreshPeriod: {{ .Values.hostsFile.refreshPeriod }} filterLoopback: {{ .Values.hostsFile.filterLoopback }} @@ -191,5 +194,16 @@ data: # enabled if true, Default: false enable: {{ .Values.ede.enable }} + # optional: EDNS Client Subnet (ECS) + ecs: + # Use ECS information if it is present with a netmask is 32 for IPv4 or 128 for IPv6 as CientIP. Default: false + useAsClient: {{ .Values.ecs.useAsClient }} + # Forward ECS option to upstream + forward: {{ .Values.ecs.forward }} + # Add ECS option for IPv4 requests if mask is greater than zero (max value 32) + ipv4Mask: {{ .Values.ecs.ipv4Mask }} + # Add ECS option for IPv6 requests if mask is greater than zero (max value 128) + ipv6Mask: {{ .Values.ecs.ipv6Mask }} + specialUseDomains: rfc6762-appendixG: {{ .Values.specialUseDomains.rfc6762_appendixG }} \ No newline at end of file diff --git a/charts/blocky/values.yaml b/charts/blocky/values.yaml index a06b3fe..0f2aaf4 100644 --- a/charts/blocky/values.yaml +++ b/charts/blocky/values.yaml @@ -96,6 +96,10 @@ certificate: ## upstream upstreams: + init: + # The "init" is testing the given resolvers for each group. The potentially fatal error, depending on the strategy, is if a group has no functional resolvers. Default: blocking + strategy: blocking + # Blocky supports different upstream strategies (default `parallel_best`) that determine how and to which upstream DNS servers requests are forwarded. strategy: parallel_best @@ -127,8 +131,8 @@ bootstrapDns: # optional: if path defined, use this file for query resolution (A, AAAA and rDNS). Default: empty hostsFile: customize: false - # optional: Path to hosts file (e.g. /etc/hosts on Linux) - filePath: "" + # optional: Host files (e.g. /etc/hosts on Linux) + sources: [] # optional: TTL, default: 1h hostsTTL: 1h # optional: Time between hosts file refresh, default: 1h @@ -177,6 +181,8 @@ customDNS: # example.com: printer.lan mapping: {} # printer.lan: 192.168.178.3,2001:0db8:85a3:08d3:1319:8a2e:0370:7344 + # CNAME records are supported by utilizing the zone parameter. The zone file is a multiline string containing a DNS Zone File. + zone: "" # optional: definition, which DNS resolver(s) should be used for queries to the domain (with all sub-domains). Multiple resolvers must be separated by a comma # Example: Query client.fritz.box will ask DNS server 192.168.178.1. This is necessary for local network, to resolve clients by host name @@ -215,7 +221,7 @@ clientLookup: blocking: customize: false # definition of blacklist groups. Can be external link (http/https) or local file - blackLists: {} + denylists: {} # ads: # - https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt # - https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts @@ -228,7 +234,7 @@ blocking: # special: # - https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews/hosts # definition of whitelist groups. Attention: if the same group has black and whitelists, whitelists will be used to disable particular blacklist entries. If a group has only whitelist entries -> this means only domains from this list are allowed, all other domains will be blocked - whiteLists: {} + allowlists: {} # ads: # - whitelist.txt # - | @@ -345,6 +351,17 @@ ede: # enabled if true, Default: false enable: false +# optional: EDNS Client Subnet (ECS) +ecs: + # Use ECS information if it is present with a netmask is 32 for IPv4 or 128 for IPv6 as CientIP. Default: false + useAsClient: false + # Forward ECS option to upstream + forward: fase + # Add ECS option for IPv4 requests if mask is greater than zero (max value 32) + ipv4Mask: 0 + # Add ECS option for IPv6 requests if mask is greater than zero (max value 128) + ipv6Mask: 0 + # optional: write query information (question, answer, client, duration etc.) to daily csv file queryLog: enabled: false @@ -362,6 +379,8 @@ queryLog: creationCooldown: 2 # optional: which information should be logged, default: all fields: [] + # optional: Interval to write data in bulk to the external database + flushInterval: 30s # optional: export metrics to prometheus