WIP: new version of PR to add a proxy for repo sync (#1074)

vmware-tanzu · Jul 10, 2019 · 1522f8d · 1522f8d
1 parent ac168ed
commit 1522f8d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kubeapps
-version: 2.0.0
+version: 2.0.1
 appVersion: DEVEL
 description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
 icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png

diff --git a/chart/kubeapps/templates/apprepositories.yaml b/chart/kubeapps/templates/apprepositories.yaml
@@ -25,12 +25,24 @@ metadata:
 spec:
   type: helm
   url: {{ .url }}
-  {{- if $.Values.securityContext.enabled }}
+{{- if or $.Values.securityContext.enabled $.Values.apprepository.initialReposProxy.enabled}}
   syncJobPodTemplate:
     spec:
-      securityContext:
+  {{- if $.Values.apprepository.initialReposProxy.enabled }}
+      containers:
+      - env:
+          - name: https_proxy
+            value: {{ $.Values.apprepository.initialReposProxy.https_proxy }}
+          - name: http_proxy
+            value: {{ $.Values.apprepository.initialReposProxy.http_proxy }}
+          - name: no_proxy
+            value: {{ $.Values.apprepository.initialReposProxy.no_proxy }}
+  {{- end }}
+  {{- if $.Values.securityContext.enabled }}
+        securityContext:
         runAsUser: {{ $.Values.securityContext.runAsUser }}
   {{- end }}
+{{- end }}
   {{- if or .caCert .authorizationHeader }}
   auth:
     {{- if .caCert }}

diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml
@@ -105,6 +105,11 @@ apprepository:
     registry: docker.io
     repository: bitnami/kubeapps-chart-repo
     tag: 1.8.0-r0
+  initialReposProxy:
+    enabled: false
+#    http_proxy: "http://yourproxy:3128"
+#    https_proxy: "http://yourproxy:3128"
+#    no_proxy: "0.0.0.0/0"
   initialRepos:
   - name: stable
     url: https://kubernetes-charts.storage.googleapis.com