[stable/insights-agent] Added nested ifs to workaround bug on some he…

…lm versions (#1382) * Added nested ifs to workaround bug on some helm versions * Fixed docs * Code cleanup
FairwindsOps · Dec 1, 2023 · 5819f98 · 5819f98
1 parent f81f164
commit 5819f98
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/stable/insights-agent/CHANGELOG.md b/stable/insights-agent/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.25.3
+* Cloud costs - added nested ifs to workaround a bug on some helm versions
+
 ## 2.25.2
 * Cloud costs - google credentials bug fix
 

diff --git a/stable/insights-agent/Chart.yaml b/stable/insights-agent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to run the Fairwinds Insights agent
 name: insights-agent
-version: 2.25.2
+version: 2.25.3
 appVersion: 9.2.1
 kubeVersion: ">= 1.22.0-0"
 icon: https://raw.githubusercontent.com/FairwindsOps/charts/master/stable/insights-agent/icon.png

diff --git a/stable/insights-agent/templates/cloud-costs/secret.yaml b/stable/insights-agent/templates/cloud-costs/secret.yaml
@@ -1,15 +1,18 @@
 {{- if and .Values.cloudcosts .Values.cloudcosts.enabled -}}
-{{ if and .Values.cloudcosts.aws .Values.cloudcosts.aws.accessKeyId }}
+{{ if .Values.cloudcosts.aws }}
+{{ if .Values.cloudcosts.aws.accessKeyId }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.cloudcosts.secretName }}
 type: Opaque
 data:
-  AWS_ACCESS_KEY_ID: {{ .Values.cloudcosts.aws.accessKeyId | b64enc}}
+  AWS_ACCESS_KEY_ID: {{ .Values.cloudcosts.aws.accessKeyId | b64enc }}
   AWS_SECRET_ACCESS_KEY: {{ .Values.cloudcosts.aws.secretAccessKey | b64enc }}
 {{ end }}
-{{ if and .Values.cloudcosts.gcp .Values.cloudcosts.gcp.applicationCredentials }}
+{{ end }}
+{{ if .Values.cloudcosts.gcp }}
+{{ if .Values.cloudcosts.gcp.applicationCredentials }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -19,4 +22,5 @@ data:
   gcp-key.json: | 
     {{ .Values.cloudcosts.gcp.applicationCredentials | b64enc}}
 {{ end }}
+{{ end }}
 {{- end -}}