github/kured
1
0
Fork 0
mirror of https://github.com/kubereboot/kured.git synced 2026-08-19 11:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change after-reboot-node-labels flag to post-reboot-node-labels

Browse Source
This commit is contained in:
harbottle
2022-05-18 11:39:38 +02:00
committed by Christian Kotzbauer
parent b12ae4eccd
commit 48d112ba32
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -222,11 +222,11 @@ running job or a known temperamental pod on a node will stop it rebooting.
### Adding node labels before and after reboots
If you need to add node labels before and after the reboot process, you can use `--pre-reboot-node-labels` and `--after-reboot-node-labels`:
If you need to add node labels before and after the reboot process, you can use `--pre-reboot-node-labels` and `--post-reboot-node-labels`:
```console
--pre-reboot-node-labels=zalando=notready
--after-reboot-node-labels=zalando=ready
--post-reboot-node-labels=zalando=ready
```
Labels can be comma-delimited (e.g. `--pre-reboot-node-labels=zalando=notready,thisnode=disabled`) or you can supply the flags multiple times.
cmd/kured/main.go
+10 -10
View File
@@ -70,7 +70,7 @@ var (
rebootCommand string
logFormat string
preRebootNodeLabels []string
afterRebootNodeLabels []string
postRebootNodeLabels []string
nodeID string
rebootDays []string
@@ -191,7 +191,7 @@ func NewRootCommand() *cobra.Command {
rootCmd.PersistentFlags().StringSliceVar(&preRebootNodeLabels, "pre-reboot-node-labels", nil,
"labels to add to nodes before cordoning")
rootCmd.PersistentFlags().StringSliceVar(&afterRebootNodeLabels, "after-reboot-node-labels", nil,
rootCmd.PersistentFlags().StringSliceVar(&postRebootNodeLabels, "post-reboot-node-labels", nil,
"labels to add to nodes after uncordoning")
return rootCmd
@@ -217,17 +217,17 @@ func flagCheck(cmd *cobra.Command, args []string) {
notifyURL = fmt.Sprintf("slack://%s", strings.Trim(trataURL.Path, "/services/"))
}
}
var preRebootNodeLabelKeys, afterRebootNodeLabelKeys []string
var preRebootNodeLabelKeys, postRebootNodeLabelKeys []string
for _, label := range preRebootNodeLabels {
preRebootNodeLabelKeys = append(preRebootNodeLabelKeys, strings.Split(label, "=")[0])
}
for _, label := range afterRebootNodeLabels {
afterRebootNodeLabelKeys = append(afterRebootNodeLabelKeys, strings.Split(label, "=")[0])
for _, label := range postRebootNodeLabels {
postRebootNodeLabelKeys = append(postRebootNodeLabelKeys, strings.Split(label, "=")[0])
}
sort.Strings(preRebootNodeLabelKeys)
sort.Strings(afterRebootNodeLabelKeys)
if !reflect.DeepEqual(preRebootNodeLabelKeys, afterRebootNodeLabelKeys) {
log.Warnf("pre-reboot-node-labels keys and after-reboot-node-labels keys do not match. This may result in unexpected behaviour.")
sort.Strings(postRebootNodeLabelKeys)
if !reflect.DeepEqual(preRebootNodeLabelKeys, postRebootNodeLabelKeys) {
log.Warnf("pre-reboot-node-labels keys and post-reboot-node-labels keys do not match. This may result in unexpected behaviour.")
}
}
@@ -497,8 +497,8 @@ func uncordon(client *kubernetes.Clientset, node *v1.Node) error {
if err := kubectldrain.RunCordonOrUncordon(drainer, node, false); err != nil {
log.Fatalf("Error uncordonning %s: %v", nodename, err)
return err
} else if afterRebootNodeLabels != nil {
updateNodeLabels(client, node, afterRebootNodeLabels)
} else if postRebootNodeLabels != nil {
updateNodeLabels(client, node, postRebootNodeLabels)
}
return nil
}