diff --git a/README.md b/README.md index 33277c6..a38c18d 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/cmd/kured/main.go b/cmd/kured/main.go index 634eb59..952918d 100644 --- a/cmd/kured/main.go +++ b/cmd/kured/main.go @@ -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 }