feat(argus,csc): accept proxy details from global configuration (#79)

Author: vkumbhar94

charts/argus/Chart.yaml

@@ -11,6 +11,6 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 2.2.0-rc03
+version: 2.2.0-rc04
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v8.2.0-rc1

charts/argus/templates/_argus_config.tpl

@@ -57,4 +57,11 @@ alerting:
 {{- if .Values.debug }}
 {{- toYaml .Values.debug | nindent 0 }}
 {{- end }}
+{{- if .Values.proxy.url }}
+proxy:
+  url: {{ .Values.proxy.url }}
+{{- else if .Values.global.proxy.url }}
+proxy:
+  url: {{ .Values.global.proxy.url }}
+{{- end }}
 {{- end -}}

charts/argus/templates/collectorset.yaml

@@ -34,6 +34,9 @@ spec:
   {{- if .Values.collector.proxy.url }}
   proxy:
     url: {{ .Values.collector.proxy.url }}
+  {{- else if .Values.global.proxy.url }}
+  proxy:
+    url: {{ .Values.global.proxy.url }}
   {{- end }}
   {{- if .Values.collector.proxy.user }}
   secretName: {{ include "argus.fullname" . }}-collector

charts/argus/values.schema.json

@@ -543,7 +543,7 @@
           "examples": [
             ""
           ],
-          "$comment": "ui:proxyURL"
+          "$comment": "ui:proxyURL-ignore"
         },
         "user": {
           "$id": "#/properties/proxy/properties/user",
@@ -554,7 +554,7 @@
           "examples": [
             ""
           ],
-          "$comment": "ui:proxyUser"
+          "$comment": "ui:proxyUser-ignore"
         },
         "pass": {
           "$id": "#/properties/proxy/properties/pass",
@@ -565,7 +565,7 @@
           "examples": [
             ""
           ],
-          "$comment": "ui:proxyPass"
+          "$comment": "ui:proxyPass-ignore"
         }
       },
       "additionalProperties": false
@@ -2114,7 +2114,8 @@
               "default": "",
               "examples": [
                 ""
-              ]
+              ],
+              "$comment": "ui:proxyURL"
             },
             "user": {
               "$id": "#/properties/proxy/properties/user",
@@ -2124,7 +2125,8 @@
               "default": "",
               "examples": [
                 ""
-              ]
+              ],
+              "$comment": "ui:proxyUser"
             },
             "pass": {
               "$id": "#/properties/proxy/properties/pass",
@@ -2134,7 +2136,8 @@
               "default": "",
               "examples": [
                 ""
-              ]
+              ],
+              "$comment": "ui:proxyPass"
             }
           }
         },

charts/collectorset-controller/Chart.yaml

@@ -6,6 +6,6 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: collectorset-controller
-version: 1.1.0-rc03
+version: 1.1.0-rc04
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v4.1.0-rc1

charts/collectorset-controller/templates/configmap.yaml

@@ -18,6 +18,9 @@ data:
     {{- if .Values.proxy.url }}
     proxy:
       url: {{ .Values.proxy.url }}
+    {{ else if .Values.global.proxy.url }}
+    proxy:
+      url: {{ .Values.global.proxy.url }}
     {{- end }}
     ignoreSSL: {{ default false .Values.ignoreSSL }}
     collectorServiceAccountName: {{ include "collectorset-controller.serviceAccountName" . }}-collector