feat(argus): handle generic domain for govcloud (#425)

* feat(argus): handle generic domain for govcloud

* feat(argus): added companyDomain examples

* feat(argus): added check for empty companyDomain

Author: sagar-mamdapure

charts/argus/Chart.yaml

@@ -6,9 +6,9 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 10.3.0-rt01
+version: 11.0.0-rc01
 home: https://logicmonitor.github.io/helm-charts-qa
-appVersion: v14.3.0-rt01
+appVersion: v15.0.0-rc01
 dependencies:
   - name: lmutil
     repository: https://logicmonitor.github.io/helm-charts-qa

charts/argus/templates/_helpers.tpl

@@ -159,6 +159,15 @@ Argus proxy details or not, for this we're using Lookup function in helm.
     secretKeyRef:
       name: {{ include "lmutil.secret-name" . }}
       key: account
+- name: COMPANY_DOMAIN
+{{- if and .Values.global.userDefinedSecret (or (not (hasKey $secretData "companyDomain")) (eq (get $secretData "companyDomain") "")) }}
+  value: "logicmonitor.com"
+{{- else }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "lmutil.secret-name" . }}
+      key: companyDomain
+{{- end}}
 {{- if $secretData.etcdDiscoveryToken }}
 - name: ETCD_DISCOVERY_TOKEN
   valueFrom:

charts/argus/templates/secret.yaml

@@ -15,6 +15,7 @@ data:
   accessID: {{ if .Values.accessID }} {{ .Values.accessID | b64enc }} {{ else }} {{ required "A valid .Values.accessID or .Values.global.accessID entry is required!" .Values.global.accessID | b64enc }} {{ end }}
   accessKey: {{ if .Values.accessKey }} {{ .Values.accessKey | b64enc }} {{ else }} {{ required "A valid .Values.accessKey or .Values.global.accessKey entry is required!" .Values.global.accessKey | b64enc }} {{ end }}
   account: {{ if .Values.account }} {{ .Values.account | b64enc }} {{ else }} {{ required "A valid .Values.account or .Values.global.account entry is required!" .Values.global.account | b64enc }} {{ end }}
+  companyDomain: {{ if not (empty .Values.global.companyDomain) }}{{ .Values.global.companyDomain | b64enc }}{{ else }}{{ "logicmonitor.com" | b64enc }}{{ end }}
   etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}
   {{- if .Values.proxy.user }}
   proxyUser: {{ default "" .Values.proxy.user | b64enc }}

charts/argus/values.schema.json

@@ -10,6 +10,7 @@
       "accessID": "",
       "accessKey": "",
       "account": "",
+      "companyDomain": "",
       "clusterName": "",
       "clusterTreeParentID": 1,
       "enableLegacyResourceTree": false,
@@ -131,6 +132,7 @@
         "accessID": "",
         "accessKey": "",
         "account": "",
+        "companyDomain": "",
         "proxy": {
           "url": "",
           "user": "",
@@ -189,6 +191,18 @@
       ],
       "$comment": "ui:accessKey-ignore tf:optional"
     },
+    "companyDomain": {
+      "$comment": "tf:optional",
+      "$id": "#/properties/companyDomain",
+      "type": "string",
+      "title": "The domain schema",
+      "description": "The Logicmonitor account domain",
+      "examples": [
+        "logicmonitor.com",
+        "qa-lmgov.us",
+        "lmgov.us"
+      ]
+    },
     "account": {
       "$id": "#/properties/account",
       "type": "string",
@@ -2304,6 +2318,13 @@
           ],
           "$comment": "ui:account tf:optional"
         },
+        "companyDomain" : {
+          "$comment" : "tf:optional",
+          "$id" : "#/properties/global/properties/companyDomain",
+          "type" : "string",
+          "default": "",
+          "description" : "The Logicmonitor account domain"
+        },
         "imagePullSecrets": {
           "description": "ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for them to use. For example, in the case of docker, only DockerConfig type secrets are honored. More info: https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod",
           "examples": [

charts/argus/values.yaml

@@ -211,6 +211,7 @@ global:
   accessID: ""
   accessKey: ""
   account: ""
+  companyDomain: ""
   proxy:
     url: ""
     user: ""