Merge pull request #238 from dholbach/rename-annotationTTL-in-chart

rename annotation-ttl to lock-ttl in all places, follow-up to #213
This commit is contained in:
Daniel Holbach
2020-11-24 09:55:21 +01:00
committed by GitHub
4 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -79,7 +79,7 @@ The following arguments can be passed to kured via the daemonset pod template:
```console
Flags:
--annotation-ttl time force clean annotation after this ammount of time (default 0, disabled)
--lock-ttl time force clean annotation after this ammount of time (default 0, disabled)
--alert-filter-regexp regexp.Regexp alert names to ignore when checking for active alerts
--blocking-pod-selector stringArray label selector identifying pods whose presence should prevent reboots
--ds-name string name of daemonset on which to place lock (default "kured")
@@ -272,7 +272,7 @@ kubectl -n kube-system annotate ds kured weave.works/kured-node-lock-
In exceptional circumstances (especially when used with cluster-autoscaler) a node
which holds lock might be killed thus annotation will stay there for ever.
Using `--annotation-ttl=30m` will allow other nodes to take over if TTL has expired (in this case 30min) and continue reboot process.
Using `--lock-ttl=30m` will allow other nodes to take over if TTL has expired (in this case 30min) and continue reboot process.
## Building
+1 -1
View File
@@ -43,7 +43,7 @@ The following changes have been made compared to the stable chart:
| `podAnnotations` | Annotations to apply to pods (eg to add Prometheus annotations) | `{}` |
| `extraArgs` | Extra arguments to pass to `/usr/bin/kured`. See below. | `{}` |
| `extraEnvVars` | Array of environment variables to pass to the daemonset. | `{}` |
| `configuration.annotationTtl` | cli-parameter `--annotation-ttl` | `0` |
| `configuration.lockTtl` | cli-parameter `--lock-ttl` | `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` | `""` |
+2 -2
View File
@@ -45,8 +45,8 @@ spec:
args:
- --ds-name={{ template "kured.fullname" . }}
- --ds-namespace={{ .Release.Namespace }}
{{- if .Values.configuration.annotationTtl }}
- --annotation-ttl={{ .Values.configuration.annotationTtl }}
{{- if .Values.configuration.lockTtl }}
- --lock-ttl={{ .Values.configuration.lockTtl }}
{{- end }}
{{- if .Values.configuration.alertFilterRegexp }}
- --alert-filter-regexp={{ .Values.configuration.alertFilterRegexp }}
+1 -1
View File
@@ -20,7 +20,7 @@ extraEnvVars:
# value: 123
configuration:
annotationTtl: 0 # force clean annotation after this ammount of time (default 0, disabled)
lockTtl: 0 # force clean annotation after this ammount of time (default 0, disabled)
alertFilterRegexp: "" # alert names to ignore when checking for active alerts
blockingPodSelector: [] # label selector identifying pods whose presence should prevent reboots
endTime: "" # only reboot before this time of day (default "23:59")