From 3f86d40f7b17759ac4270514f75daa86ed6497cf Mon Sep 17 00:00:00 2001
From: HafdisE <hafdis.helgadottir@netapp.com>
Date: Tue, 17 Sep 2024 15:22:09 +0000
Subject: [PATCH] unflatten and naming

---
 charts/bigdata-spark-watcher/templates/deployment.yaml | 4 ++--
 charts/bigdata-spark-watcher/values.yaml               | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/bigdata-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml
index eb6c060..288f813 100644
--- a/charts/bigdata-spark-watcher/templates/deployment.yaml
+++ b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -72,9 +72,9 @@ spec:
             - name: APP_SYNC_REVERSE_GHOST_GRACE_PERIOD
               value: {{ .Values.appSyncReverseGhostGracePeriod }}
             - name: KUBE_EVENT_LOG_COLLECTION_BUCKET_PREFIX
-              value: {{ .Values.k8sEventLogCollectorBucketPrefix }}
+              value: {{ .Values.k8sEventLogCollector.bucketPrefix }}
             - name: KUBE_EVENT_LOG_COLLECTION_ENVIRONMENT
-              value: {{ .Values.k8sEventLogCollectorEnvironment }}
+              value: {{ .Values.k8sEventLogCollector.environment }}
             - name: AWS_CREDENTIALS_FILE
               value: /creds/aws
             - name: GCP_CREDENTIALS_FILE
diff --git a/charts/bigdata-spark-watcher/values.yaml b/charts/bigdata-spark-watcher/values.yaml
index 3e2df10..b57d346 100644
--- a/charts/bigdata-spark-watcher/values.yaml
+++ b/charts/bigdata-spark-watcher/values.yaml
@@ -38,8 +38,9 @@ sparkAppFailedExecutorLimit: 200
 sparkAppTerminatedCriticalSidecarGracePeriod: 3m
 
 k8sEventLogCollectorEnabled: true
-k8sEventLogCollectorBucketPrefix: "spot-bigdata-logcollector"
-k8sEventLogCollectorEnvironment: ""
+k8sEventLogCollector:
+  bucketPrefix: "spot-bigdata-logcollector"
+  environment: ""
 
 serviceAccount:
   create: true