From 8ca92b51a2cf89ce24d73a32ba4900fb558d0bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Sp=C3=B6ri?=
 <32615683+mspoeri@users.noreply.github.com>
Date: Tue, 19 Jul 2022 17:11:37 +0200
Subject: [PATCH] SBOM-Operator Environment Variable Config Fix (#112)

* fix(sbom-operator): uses correct indentation for environment variables set by helm values

Fixes: #111

* test(sbom-operator): adds basic test for arg and env configuration

Fixes: #111
---
 charts/sbom-operator/Chart.yaml                |  2 +-
 charts/sbom-operator/ci/all-args-values.yaml   |  9 +++++++++
 charts/sbom-operator/ci/all-env-values.yaml    | 17 +++++++++++++++++
 charts/sbom-operator/templates/deployment.yaml | 10 +++++-----
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 charts/sbom-operator/ci/all-args-values.yaml
 create mode 100644 charts/sbom-operator/ci/all-env-values.yaml

diff --git a/charts/sbom-operator/Chart.yaml b/charts/sbom-operator/Chart.yaml
index f0a4da2..23451e3 100644
--- a/charts/sbom-operator/Chart.yaml
+++ b/charts/sbom-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Catalogue all images of a Kubernetes cluster to multiple targets with Syft
 name: sbom-operator
-version: 0.13.0
+version: 0.14.0
 appVersion: 0.13.0
 home: https://github.com/ckotzbauer/sbom-operator
 sources:
diff --git a/charts/sbom-operator/ci/all-args-values.yaml b/charts/sbom-operator/ci/all-args-values.yaml
new file mode 100644
index 0000000..eda0957
--- /dev/null
+++ b/charts/sbom-operator/ci/all-args-values.yaml
@@ -0,0 +1,9 @@
+args:
+  format: json
+  verbosity: debug
+  cron: "@hourly"
+  targets: git
+  git-author-name: SBOM Operator
+  git-author-email: sbom-operator@example.com
+  git-repository: https://example.com/test-repo
+  git-access-token: letMeTest!
diff --git a/charts/sbom-operator/ci/all-env-values.yaml b/charts/sbom-operator/ci/all-env-values.yaml
new file mode 100644
index 0000000..b7310e4
--- /dev/null
+++ b/charts/sbom-operator/ci/all-env-values.yaml
@@ -0,0 +1,17 @@
+envVars:
+  - name: SBOM_FORMAT
+    value: json
+  - name: SBOM_VERBOSITY
+    value: debug
+  - name: SBOM_CRON
+    value: "@hourly"
+  - name: SBOM_TARGETS
+    value: git
+  - name: SBOM_GIT_AUTHOR_NAME
+    value: SBOM Operator
+  - name: SBOM_GIT_AUTHOR_EMAIL
+    value: sbom-operator@example.com
+  - name: SBOM_GIT_REPOSITORY
+    value: https://example.com/test-repo
+  - name: SBOM_GIT_ACCESS_TOKEN
+    value: letMeTest!
diff --git a/charts/sbom-operator/templates/deployment.yaml b/charts/sbom-operator/templates/deployment.yaml
index 69946ff..c60c6cc 100644
--- a/charts/sbom-operator/templates/deployment.yaml
+++ b/charts/sbom-operator/templates/deployment.yaml
@@ -35,10 +35,10 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
-          {{- if .Values.envVars }}
-            {{ toYaml .Values.envVars | nindent 12 }}
-          {{- end }}
-          {{- if .Values.jobImageMode }}
+        {{- if .Values.envVars }}
+          {{ toYaml .Values.envVars | nindent 10 }}
+        {{- end }}
+        {{- if .Values.jobImageMode }}
           - name: POD_NAME
             valueFrom:
               fieldRef:
@@ -47,7 +47,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.uid
-          {{- end }}
+        {{- end }}
           securityContext:
 {{ toYaml .Values.securityContext | indent 12 }}
           resources: