From ebb6c399d754db865ac2e450bd69e347a47d664b Mon Sep 17 00:00:00 2001 From: Sonika Prakash <89075668+Sonika-Prakash-ML@users.noreply.github.com> Date: Tue, 10 Oct 2023 12:12:12 +0530 Subject: [PATCH 1/3] added toleration for compacted state --- .../charts/compaction-controller/templates/configmap.yaml | 3 ++- charts/sf-archival/charts/compaction-controller/values.yaml | 1 + charts/sf-archival/values.yaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/sf-archival/charts/compaction-controller/templates/configmap.yaml b/charts/sf-archival/charts/compaction-controller/templates/configmap.yaml index 07a9d696e..60223d7ff 100644 --- 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 index 5e9f9d849..4018fd709 100644 --- 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 index d13ade1e2..579c49e6d 100644 --- 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: From 50602f413270e2cf6d60dfb99902f362964e44c7 Mon Sep 17 00:00:00 2001 From: Sonika Prakash <89075668+Sonika-Prakash-ML@users.noreply.github.com> Date: Wed, 11 Oct 2023 10:18:26 +0530 Subject: [PATCH 2/3] Update Chart.yaml --- charts/sf-archival/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sf-archival/Chart.yaml b/charts/sf-archival/Chart.yaml index 9be24fe13..2d924b163 100644 --- 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 From b0d87822b8260ed77c08966724f95e266ee4ea0a Mon Sep 17 00:00:00 2001 From: Sonika Prakash <89075668+Sonika-Prakash-ML@users.noreply.github.com> Date: Wed, 11 Oct 2023 10:20:24 +0530 Subject: [PATCH 3/3] Update Chart.yaml --- charts/sf-archival/charts/compaction-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sf-archival/charts/compaction-controller/Chart.yaml b/charts/sf-archival/charts/compaction-controller/Chart.yaml index f193f3c28..f58939040 100644 --- 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