refactor: proxy configuration

uselagoon · Jun 4, 2023 · 18c31d6 · 18c31d6
1 parent 37f6ca4
commit 18c31d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/charts/lagoon-docker-host/templates/docker-host.deployment.yaml b/charts/lagoon-docker-host/templates/docker-host.deployment.yaml
@@ -37,23 +37,25 @@ spec:
         - name: {{ .name }}
           value: {{ .value | quote }}
         {{- end }}
-        {{- with .Values.httpProxy }}
+        {{- if .Values.proxy.enabled -}}
+        {{- with .Values.proxy.httpProxy }}
         - name: HTTP_PROXY
           value: {{ . | quote }}
         - name: http_proxy
           value: {{ . | quote }}
         {{- end }}
-        {{- with .Values.httpsProxy }}
+        {{- with .Values.proxy.httpsProxy }}
         - name: HTTPS_PROXY
           value: {{ . | quote }}
         - name: https_proxy
           value: {{ . | quote }}
         {{- end }}
-        {{- with .Values.noProxy }}
+        {{- with .Values.proxy.noProxy }}
         - name: NO_PROXY
           value: {{ . | quote }}
         - name: no_proxy
           value: {{ . | quote }}
+        {{- end }}        
         {{- end }}
         - name: DOCKER_HOST
           value: localhost

diff --git a/charts/lagoon-docker-host/values.yaml b/charts/lagoon-docker-host/values.yaml
@@ -12,10 +12,13 @@ pruneImagesUntil: 168h
 
 replicaCount: 1
 
+
 ## proxy configuration
-# httpProxy: ""
-# httpsProxy: ""
-# noProxy: ""
+proxy:
+  enabled: false
+  # httpProxy: ""
+  # httpsProxy: ""
+  # noProxy: ""
 
 # add extra environment variables if required
 extraEnvs: