File tree 3 files changed +31
-6
lines changed 3 files changed +31
-6
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,6 @@ maintainers:
11
11
12
12
name : LogicMonitor
13
13
name : argus
14
- version : 2.2.0-rc05
14
+ version : 2.2.0-rc06
15
15
home : https://logicmonitor.github.io/helm-charts-qa
16
16
appVersion : v8.2.0-rc1
Original file line number Diff line number Diff line change 11
11
trimmedCollectorAgentConf:
12
12
{ {- toYaml $propList | nindent 2 } }
13
13
{ {- end } }
14
+ { {- end } }
15
+
16
+
17
+ { { define " collector-conf" } }
18
+ { { $result := list } }
19
+
20
+ { {- $keys := dict } }
21
+ { {- range .Values.collector.collectorConf.agentConf } }
22
+ { {- $_ := set $keys .key true } }
23
+ { {- end } }
24
+
25
+ { {- if gt (len .Values.collector.collectorConf.agentConf) 0 } }
26
+ { {- $result = (concat $result .Values.collector.collectorConf.agentConf | uniq ) } }
27
+ { {- end } }
28
+
29
+ { {- if not .Values.collector.disableLightweightCollector } }
30
+ { {- $abc := include " trimmed-collector-config-agentConf" . | fromYaml } }
31
+ { {- $trimmedList := get $abc " trimmedCollectorAgentConf" } }
32
+ { {- range $trimmedList } }
33
+ { {- if not (hasKey $keys .key) } }
34
+ { {- $result = append $result . } }
35
+ { {- end } }
36
+ { {- end } }
37
+ { {- end } }
38
+
39
+ resultList:
40
+ { {- toYaml $result | nindent 2 } }
14
41
{ {- end } }
Original file line number Diff line number Diff line change @@ -14,8 +14,6 @@ metadata:
14
14
data :
15
15
collector-conf.yaml : |
16
16
agentConf:
17
- {{- if not .Values.collector.disableLightweightCollector }}
18
- {{- $abc := include "trimmed-collector-config-agentConf" . | fromYaml }}
19
- {{- get $abc "trimmedCollectorAgentConf" | toYaml | nindent 6 }}
20
- {{- end }}
21
- {{- toYaml .Values.collector.collectorConf.agentConf | nindent 6 }}
17
+ {{- $abc := include "collector-conf" . | fromYaml }}
18
+ {{- $result := get $abc "resultList" }}
19
+ {{- toYaml $result | nindent 6 }}
You can’t perform that action at this time.
0 commit comments