feat(argus): changes done for releasing argus v8.0.0 (#121)

* feat(argus): changes done for releasing argus v8.0.0 changes done for releasing argus v8.0.0 * fix(argus): fixed appVersion fixed appVersion --------- Co-authored-by: Gurusiddha Kore <[email protected]>
logicmonitor · Nov 21, 2023 · ff9e7b7 · ff9e7b7
1 parent fcacc6e
commit ff9e7b7
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 3 deletions.
diff --git a/charts/argus/Chart.yaml b/charts/argus/Chart.yaml
@@ -6,9 +6,9 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 7.0.0
+version: 8.0.0
 home: https://logicmonitor.github.io/helm-charts
-appVersion: v11.4.0
+appVersion: v12.0.0
 dependencies:
   - name: lmutil
     repository: https://logicmonitor.github.io/helm-charts

diff --git a/charts/argus/templates/_argus_config.tpl b/charts/argus/templates/_argus_config.tpl
@@ -14,6 +14,8 @@ log:
 etcdDiscoveryToken: {{ .Values.etcdDiscoveryToken | quote }}
 clusterTreeParentID: {{ .Values.clusterTreeParentID }}
 resourceContainerID: {{ .Values.resourceContainerID }}
+overview:
+ {{- toYaml .Values.overview | nindent 2 }}
 enableLegacyResourceTree: {{ .Values.enableLegacyResourceTree }}
 globalDeleteAfterDuration: {{ .Values.lm.resource.globalDeleteAfterDuration | default "P0DT0H0M0S" }}
 {{- if .Values.telemetryCronString }}

diff --git a/charts/argus/templates/_collector.tpl b/charts/argus/templates/_collector.tpl
@@ -99,3 +99,30 @@ capabilities:
 {{- end }}
 {{- end }}
 {{- end }}
+
+{{/* This template is used for validating COLLECTOR_NON_ROOT env variable, please do not print anything here */}}
+{{- define "non-root-prop-check"}}
+{{$isKeyInvalid := false}}
+{{$isValueInvalid := false}}
+{{- $trueCheckList := list "true" "1" "True" "yes" "Yes"}}
+{{- $falseCheckList := list "false" "0" "False" "no" "No"}}
+{{- if not (empty .Values.collector.env)}}
+{{- range $key, $value := .Values.collector.env }}
+    {{- if eq (upper $key) "COLLECTOR_NON_ROOT"}}
+        {{- if eq $key "COLLECTOR_NON_ROOT"}}
+            {{- if and (not (empty $value)) (not (or (has $value $falseCheckList) (has $value $trueCheckList))) }}
+            {{- $isValueInvalid = true}}
+            {{- end}}
+        {{- else }}
+            {{- $isKeyInvalid = true}}
+        {{- end }}
+    {{- end}}
+{{- end}}
+{{- if $isKeyInvalid }}
+{{- fail (printf "COLLECTOR_NON_ROOT param is case sensitive, please check your configurations.") }}
+{{- end}}
+{{- if $isValueInvalid }}
+{{- fail (printf "Please provide a valid boolean value for COLLECTOR_NON_ROOT param")}}
+{{- end}}
+{{- end}}
+{{- end}}
diff --git a/charts/argus/templates/collectorset.yaml b/charts/argus/templates/collectorset.yaml
@@ -56,6 +56,7 @@ spec:
   {{- end }}
   {{- if .Values.collector.env }}
   env:
+    {{- include "non-root-prop-check" . | nindent 4 }}
     {{- toYaml .Values.collector.env | nindent 4 }}
   {{- end }}
 

diff --git a/charts/argus/values.schema.json b/charts/argus/values.schema.json
@@ -1314,6 +1314,47 @@
       },
       "uniqueItems": true
     },
+    "overview": {
+      "$id": "#/properties/overview",
+      "$comment": "tf:optional",
+      "type": "object",
+      "title": "The Overview schema",
+      "description": "Configurations for Overview Dashboard.",
+      "default": {},
+      "examples": [
+        {
+          "enable": false,
+          "duration": "* * * * *"
+        }
+      ],
+      "required": [
+      ],
+      "properties": {
+        "enable": {
+          "$comment": "tf:optional",
+          "$id": "#/properties/overview/properties/enable",
+          "type": "boolean",
+          "title": "The enable schema",
+          "description": "Once the property is enabled, argus pod annotation will be updated after every duration interval. ",
+          "default": false,
+          "examples": [
+            false,
+            true
+          ]
+        },
+        "duration": {
+          "$comment": "tf:optional",
+          "$id": "#/properties/overview/properties/duration",
+          "type": "string",
+          "title": "The duration schema",
+          "description": "Duration of argus pod annotation update in cron.",
+          "examples": [
+            "* * * * *"
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
     "selfMonitor": {
       "$id": "#/properties/selfMonitor",
       "$comment": "tf:optional",

diff --git a/charts/argus/values.yaml b/charts/argus/values.yaml
@@ -138,7 +138,7 @@ collector:
   # The number of collectors to create and use with Argus.
   replicas: 1
   version: 0
-  size: "small"
+  size: "medium"
   useEA: false
   # The collector size to install. Can be nano, small, medium, or large.
   lm:
@@ -203,6 +203,10 @@ securityContext:
     add: []
     drop: []
 
+overview:
+  enable: false
+  duration: "* * * * *"
+
 global:
   accessID: ""
   accessKey: ""