flatten, fix typos, etc.

spotinst · Sep 17, 2024 · 122d5b2 · 122d5b2
1 parent f620125
commit 122d5b2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml
@@ -3,7 +3,7 @@ name: bigdata-spark-watcher
 description: A Helm chart for the Spot Big Data Spark Watcher
 type: application
 version: 0.5.22
-appVersion: 0.5.3
+appVersion: 0.5.4
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
 sources:

diff --git a/charts/bigdata-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -63,17 +63,18 @@ spec:
           env:
             - name: SPOTINST_BASE_URL
               value: {{ .Values.spotBaseUrl }}
-            {{- if .Values.k8sEventLogCollectorEnabled }}
             - name: APP_SYNC_PERIOD
-              value: {{ .Values.k8SEventLogCollection.appSyncPeriod }}
+              value: {{ .Values.appSyncPeriod }}
             - name: APP_SYNC_KILL_GRACE_PERIOD
-              value: {{ .Values.k8SEventLogCollection.appSyncKillGracePeriod }}
+              value: {{ .Values.appSyncKillGracePeriod }}
             - name: APP_SYNC_GHOST_GRACE_PERIOD
-              value: {{ .Values.k8SEventLogCollection.appSyncKillGhostGracePeriod }}
+              value: {{ .Values.appSyncKillGhostGracePeriod }}
             - name: APP_SYNC_REVERSE_GHOST_GRACE_PERIOD
-              value: {{ .Values.k8SEventLogCollection.appSyncReverseGhostGracePeriod }}
+              value: {{ .Values.appSyncReverseGhostGracePeriod }}
             - name: KUBE_EVENT_LOG_COLLECTION_BUCKET_PREFIX
-              value: {{ .Values.k8SEventLogCollection.bucketPrefix }}
+              value: {{ .Values.k8sEventLogCollectorBucketPrefix }}
+            - name: KUBE_EVENT_LOG_COLLECTION_ENVIRONMENT
+              value: {{ .Values.k8sEventLogCollectorEnvironment }}
             - name: AWS_CREDENTIALS_FILE
               value: /creds/aws
             - name: GCP_CREDENTIALS_FILE
@@ -83,10 +84,9 @@ spec:
             - name: CREDS_REFRESH_INTERVAL
               value: 2m
             - name: SPARK_APP_FAILED_EXECUTOR_LIMIT
-              value: {{ .Values.k8SEventLogCollection.sparkAppFailedExecutorLimit }}
+              value: {{ .Values.sparkAppFailedExecutorLimit | quote }}
             - name: SPARK_APP_TERMINATED_CRITICAL_SIDECAR_GRACE_PERIOD
-              value: {{ .Values.k8SEventLogCollection.sparkAppTerminatedCriticalSidecarGracePeriod }}
-            {{- end }}
+              value: {{ .Values.sparkAppTerminatedCriticalSidecarGracePeriod }}
             - name: HTTP_PROXY
               valueFrom:
                 configMapKeyRef:

diff --git a/charts/bigdata-spark-watcher/values.yaml b/charts/bigdata-spark-watcher/values.yaml
@@ -29,7 +29,17 @@ logLevel: debug
 
 killSyncerEnabled: true
 ghostSyncerEnabled: true
+
+appSyncKillGracePeriod: 5m
+appSyncKillGhostGracePeriod: 5m
+appSyncReverseGhostGracePeriod: 30s
+appSyncPeriod: 5m
+sparkAppFailedExecutorLimit: 200
+sparkAppTerminatedCriticalSidecarGracePeriod: 3m
+
 k8sEventLogCollectorEnabled: true
+k8sEventLogCollectorBucketPrefix: "spot-bigdata-logcollector"
+k8sEventLogCollectorEnvironment: ""
 
 serviceAccount:
   create: true
@@ -68,17 +78,6 @@ telemetry:
       repository: public.ecr.aws/ocean-spark/fluent-bit
       tag: 3.0.5
 
-k8SEventLogCollection:
-  # enabled: true
-  appSyncPeriod: 5m
-  appSyncKillGracePeriod: 5m
-  appSyncKillGhostGracePeriod: 5m
-  appSyncReverseGhostGracePeriod: 30s
-  bucketPrefix: "spot-bigdata-logcollector"
-  sparkAppFailedExecutorLimit: '200'
-  sparkAppTerminatedCriticalSidecarGracePeriod: 3m
-
-
 nodeSelector: {}
 
 tolerations: