DEV-52044 Add http proxy configuration options

logicmonitor · Jun 19, 2019 · 00c8d5b · 00c8d5b
1 parent 8169bdf
commit 00c8d5b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/argus/templates/configmap.yaml b/argus/templates/configmap.yaml
@@ -10,5 +10,4 @@ data:
     delete_devices: {{ required "A valid .Values.deleteDevices entry is required!" .Values.deleteDevices }}
     disable_alerting: {{ required "A valid .Values.disableAlerting entry is required!" .Values.disableAlerting }}
     etcd_discovery_token: {{ .Values.etcdDiscoveryToken }}
-    cluster_group_id: {{ .Values.clusterGroupID }}
-    proxy_url: {{ .Values.proxyURL }}
+    cluster_group_id: {{ .Values.clusterGroupID }}
diff --git a/argus/templates/deployment.yaml b/argus/templates/deployment.yaml
@@ -47,6 +47,11 @@ spec:
             secretKeyRef:
               name: argus
               key: etcdDiscoveryToken
+        - name: PROXY_URL
+          valueFrom:
+            secretKeyRef:
+              name: argus
+              key: proxyURL
         volumeMounts:
         - name: etc-argus
           mountPath: "/etc/argus"

diff --git a/argus/templates/secret.yaml b/argus/templates/secret.yaml
@@ -8,3 +8,4 @@ data:
   accessKey: {{ required "A valid .Values.accessKey entry is required!" .Values.accessKey | b64enc }}
   account: {{ required "A valid .Values.account entry is required!" .Values.account | b64enc }}
   etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}
+  proxyURL: {{ default "" .Values.proxyURL | b64enc  }}
diff --git a/collectorset-controller/templates/configmap.yaml b/collectorset-controller/templates/configmap.yaml
@@ -5,4 +5,4 @@ metadata:
 data:
   config.yaml: |
     debug: {{ required "A valid .Values.debug entry is required!" .Values.debug }}
-    proxy_url: {{ .Values.proxyURL }}
+    namespace: {{ .Release.Namespace }}
diff --git a/collectorset-controller/templates/deployment.yaml b/collectorset-controller/templates/deployment.yaml
@@ -45,6 +45,11 @@ spec:
             secretKeyRef:
               name: collectorset-controller
               key: etcdDiscoveryToken
+        - name: PROXY_URL
+          valueFrom:
+            secretKeyRef:
+              name: collectorset-controller
+              key: proxyURL
         volumeMounts:
         - name: etc-collectorset-controller
           mountPath: "/etc/collectorset-controller"

diff --git a/collectorset-controller/templates/secret.yaml b/collectorset-controller/templates/secret.yaml
@@ -8,3 +8,4 @@ data:
   accessKey: {{ required "A valid .Values.accessKey entry is required!" .Values.accessKey | b64enc }}
   account: {{ required "A valid .Values.account entry is required!" .Values.account | b64enc }}
   etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}
+  proxyURL: {{ default "" .Values.proxyURL | b64enc  }}