Skip to content

Fix unexpected ";" using zone-sync in the Configmap while disabling IPV6 #9213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexFenlon merged 2 commits into from
Feb 19, 2026
Merged

Fix unexpected ";" using zone-sync in the Configmap while disabling IPV6 #9213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889742f
Fix zone_sync ; when IPV6 is disabled
AlexFenlon Feb 19, 2026
60be0da
fix indentation
AlexFenlon Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions internal/configs/version1/__snapshots__/template_test.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6281,9 +6281,9 @@ http {
set $resource_namespace "";
set $service "";

listen 0 default_server;listen [::]:0 default_server;
listen 0 default_server;
listen 0 ssl default_server;
listen [::]:0 ssl default_server;

ssl_certificate /etc/nginx/secrets/default;
ssl_certificate_key /etc/nginx/secrets/default;

Expand Down Expand Up @@ -6337,7 +6337,6 @@ stream {

server {
listen 1223;
listen [::]:1223;
resolver example.com valid=20s ipv6=off;
zone_sync;
zone_sync_server nginx-ingress-headless.nginx-ingress.svc.cluster.local:1223 resolve;
Expand Down
4 changes: 3 additions & 1 deletion internal/configs/version1/nginx-plus.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,9 @@ stream {
{{- if .ZoneSyncConfig.Enable }}
server {
listen {{ .ZoneSyncConfig.Port }};
{{ if not .DisableIPV6}}listen [::]:{{ .ZoneSyncConfig.Port }}{{end}};
{{- if not .DisableIPV6 }}
listen [::]:{{ .ZoneSyncConfig.Port }};
{{- end }}
{{ makeResolver .ZoneSyncConfig.ResolverAddresses .ZoneSyncConfig.ResolverValid .ZoneSyncConfig.ResolverIPV6 }}
zone_sync;
zone_sync_server {{ .ZoneSyncConfig.Domain }}:{{ .ZoneSyncConfig.Port }} resolve;
Expand Down
12 changes: 12 additions & 0 deletions internal/configs/version1/template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,12 +1251,23 @@ func TestExecuteTemplate_ForMainForNGINXWithZoneSyncEnabledCustomResolverAddress
"zone_sync_server nginx-ingress-headless.nginx-ingress.svc.cluster.local:1223 resolve;",
}

unwantedDirectives := []string{
"listen [::]:1223;",
}

mainConf := buf.String()
for _, want := range wantDirectives {
if !strings.Contains(mainConf, want) {
t.Errorf("want %q in generated config", want)
}
}

for _, unwanted := range unwantedDirectives {
if strings.Contains(mainConf, unwanted) {
t.Errorf("do not want %q in generated config", unwanted)
}
}

snaps.MatchSnapshot(t, buf.String())
}

Expand Down Expand Up @@ -2987,6 +2998,7 @@ var (
}

mainCfgWithZoneSyncEnabledCustomResolverAddressAndValidAndIPV6Off = MainConfig{
DisableIPV6: true,
ZoneSyncConfig: ZoneSyncConfig{
Enable: true,
Port: 1223,
Expand Down
Loading