github/kured
1
0
Fork 0
mirror of https://github.com/kubereboot/kured.git synced 2026-05-04 07:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move command line validations in pre function

Browse Source 
Without this, validations are all over the place.
This moves some validations directly into the function, to
make the code simpler to read.

Signed-off-by: Jean-Philippe Evrard <open-source@a.spamming.party>
This commit is contained in:
Jean-Philippe Evrard
2024-09-30 20:51:12 +02:00
parent eeedf203c3
commit 00d8a524ab
2 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
cmd/kured/main.go
View File

@@ -229,17 +229,22 @@ func NewRootCommand() *cobra.Command {
return rootCmd
}
// func that checks for deprecated slack-notification-related flags and node labels that do not match
// func that checks for cmd line flags validity
func flagCheck(cmd *cobra.Command, args []string) {
if slackHookURL != "" && notifyURL != "" {
log.Warnf("Cannot use both --notify-url and --slack-hook-url flags. Kured will use --notify-url flag only...")
if logFormat == "json" {
log.SetFormatter(&log.JSONFormatter{})
}
if notifyURL != "" {
if nodeID == "" {
log.Fatal("KURED_NODE_ID environment variable required")
}
switch {
case slackHookURL != "" && notifyURL != "":
log.Warnf("Cannot use both --notify-url and --slack-hook-url flags. Kured will use --notify-url flag only...")
case notifyURL != "":
notifyURL = stripQuotes(notifyURL)
} else if slackHookURL != "" {
slackHookURL = stripQuotes(slackHookURL)
case slackHookURL != "":
log.Warnf("Deprecated flag(s). Please use --notify-url flag instead.")
trataURL, err := url.Parse(slackHookURL)
trataURL, err := url.Parse(stripQuotes(slackHookURL))
if err != nil {
log.Warnf("slack-hook-url is not properly formatted... no notification will be sent: %v\n", err)
}
@@ -249,6 +254,7 @@ func flagCheck(cmd *cobra.Command, args []string) {
notifyURL = fmt.Sprintf("slack://%s", strings.Trim(trataURL.Path, "/services/"))
}
}
var preRebootNodeLabelKeys, postRebootNodeLabelKeys []string
for _, label := range preRebootNodeLabels {
preRebootNodeLabelKeys = append(preRebootNodeLabelKeys, strings.Split(label, "=")[0])
@@ -261,6 +267,32 @@ func flagCheck(cmd *cobra.Command, args []string) {
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.")
}
// Not really validation, could stay in root command if necessary.
// However, using the information here makes it very explicit that
// root is only for the main business logic.
log.Infof("Kubernetes Reboot Daemon: %s", version)
log.Infof("Node ID: %s", nodeID)
log.Infof("Lock Annotation: %s/%s:%s", dsNamespace, dsName, lockAnnotation)
if lockTTL > 0 {
log.Infof("Lock TTL set, lock will expire after: %v", lockTTL)
} else {
log.Info("Lock TTL not set, lock will remain until being released")
}
if lockReleaseDelay > 0 {
log.Infof("Lock release delay set, lock release will be delayed by: %v", lockReleaseDelay)
} else {
log.Info("Lock release delay not set, lock will be released immediately after rebooting")
}
log.Infof("PreferNoSchedule taint: %s", preferNoScheduleTaintName)
log.Infof("Blocking Pod Selectors: %v", podSelectors)
log.Infof("Reboot period %v", period)
log.Infof("Concurrency: %v", concurrency)
log.Infof("Reboot method: %s", rebootMethod)
if annotateNodes {
log.Infof("Will annotate nodes during kured reboot operations")
}
}
// stripQuotes removes any literal single or double quote chars that surround a string
@@ -685,39 +717,12 @@ func rebootAsRequired(nodeID string, rebooter reboot.Rebooter, checker checkers.
}
func root(cmd *cobra.Command, args []string) {
if logFormat == "json" {
log.SetFormatter(&log.JSONFormatter{})
}
log.Infof("Kubernetes Reboot Daemon: %s", version)
if nodeID == "" {
log.Fatal("KURED_NODE_ID environment variable required")
}
window, err := timewindow.New(rebootDays, rebootStart, rebootEnd, timezone)
if err != nil {
log.Fatalf("Failed to build time window: %v", err)
}
log.Infof("Node ID: %s", nodeID)
log.Infof("Lock Annotation: %s/%s:%s", dsNamespace, dsName, lockAnnotation)
if lockTTL > 0 {
log.Infof("Lock TTL set, lock will expire after: %v", lockTTL)
} else {
log.Info("Lock TTL not set, lock will remain until being released")
}
if lockReleaseDelay > 0 {
log.Infof("Lock release delay set, lock release will be delayed by: %v", lockReleaseDelay)
} else {
log.Info("Lock release delay not set, lock will be released immediately after rebooting")
}
log.Infof("PreferNoSchedule taint: %s", preferNoScheduleTaintName)
log.Infof("Blocking Pod Selectors: %v", podSelectors)
log.Infof("Reboot schedule: %v", window)
log.Infof("Reboot period %v", period)
log.Infof("Concurrency: %v", concurrency)
log.Infof("Reboot method: %s", rebootMethod)
restartCommand, err := shlex.Split(rebootCommand)
if err != nil {
@@ -755,10 +760,6 @@ func root(cmd *cobra.Command, args []string) {
}
}
if annotateNodes {
log.Infof("Will annotate nodes during kured reboot operations")
}
go rebootAsRequired(nodeID, rebooter, checker, window, lockTTL, lockReleaseDelay)
go maintainRebootRequiredMetric(nodeID, checker)

1
cmd/kured/main_test.go
View File

@@ -9,6 +9,7 @@ import (
func Test_flagCheck(t *testing.T) {
var cmd *cobra.Command
var args []string
nodeID = "babar"
slackHookURL = "https://hooks.slack.com/services/BLABLABA12345/IAM931A0VERY/COMPLICATED711854TOKEN1SET"
expected := "slack://BLABLABA12345/IAM931A0VERY/COMPLICATED711854TOKEN1SET"
flagCheck(cmd, args)