Skip to content

fix(apisix): quote IP values in configmap so IPv6 addresses do not break YAML #963

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

Open
SAY-5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(apisix): quote IP values in configmap so IPv6 addresses do not break YAML #963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions charts/apisix/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data:
enable_control: {{ .Values.control.enabled }}
{{- if .Values.control.enabled }}
control:
ip: {{ default "127.0.0.1" .Values.control.service.ip }}
ip: {{ default "127.0.0.1" .Values.control.service.ip | quote }}
port: {{ default 9090 .Values.control.service.port }}
{{- end }}

Expand Down Expand Up @@ -172,7 +172,7 @@ data:
{{- $useTraditionalYaml := and (eq .Values.apisix.deployment.role "traditional") (eq .Values.apisix.deployment.role_traditional.config_provider "yaml") }}
{{- if $useTraditionalYaml }}
status:
ip: {{ default "127.0.0.1" .Values.apisix.status.ip }}
ip: {{ default "127.0.0.1" .Values.apisix.status.ip | quote }}
port: {{ default "7085" (.Values.apisix.status.port | toString) }}
{{- end}}

Expand Down Expand Up @@ -338,7 +338,7 @@ data:
allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
{{- if .Values.apisix.admin.allow.ipList }}
{{- range $ips := .Values.apisix.admin.allow.ipList }}
- {{ $ips }}
- {{ $ips | quote }}
{{- end }}
{{- else }}
- 0.0.0.0/0
Expand All @@ -349,7 +349,7 @@ data:
# - "::/64"
{{- if .Values.apisix.admin.enabled }}
admin_listen:
ip: {{ .Values.apisix.admin.ip }}
ip: {{ .Values.apisix.admin.ip | quote }}
port: {{ .Values.apisix.admin.port }}
{{- end }}
# Default token when use API to call for Admin API.
Expand Down
Loading