Add http/s proxy settings for pachd (#7215) (#7222)

* add http/s proxy settings for console, pachd, enterprise-server
pachyderm · Jan 5, 2022 · 4b702d8 · 4b702d8
1 parent 224506f
commit 4b702d8
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 0 deletions.
diff --git a/etc/helm/pachyderm/templates/console/deployment.yaml b/etc/helm/pachyderm/templates/console/deployment.yaml
@@ -67,6 +67,22 @@ spec:
         - name: NODE_EXTRA_CA_CERTS
           value:  /pach-tls/certs/root.crt
         {{- end }}
+        {{ if .Values.global.proxy }}
+        - name: http_proxy
+          value: {{ .Values.global.proxy }}
+        - name: https_proxy
+          value:  {{.Values.global.proxy}}
+        - name: HTTP_PROXY
+          value:  {{.Values.global.proxy}}
+        - name: HTTPS_PROXY
+          value:  {{.Values.global.proxy}}
+        {{ end }}
+        {{ if .Values.global.noProxy }}
+        - name: no_proxy
+          value:  {{.Values.global.noProxy}}
+        - name: NO_PROXY
+          value:  {{.Values.global.noProxy}}
+        {{ end }}
         {{- if .Values.console.resources }}
         resources: {{ toYaml .Values.console.resources | nindent 10 }}
         {{- end }}

diff --git a/etc/helm/pachyderm/templates/enterprise-server/deployment.yaml b/etc/helm/pachyderm/templates/enterprise-server/deployment.yaml
@@ -62,6 +62,22 @@ spec:
         - name: SSL_CERT_DIR
           value:  /pachd-tls-cert
         {{- end }}
+        {{ if .Values.global.proxy }}
+        - name: http_proxy
+          value: {{ .Values.global.proxy }}
+        - name: https_proxy
+          value:  {{.Values.global.proxy}}
+        - name: HTTP_PROXY
+          value:  {{.Values.global.proxy}}
+        - name: HTTPS_PROXY
+          value:  {{.Values.global.proxy}}
+        {{ end }}
+        {{ if .Values.global.noProxy }}
+        - name: no_proxy
+          value:  {{.Values.global.noProxy}}
+        - name: NO_PROXY
+          value:  {{.Values.global.noProxy}}
+        {{ end }}
         envFrom:
           - secretRef:
               name: pachyderm-deployment-id-secret

diff --git a/etc/helm/pachyderm/templates/pachd/deployment.yaml b/etc/helm/pachyderm/templates/pachd/deployment.yaml
@@ -144,6 +144,22 @@ spec:
         - name: SSL_CERT_DIR
           value:  /pachd-tls-cert
         {{- end }}
+        {{ if .Values.global.proxy }}
+        - name: http_proxy
+          value: {{ .Values.global.proxy }}
+        - name: https_proxy
+          value:  {{.Values.global.proxy}}
+        - name: HTTP_PROXY
+          value:  {{.Values.global.proxy}}
+        - name: HTTPS_PROXY
+          value:  {{.Values.global.proxy}}
+        {{ end }}
+        {{ if .Values.global.noProxy }}
+        - name: no_proxy
+          value:  {{.Values.global.noProxy}}
+        - name: NO_PROXY
+          value:  {{.Values.global.noProxy}}
+        {{ end }}
         envFrom:
           - secretRef:
               name: pachyderm-storage-secret

diff --git a/etc/helm/pachyderm/values.schema.json b/etc/helm/pachyderm/values.schema.json
@@ -59,6 +59,9 @@
                 "config": {
                     "type": "object",
                     "properties": {
+                        "disableTelemetry": {
+                            "type": "boolean"
+                        },
                         "graphqlPort": {
                             "type": "integer"
                         },
@@ -262,6 +265,9 @@
                 "imagePullSecrets": {
                     "type": "array"
                 },
+                "noProxy": {
+                    "type": "string"
+                },
                 "postgresql": {
                     "type": "object",
                     "properties": {
@@ -290,6 +296,9 @@
                             "type": "string"
                         }
                     }
+                },
+                "proxy": {
+                    "type": "string"
                 }
             }
         },

diff --git a/etc/helm/pachyderm/values.yaml b/etc/helm/pachyderm/values.yaml
@@ -35,6 +35,10 @@ global:
   imagePullSecrets: []
   # when set, the certificate file in pachd-tls-cert will be loaded as the root certificate for pachd, console, and enterprise-server pods
   customCaCerts: false
+  # Sets the HTTP/S proxy server address for console, pachd, and enteprise server
+  proxy: ""
+  # If proxy is set, this allows you to set a comma-separated list of destinations that bypass the proxy
+  noProxy: ""
 
 console:
   # enabled controls whether the console manifests are created or not.