Merge pull request #8320 from r4f4/agent-proxy-escape

OCPBUGS-33024: agent: escape '%' in proxy settings
openshift · Apr 29, 2024 · 55f8072 · 55f8072
2 parents 1a3d6c2 + c2bd15f
commit 55f8072
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/data/data/agent/files/etc/systemd/system.conf.d/10-default-env.conf.template b/data/data/agent/files/etc/systemd/system.conf.d/10-default-env.conf.template
@@ -1,12 +1,12 @@
 {{if .Proxy -}}
 [Manager]
 {{if .Proxy.HTTPProxy -}}
-DefaultEnvironment=HTTP_PROXY="{{.Proxy.HTTPProxy}}"
+DefaultEnvironment=HTTP_PROXY="{{replace .Proxy.HTTPProxy "%" "%%"}}"
 {{end -}}
 {{if .Proxy.HTTPSProxy -}}
-DefaultEnvironment=HTTPS_PROXY="{{.Proxy.HTTPSProxy}}"
+DefaultEnvironment=HTTPS_PROXY="{{replace .Proxy.HTTPSProxy "%" "%%"}}"
 {{end -}}
 {{if .Proxy.NoProxy -}}
 DefaultEnvironment=NO_PROXY="{{.Proxy.NoProxy}}"
 {{end -}}
-{{end -}}
+{{end -}}