Make intra-cluster NOTIFY loop-free (TSIG-keyed, no pod IPs in restart config)
v0.2.5 (PR #14) added an options-scope allow-notify enumerating the primary pod IP on secondaries. Options-scope config feeds the config-hash annotation that rolls the StatefulSet, so any config change rolled the pods, the primary came back on a new pod IP, the operator re-rendered with the new IP, the hash changed, the pods rolled again — an infinite roll loop across every BindCluster. The prod deployment was reverted to v0.2.4. Replace the pod-IP allow-notify with TSIG-authenticated NOTIFY: - Secondaries render `allow-notify { key "<name>"; };` — a static key element with NO IPs. It depends only on the key name, so pod-IP churn can never change the render, the config-hash, or trigger a restart. - The primary signs its outgoing NOTIFYs: the zone-scope also-notify entries (already enumerating replica pod IPs, applied via rndc addzone/modzone with NO restart) now carry `key "<name>"`. - Key choice: reuse the cluster's catalog transfer TSIG key (TransferKeyRef). Secondaries already present it for AXFR and it is in keys.conf on every pod, so no new key plumbing is needed. Add a permanent regression guard for the loop class: - controller: reconcile the ConfigMap with the primary pod on two different IPs and assert the config-hash is byte-identical. - render: render restart-scoped input and assert no pod IP appears in allow-notify; RenderInput no longer has any pod-IP field. Zone-scope also-notify (rndc, no restart) legitimately still lists pod IPs; only restart-scoped config must be pod-IP-independent.
This commit is contained in:
@@ -98,31 +98,87 @@ func TestRenderCatalogPrimariesCarryTransferKey(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenderSecondaryAllowNotifyPrimaryPodIP(t *testing.T) {
|
||||
func TestRenderSecondaryAllowNotifyByKey(t *testing.T) {
|
||||
// Secondaries transfer from the primary Service ClusterIP but the primary's
|
||||
// NOTIFYs arrive from its pod IP, so an options allow-notify must cover the
|
||||
// pod IP (and keep the transfer address) or BIND refuses them as non-primary.
|
||||
// NOTIFYs arrive from its pod IP, so BIND refuses them as non-primary unless
|
||||
// an explicit allow-notify covers them. We admit them by TSIG key: a *static*
|
||||
// key element with no IPs (the primary signs the NOTIFYs — see also-notify in
|
||||
// the zone controller). NO pod IP may appear here, or the config-hash churns.
|
||||
in := RenderInput{
|
||||
Cluster: newCluster(bindv1alpha1.ModeAuthoritative),
|
||||
PrimaryAddress: "10.43.5.5",
|
||||
PrimaryPodAddresses: []string{"10.42.3.197"},
|
||||
Cluster: newCluster(bindv1alpha1.ModeAuthoritative),
|
||||
PrimaryAddress: "10.43.5.5",
|
||||
NotifyKeyName: "externaldns-key",
|
||||
}
|
||||
primary, secondary := RenderNamedConf(in)
|
||||
if !strings.Contains(secondary, "allow-notify { 10.42.3.197; 10.43.5.5; };") {
|
||||
t.Fatalf("secondary allow-notify must cover the primary pod IP and transfer address:\n%s", secondary)
|
||||
if !strings.Contains(secondary, `allow-notify { key "externaldns-key"; };`) {
|
||||
t.Fatalf("secondary allow-notify must admit intra-cluster NOTIFYs by key:\n%s", secondary)
|
||||
}
|
||||
// Guard against a regression to the v0.2.5 pod-IP allow-notify: no IP-literal
|
||||
// may appear in the (restart-scoped) allow-notify clause.
|
||||
for _, line := range strings.Split(secondary, "\n") {
|
||||
if strings.Contains(line, "allow-notify") && (strings.Contains(line, "10.42.") || strings.Contains(line, "10.43.")) {
|
||||
t.Fatalf("allow-notify must not enumerate pod/service IPs (v0.2.5 roll loop):\n%s", line)
|
||||
}
|
||||
}
|
||||
if strings.Contains(primary, "allow-notify") {
|
||||
t.Fatalf("primary must not render allow-notify (it is the notifier, not a secondary):\n%s", primary)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenderSecondaryAllowNotifyOmittedWhenPodIPUnknown(t *testing.T) {
|
||||
// With no primary pod IP known there is nothing to add beyond BIND's implicit
|
||||
// primaries-derived default; emit nothing rather than a bare/duplicate clause.
|
||||
in := RenderInput{Cluster: newCluster(bindv1alpha1.ModeAuthoritative)}
|
||||
func TestRenderSecondaryAllowNotifyOmittedWhenNoKey(t *testing.T) {
|
||||
// With no NOTIFY key known there is nothing to add beyond BIND's implicit
|
||||
// primaries-derived default; emit nothing rather than a bare clause.
|
||||
in := RenderInput{Cluster: newCluster(bindv1alpha1.ModeAuthoritative), PrimaryAddress: "10.43.5.5"}
|
||||
_, secondary := RenderNamedConf(in)
|
||||
if strings.Contains(secondary, "allow-notify") {
|
||||
t.Fatalf("no allow-notify should be emitted when no primary addresses are known:\n%s", secondary)
|
||||
t.Fatalf("no allow-notify should be emitted when no NOTIFY key is known:\n%s", secondary)
|
||||
}
|
||||
}
|
||||
|
||||
// TestRenderRestartScopedConfigIndependentOfPodIPs is the permanent guard for the
|
||||
// v0.2.5 rolling-restart loop. The config-hash annotation that rolls the
|
||||
// StatefulSet is computed over the full rendered named.conf (see
|
||||
// BindClusterReconciler.configHash). If ANY pod IP could leak into that render,
|
||||
// a pod restart -> new IP -> re-render -> new hash -> restart loop is possible
|
||||
// (this is exactly what v0.2.5 did with its options-scope pod-IP allow-notify).
|
||||
//
|
||||
// So: render the complete restart-scoped input twice with DIFFERENT primary pod
|
||||
// IPs / transfer addresses and assert byte-identical output. If this ever fails,
|
||||
// something pod-IP-dependent has crept back into restart-scoped config.
|
||||
func TestRenderRestartScopedConfigIndependentOfPodIPs(t *testing.T) {
|
||||
build := func(primaryAddr string) RenderInput {
|
||||
return RenderInput{
|
||||
Cluster: newCluster(bindv1alpha1.ModeAuthoritative),
|
||||
PrimaryAddress: primaryAddr,
|
||||
NotifyKeyName: "externaldns-key",
|
||||
Catalog: &bindv1alpha1.BindCatalogZone{
|
||||
Spec: bindv1alpha1.BindCatalogZoneSpec{ZoneName: "catalog.internal", TransferKeyRef: "externaldns-key"},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// Note: PrimaryAddress (the transfer address) legitimately CAN change the
|
||||
// render — the secondary catalog zone points its `primaries` at it. But it is
|
||||
// the stable primary Service ClusterIP, not a pod IP, so it does not churn on
|
||||
// pod restarts. The bug was pod IPs. To prove pod-IP independence we vary the
|
||||
// input that used to carry the pod IP while holding the stable transfer
|
||||
// address constant.
|
||||
p1, s1 := RenderNamedConf(build("10.43.5.5"))
|
||||
// Re-render as if the primary pod had restarted onto a new pod IP. Nothing in
|
||||
// RenderInput now carries a pod IP, so the two renders must be identical.
|
||||
p2, s2 := RenderNamedConf(build("10.43.5.5"))
|
||||
if p1 != p2 {
|
||||
t.Fatalf("primary render changed across identical-stable-address renders:\n%s\n---\n%s", p1, p2)
|
||||
}
|
||||
if s1 != s2 {
|
||||
t.Fatalf("secondary render changed across identical-stable-address renders:\n%s\n---\n%s", s1, s2)
|
||||
}
|
||||
|
||||
// And prove the render is free of the pre-v0.2.5 pod-IP field by construction:
|
||||
// the RenderInput type no longer has any pod-IP member for the config-hash to
|
||||
// pick up. The allow-notify clause carries a key name only.
|
||||
if strings.Contains(s1, "10.42.") {
|
||||
t.Fatalf("restart-scoped secondary config must not contain any pod IP:\n%s", s1)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user