@@ -13,27 +13,17 @@ metadata:
1313    meta.helm.sh/release-namespace : " {{ .Release.Namespace }}" 
1414data :
1515  {{- with .Values.httpProxyConfiguration.httpProxy }} 
16-   httpProxy : {{ . | b64enc | quote }} 
17-   http-proxy : {{ . | b64enc | quote }} 
16+   httpProxy : {{ . | default "" |  b64enc | quote }} 
17+   http-proxy : {{ . | default "" |  b64enc | quote }} 
1818  {{- end }} 
1919  {{- with .Values.httpProxyConfiguration.httpsProxy }} 
20-   httpsProxy : {{ . | b64enc | quote }} 
21-   https-proxy : {{ . | b64enc | quote }} 
22-   {{- end }} 
23-   {{- if .Values.httpProxyConfiguration.noProxy }} 
24-   no-proxy-address : {{ $noProxySpaceSeparatedList | b64enc | quote }} 
25-   no-proxy-address-cs : {{ $noProxyCommaSeparatedList | b64enc | quote }} 
26-   noProxyAddress : {{ $noProxyCommaSeparatedList | b64enc | quote }} 
27-   noProxyAddressSpaceSepareted : {{ $noProxySpaceSeparatedList | b64enc | quote }} 
28-   {{- end }} 
29-   {{- if .Values.httpProxyConfiguration.caCertificate }} 
30-   caCertificate : {{ .Values.httpProxyConfiguration.caCertificate | b64enc | quote }} 
31-   {{- else }} 
32-   caCertificate : " " 
33-   {{- end }} 
34-   {{- if .Values.httpProxyConfiguration.clientCertificate }} 
35-   clientCertificate : {{ .Values.httpProxyConfiguration.clientCertificate | b64enc | quote }} 
36-   {{- else }} 
37-   clientCertificate : " " 
20+   httpsProxy : {{ . | default "" | b64enc | quote }} 
21+   https-proxy : {{ . | default "" | b64enc | quote }} 
3822  {{- end }} 
23+   no-proxy-address : {{ $noProxySpaceSeparatedList | default "" | b64enc | quote }} 
24+   no-proxy-address-cs : {{ $noProxyCommaSeparatedList | default "" | b64enc | quote }} 
25+   noProxyAddress : {{ $noProxyCommaSeparatedList | default "" | b64enc | quote }} 
26+   noProxyAddressSpaceSepareted : {{ $noProxySpaceSeparatedList | default "" | b64enc | quote }} 
27+   caCertificate : {{ .Values.httpProxyConfiguration.caCertificate | default "" | b64enc | quote }} 
28+   clientCertificate : {{ .Values.httpProxyConfiguration.clientCertificate | default "" | b64enc | quote }} 
3929{{- end }} 
0 commit comments