Merge pull request #597 from Sonika-Prakash-ML/SNP-7935

Snp 7935 merge to master
snappyflow · Oct 11, 2023 · 8a82234 · 8a82234
2 parents 9e0d8a7 + b0d8782
commit 8a82234
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/charts/sf-archival/Chart.yaml b/charts/sf-archival/Chart.yaml
@@ -23,4 +23,4 @@ dependencies:
   condition: global.secrets.minio.enable
 description: A Helm chart for Kubernetes
 name: sf-archival
-version: 2.0.101
+version: 2.0.102
diff --git a/charts/sf-archival/charts/compaction-controller/Chart.yaml b/charts/sf-archival/charts/compaction-controller/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: compaction-controller
-version: 0.1.1
+version: 0.1.2
diff --git a/charts/sf-archival/charts/compaction-controller/templates/configmap.yaml b/charts/sf-archival/charts/compaction-controller/templates/configmap.yaml
@@ -24,5 +24,6 @@ data:
       "maxRunning": {{ .Values.maxSimultaneousRun }},
       "maxAttempts": {{ .Values.maxAttempts }},
       "pendingStateTolerationHours": {{ .Values.maxPendingHours }},
-      "runningStateTolerationHours": {{ .Values.maxRunningHours }}
+      "runningStateTolerationHours": {{ .Values.maxRunningHours }},
+      "compactedStateTolerationHours": {{ .Values.maxCompactedHours }}
     }
diff --git a/charts/sf-archival/charts/compaction-controller/values.yaml b/charts/sf-archival/charts/compaction-controller/values.yaml
@@ -31,6 +31,7 @@ log-archival:
 maxAttempts: 2
 maxPendingHours: 1
 maxRunningHours: 3
+maxCompactedHours: 1
 maxSimultaneousRun: 1
 nameOverride: ''
 nodeSelector: {}

diff --git a/charts/sf-archival/values.yaml b/charts/sf-archival/values.yaml
@@ -92,6 +92,7 @@ dataset-controller:
 compaction-controller:
   maxRunningHours: 3 # Max hours a compaction job is allowed to run for
   maxPendingHours: 1 # Max hours a compaction job is allowed to stay in pending state for
+  maxCompactedHours: 1 # Max hours a compaction job is allowed to stay in compacted state for
   maxSimultaneousRun: 1 # Max number of compaction jobs that can run parallely
   maxAttempts: 2 # Max number of times a compaction job will be executed in case of failures etc.
   schedules: