From 48dc84b3e6d82e1c7bb77e799de7a6d8565a2905 Mon Sep 17 00:00:00 2001 From: Steffen Pingel Date: Tue, 13 Apr 2021 10:33:01 +0200 Subject: [PATCH 1/3] Add lockReleaseDelay parameter to helm chart --- charts/kured/Chart.yaml | 2 +- charts/kured/README.md | 1 + charts/kured/templates/daemonset.yaml | 3 +++ charts/kured/values.minikube.yaml | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/kured/Chart.yaml b/charts/kured/Chart.yaml index 920040d..f076a19 100644 --- a/charts/kured/Chart.yaml +++ b/charts/kured/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.7.0" description: A Helm chart for kured name: kured -version: 2.5.0 +version: 2.6.0 home: https://github.com/weaveworks/kured maintainers: - name: ckotzbauer diff --git a/charts/kured/README.md b/charts/kured/README.md index 1d94c39..9d81ffc 100644 --- a/charts/kured/README.md +++ b/charts/kured/README.md @@ -45,6 +45,7 @@ The following changes have been made compared to the stable chart: | `extraArgs` | Extra arguments to pass to `/usr/bin/kured`. See below. | `{}` | | `extraEnvVars` | Array of environment variables to pass to the daemonset. | `{}` | | `configuration.lockTtl` | cli-parameter `--lock-ttl` | `0` | +| `configuration.lockReleaseDelay` | cli-parameter `--lock-release-delay` | `0` | | `configuration.alertFilterRegexp` | cli-parameter `--alert-filter-regexp` | `""` | | `configuration.blockingPodSelector` | Array of selectors for multiple cli-parameters `--blocking-pod-selector` | `[]` | | `configuration.endTime` | cli-parameter `--end-time` | `""` | diff --git a/charts/kured/templates/daemonset.yaml b/charts/kured/templates/daemonset.yaml index 1444f62..ecf3ae4 100644 --- a/charts/kured/templates/daemonset.yaml +++ b/charts/kured/templates/daemonset.yaml @@ -55,6 +55,9 @@ spec: {{- if .Values.configuration.lockTtl }} - --lock-ttl={{ .Values.configuration.lockTtl }} {{- end }} + {{- if .Values.configuration.lockReleaseDelay }} + - --lock-release-delay={{ .Values.configuration.lockReleaseDelay }} + {{- end }} {{- if .Values.configuration.alertFilterRegexp }} - --alert-filter-regexp={{ .Values.configuration.alertFilterRegexp }} {{- end }} diff --git a/charts/kured/values.minikube.yaml b/charts/kured/values.minikube.yaml index 50dd11d..f2852e2 100644 --- a/charts/kured/values.minikube.yaml +++ b/charts/kured/values.minikube.yaml @@ -21,3 +21,4 @@ configuration: # startTime: "" # only reboot after this time of day (default "0:00") # timeZone: "" # time-zone to use (valid zones from "time" golang package) # annotateNodes: false # enable 'weave.works/kured-reboot-in-progress' and 'weave.works/kured-most-recent-reboot-needed' node annotations to signify kured reboot operations + # lockReleaseDelay: "5m" # throttle node reboots From e3f4a88a0774cc9fd3fbd3bcb4d5c16e47c3978a Mon Sep 17 00:00:00 2001 From: Steffen Pingel Date: Thu, 20 May 2021 13:26:53 +0200 Subject: [PATCH 2/3] Add documentation for lockReleaseDelay parameter --- README.md | 1 + charts/kured/values.minikube.yaml | 4 ++-- charts/kured/values.yaml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ad85b15..5bac339 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,7 @@ Flags: -h, --help help for kured --lock-annotation string annotation in which to record locking node (default "weave.works/kured-node-lock") --lock-ttl duration expire lock annotation after this duration (default: 0, disabled) + --lock-release-delay duration hold lock after reboot by this duration (default: 0, disabled) --message-template-drain string message template used to notify about a node being drained (default "Draining node %s") --message-template-reboot string message template used to notify about a node being rebooted (default "Rebooting node %s") --notify-url url for reboot notifications (cannot use with --slack-hook-url flags) diff --git a/charts/kured/values.minikube.yaml b/charts/kured/values.minikube.yaml index f2852e2..2c7fcac 100644 --- a/charts/kured/values.minikube.yaml +++ b/charts/kured/values.minikube.yaml @@ -20,5 +20,5 @@ configuration: # messageTemplateReboot: "" # slack message template when notifying about a node being rebooted (default "Rebooted node %s") # startTime: "" # only reboot after this time of day (default "0:00") # timeZone: "" # time-zone to use (valid zones from "time" golang package) - # annotateNodes: false # enable 'weave.works/kured-reboot-in-progress' and 'weave.works/kured-most-recent-reboot-needed' node annotations to signify kured reboot operations - # lockReleaseDelay: "5m" # throttle node reboots + # annotateNodes: false # enable 'weave.works/kured-reboot-in-progress' and 'weave.works/kured-most-recent-reboot-needed' node annotations to signify kured reboot operations + # lockReleaseDelay: "5m" # hold lock after reboot by this amount of time (default 0, disabled) diff --git a/charts/kured/values.yaml b/charts/kured/values.yaml index 1c61e20..492b3b4 100644 --- a/charts/kured/values.yaml +++ b/charts/kured/values.yaml @@ -39,7 +39,8 @@ configuration: messageTemplateReboot: "" # slack message template when notifying about a node being rebooted (default "Rebooted node %s") startTime: "" # only reboot after this time of day (default "0:00") timeZone: "" # time-zone to use (valid zones from "time" golang package) - annotateNodes: false # enable 'weave.works/kured-reboot-in-progress' and 'weave.works/kured-most-recent-reboot-needed' node annotations to signify kured reboot operations + annotateNodes: false # enable 'weave.works/kured-reboot-in-progress' and 'weave.works/kured-most-recent-reboot-needed' node annotations to signify kured reboot operations + lockReleaseDelay: 0 # hold lock after reboot by this amount of time (default 0, disabled) rbac: create: true From 42f69c7b1eddaeeaa06e17f5298c458cffce8778 Mon Sep 17 00:00:00 2001 From: Steffen Pingel Date: Thu, 20 May 2021 13:28:12 +0200 Subject: [PATCH 3/3] sort parameters alphabetically --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5bac339..cedf007 100644 --- a/README.md +++ b/README.md @@ -95,8 +95,8 @@ Flags: --drain-timeout duration timeout after which the drain is aborted (default: 0, infinite time) -h, --help help for kured --lock-annotation string annotation in which to record locking node (default "weave.works/kured-node-lock") - --lock-ttl duration expire lock annotation after this duration (default: 0, disabled) --lock-release-delay duration hold lock after reboot by this duration (default: 0, disabled) + --lock-ttl duration expire lock annotation after this duration (default: 0, disabled) --message-template-drain string message template used to notify about a node being drained (default "Draining node %s") --message-template-reboot string message template used to notify about a node being rebooted (default "Rebooting node %s") --notify-url url for reboot notifications (cannot use with --slack-hook-url flags)