Deploy: read cluster objects, drop the zones and RPZ ConfigMaps

DO NOT SYNC THIS BEFORE MIGRATING. Removing fancy-dns-zones and fancy-dns-rpz
from the kustomization lets a pruning GitOps tool delete them, and they hold the
only copy of the zones and address redirects until the objects exist. Follow
deploy/MIGRATION.md: install the definitions, run `fancy-dns-console migrate`
against the live cluster, then roll this out.

The StatefulSet starts the resolver with -kube and no longer mounts the two
ConfigMaps; its service account loses the ConfigMap role and keeps only the
read-only Role on the fancy-dns objects (crds/rbac.yaml). The kustomization now
installs the definitions and that Role. The shipped config no longer lists the
migrated sources.

Config validation no longer refuses an enabled blocklist with no sources in the
file, because BlockList, DomainRule and AddressOverride objects can supply every
rule and the file cannot know. The existing "no source" warning says so. That
removed the only validation message the settings tests used as a fixture; they
now use an invalid acl.default_policy, and an empty settings document is refused
by the handler instead of by that check.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
matsandClaude Sonnet 5.5 committed 2026-10-16 10:19:47 +02:00
1 parent 467733a7f9
commit 04ebf68c0f
9 files changed
+27 -105

No files matched your search

+4 -14
View File
@@ -86,20 +86,10 @@ data:
blocklist:
enabled: true
default_action: nxdomain
local_zones: [/etc/fancy-dns/zones/*.zone]
lists:
- name: edge-router-x-address-overrides
format: rpz
path: /etc/fancy-dns/rpz/address-overrides.rpz
enabled: true
refresh: 0s
- name: haas
format: plain
url: https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
path: /var/lib/fancy-dns/lists/hosts
enabled: true
refresh: 24h
categories: [ads, tracking]
# Lists, zones, address redirects, inline rules and client groups are
# cluster objects now (BlockList, DNSZone, AddressOverride, DomainRule,
# ClientGroup); see deploy/MIGRATION.md. `fancy-dns-console migrate`
# converts what was here.
acl:
default_policy: allow
+2 -28
View File
@@ -1,6 +1,5 @@
# The UI edits the shared `fancy-dns-zones` ConfigMap. Its projected volume is
# read-only; these narrowly scoped permissions let the API update only that
# one ConfigMap so both DNS replicas receive the same records.
# The resolver's identity. It reads the fancy-dns objects through the Role in
# crds/rbac.yaml and writes nothing; the console has its own account.
apiVersion: v1
kind: ServiceAccount
metadata:
@@ -9,28 +8,3 @@ metadata:
labels:
app.kubernetes.io/name: fancy-dns
automountServiceAccountToken: true
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: fancy-dns-zones
namespace: dns
rules:
- apiGroups: [""]
resources: ["configmaps"]
resourceNames: ["fancy-dns-zones"]
verbs: ["get", "patch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: fancy-dns-zones
namespace: dns
subjects:
- kind: ServiceAccount
name: fancy-dns
namespace: dns
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: fancy-dns-zones
-11
View File
@@ -1,11 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: fancy-dns-zones
namespace: dns
labels:
app.kubernetes.io/name: fancy-dns
app.kubernetes.io/component: local-zones
# Leave data unmanaged by GitOps. The Local zones page writes one
# zone--<apex>.zone
# key per zone through the API; server-side apply preserves those user fields.
-16
View File
@@ -1,16 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: fancy-dns-rpz
namespace: dns
labels:
app.kubernetes.io/name: fancy-dns
app.kubernetes.io/component: address-overrides
data:
address-overrides.rpz: |
$TTL 60
tornberg.me A 10.10.3.10
knatofs.se A 10.10.3.10
k6n.net A 10.10.3.10
slask.local A 10.10.3.10
iamu.dev A 10.10.3.10
+4 -18
View File
@@ -27,7 +27,6 @@ spec:
annotations:
k8s-helper.io/git-url: "https://git.k6n.net/mats/fancy-dns"
k8s-helper.io/git-ssh: "git@git.k6n.net:mats/fancy-dns.git"
dns.k6n.net/zones-api: "enabled"
# A config change is a SIGHUP, not a restart: the server re-reads the
# file and hot-swaps every component. This annotation is for
# stakater/reloader-class controllers; without one, `kubectl rollout
@@ -66,6 +65,10 @@ spec:
args:
- -config
- /etc/fancy-dns/config.yaml
# Read ClientGroup, BlockList, DNSZone, AddressOverride and
# DomainRule objects from this namespace with the pod's service
# account. The console (console/console.yaml) is what writes them.
- -kube
env:
# Substituted into the config by the loader, so the admin API key
# comes from the Secret and not from the ConfigMap.
@@ -136,12 +139,6 @@ spec:
mountPath: /etc/fancy-dns/config.yaml
subPath: config.yaml
readOnly: true
- name: zones
mountPath: /etc/fancy-dns/zones
readOnly: true
- name: rpz
mountPath: /etc/fancy-dns/rpz
readOnly: true
- name: tls
mountPath: /etc/fancy-dns/tls
readOnly: true
@@ -153,17 +150,6 @@ spec:
- name: config
configMap:
name: fancy-dns-config
# Local zones are ordinary master files. The API writes them to the
# shared ConfigMap, which projects one zone--<apex>.zone file per zone here.
# The GitOps manifest creates the ConfigMap empty; the UI owns its data.
- name: zones
configMap:
name: fancy-dns-zones
optional: false
- name: rpz
configMap:
name: fancy-dns-rpz
optional: false
- name: tls
secret:
secretName: fancy-dns-tls
+2 -2
View File
@@ -11,8 +11,8 @@ namespace: dns
resources:
- 00-config.yaml
- 05-serviceaccount.yaml
- 06-zones.yaml
- 07-rpz.yaml
- crds/crds.yaml
- crds/rbac.yaml
- 10-deployment.yaml
- 20-service.yaml
- 30-ingress.yaml