From 8de83e9655c06d66f6d49d228da338da774045ea Mon Sep 17 00:00:00 2001 From: Daniel Malon Date: Thu, 16 Nov 2023 18:26:07 +0000 Subject: [PATCH 1/2] feat: add drainDelay configuration property Signed-off-by: Daniel Malon --- charts/kured/README.md | 1 + charts/kured/templates/daemonset.yaml | 3 +++ charts/kured/values.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/charts/kured/README.md b/charts/kured/README.md index a635db0..261e1ab 100644 --- a/charts/kured/README.md +++ b/charts/kured/README.md @@ -93,6 +93,7 @@ The following changes have been made compared to the stable chart: | `configuration.lockAnnotation` | cli-parameter `--lock-annotation` | `""` | | `configuration.period` | cli-parameter `--period` | `""` | | `configuration.forceReboot` | cli-parameter `--force-reboot` | `false` | +| `configuration.drainDelay` | cli-parameter `--drain-delay` | `0` | | `configuration.drainGracePeriod` | cli-parameter `--drain-grace-period` | `""` | | `configuration.drainTimeout` | cli-parameter `--drain-timeout` | `""` | | `configuration.drainPodSelector` | cli-parameter `--drain-pod-selector` | `""` | diff --git a/charts/kured/templates/daemonset.yaml b/charts/kured/templates/daemonset.yaml index 10adf5b..5afea9f 100644 --- a/charts/kured/templates/daemonset.yaml +++ b/charts/kured/templates/daemonset.yaml @@ -108,6 +108,9 @@ spec: {{- if .Values.configuration.drainPodSelector }} - --drain-pod-selector={{ .Values.configuration.drainPodSelector }} {{- end }} + {{- if .Values.configuration.drainDelay }} + - --drain-delay={{ .Values.configuration.drainDelay }} + {{- end }} {{- if .Values.configuration.drainTimeout }} - --drain-timeout={{ .Values.configuration.drainTimeout }} {{- end }} diff --git a/charts/kured/values.yaml b/charts/kured/values.yaml index 808bdc1..8027ee4 100644 --- a/charts/kured/values.yaml +++ b/charts/kured/values.yaml @@ -38,6 +38,7 @@ configuration: forceReboot: false # force a reboot even if the drain fails or times out (default: false) drainGracePeriod: "" # time in seconds given to each pod to terminate gracefully, if negative, the default value specified in the pod will be used (default: -1) drainPodSelector: "" # only drain pods with labels matching the selector (default: '', all pods) + drainDelay: 0 # delay drain for this duration (default: 0, disabled) drainTimeout: "" # timeout after which the drain is aborted (default: 0, infinite time) skipWaitForDeleteTimeout: "" # when time is greater than zero, skip waiting for the pods whose deletion timestamp is older than N seconds while draining a node (default: 0) prometheusUrl: "" # Prometheus instance to probe for active alerts From 07b9d8445afc5396f2be96d490b2949742a4c86f Mon Sep 17 00:00:00 2001 From: Daniel Malon Date: Mon, 20 Nov 2023 06:57:41 +0000 Subject: [PATCH 2/2] chore: bump chart version Signed-off-by: Daniel Malon --- charts/kured/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kured/Chart.yaml b/charts/kured/Chart.yaml index a915da2..746108f 100644 --- a/charts/kured/Chart.yaml +++ b/charts/kured/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.14.1" description: A Helm chart for kured name: kured -version: 5.3.1 +version: 5.3.2 home: https://github.com/kubereboot/kured maintainers: - name: chopf