reconcile zone apex NS off the pod IP placeholder
Add BindZone.spec.nameservers and sync the apex NS RRset on every reconcile.
This commit is contained in:
@@ -29,7 +29,7 @@ func inFlightZone(t *testing.T) (dir, path string) {
|
||||
t.Helper()
|
||||
dir = t.TempDir()
|
||||
path = filepath.Join(dir, "db.example.com")
|
||||
if err := os.WriteFile(path, []byte(renderSeedZone("example.com", "10.0.0.1", 1)), 0o600); err != nil {
|
||||
if err := os.WriteFile(path, []byte(renderSeedZone("example.com", "10.0.0.1", nil, 1)), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(JournalPath(path), journalHeader(";BIND LOG V9.2\n", 10, 16), 0o600); err != nil {
|
||||
@@ -134,7 +134,7 @@ func TestSeedScriptInterruptedWriteLeavesDiskUntouched(t *testing.T) {
|
||||
if !plan.WriteSeed || !plan.QuarantineZoneFile || !plan.QuarantineJournal {
|
||||
t.Fatalf("expected a reseed over both files, got %+v", plan)
|
||||
}
|
||||
content := renderSeedZone("example.com", "10.0.0.1", plan.Serial)
|
||||
content := renderSeedZone("example.com", "10.0.0.1", nil, plan.Serial)
|
||||
|
||||
if err := runSeedScript(t, sh, path, plan, content, content[:len(content)/2]); err == nil {
|
||||
t.Fatal("a truncated seed write must fail rather than install a torn zone file")
|
||||
@@ -165,7 +165,7 @@ func TestSeedScriptInstallsOverQuarantinedFiles(t *testing.T) {
|
||||
dir, path := inFlightZone(t)
|
||||
|
||||
plan := PlanSeed(probeState(t, sh, path))
|
||||
content := renderSeedZone("example.com", "10.0.0.1", plan.Serial)
|
||||
content := renderSeedZone("example.com", "10.0.0.1", nil, plan.Serial)
|
||||
if err := runSeedScript(t, sh, path, plan, content, content); err != nil {
|
||||
t.Fatalf("seed script: %v", err)
|
||||
}
|
||||
@@ -198,7 +198,7 @@ func TestSeedScriptFreshInstall(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "zones", "db.example.com")
|
||||
|
||||
plan := PlanSeed(ZoneDiskState{})
|
||||
content := renderSeedZone("example.com", "10.0.0.1", plan.Serial)
|
||||
content := renderSeedZone("example.com", "10.0.0.1", nil, plan.Serial)
|
||||
if err := runSeedScript(t, sh, path, plan, content, content); err != nil {
|
||||
t.Fatalf("seed script: %v", err)
|
||||
}
|
||||
@@ -225,7 +225,7 @@ func TestSeedScriptFailedQuarantineAbortsInstall(t *testing.T) {
|
||||
exec `+realTool(t, "mv")+` "$@"`)
|
||||
|
||||
plan := PlanSeed(probeState(t, sh, path))
|
||||
content := renderSeedZone("example.com", "10.0.0.1", plan.Serial)
|
||||
content := renderSeedZone("example.com", "10.0.0.1", nil, plan.Serial)
|
||||
if err := runSeedScriptWithPath(t, sh, path, plan, content, content, pathEnv); err == nil {
|
||||
t.Fatal("a failed quarantine must fail the seed")
|
||||
}
|
||||
@@ -240,7 +240,7 @@ func TestSeedScriptUnmeasurableStagingAbortsInstall(t *testing.T) {
|
||||
pathEnv := shimPath(t, "wc", "exit 127")
|
||||
|
||||
plan := PlanSeed(probeState(t, sh, path))
|
||||
content := renderSeedZone("example.com", "10.0.0.1", plan.Serial)
|
||||
content := renderSeedZone("example.com", "10.0.0.1", nil, plan.Serial)
|
||||
if err := runSeedScriptWithPath(t, sh, path, plan, content, content, pathEnv); err == nil {
|
||||
t.Fatal("an unmeasurable staging file must fail the seed")
|
||||
}
|
||||
@@ -256,7 +256,7 @@ func TestSeedScriptFailedMkdirAbortsInstall(t *testing.T) {
|
||||
pathEnv := shimPath(t, "mkdir", "exit 1")
|
||||
|
||||
plan := PlanSeed(probeState(t, sh, path))
|
||||
content := renderSeedZone("example.com", "10.0.0.1", plan.Serial)
|
||||
content := renderSeedZone("example.com", "10.0.0.1", nil, plan.Serial)
|
||||
if err := runSeedScriptWithPath(t, sh, path, plan, content, content, pathEnv); err == nil {
|
||||
t.Fatal("a failed mkdir must fail the seed")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user