Merge pull request #8159 from bedsteye/migrate-klog-flush

k8s-ci-robot · web-flow · commit fabcbe5b383e · 2025-05-23T07:26:37.000-07:00
migrate os.Exit(255) to klog.FlushAndExit
diff --git a/vertical-pod-autoscaler/pkg/admission-controller/main.go b/vertical-pod-autoscaler/pkg/admission-controller/main.go
@@ -89,7 +89,7 @@ func main() {
 
 	if len(commonFlags.VpaObjectNamespace) > 0 && len(commonFlags.IgnoredVpaObjectNamespaces) > 0 {
 		klog.ErrorS(nil, "--vpa-object-namespace and --ignored-vpa-object-namespaces are mutually exclusive and can't be set together.")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 
 	healthCheck := metrics.NewHealthCheck(time.Minute)
@@ -118,7 +118,7 @@ func main() {
 	hostname, err := os.Hostname()
 	if err != nil {
 		klog.ErrorS(err, "Unable to get hostname")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 
 	statusNamespace := status.AdmissionControllerStatusNamespace
@@ -157,6 +157,6 @@ func main() {
 
 	if err = server.ListenAndServeTLS("", ""); err != nil {
 		klog.ErrorS(err, "Failed to start HTTPS server")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 }
diff --git a/vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder.go b/vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder.go
@@ -19,7 +19,6 @@ package input
 import (
 	"context"
 	"fmt"
-	"os"
 	"slices"
 	"time"
 
@@ -183,7 +182,7 @@ func newPodClients(kubeClient kube_client.Interface, resourceEventHandler cache.
 	indexer, ok := store.(cache.Indexer)
 	if !ok {
 		klog.ErrorS(nil, "Expected Indexer, but got a Store that does not implement Indexer")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 	podLister := v1lister.NewPodLister(indexer)
 	go controller.Run(stopCh)
diff --git a/vertical-pod-autoscaler/pkg/recommender/input/metrics/metrics_source.go b/vertical-pod-autoscaler/pkg/recommender/input/metrics/metrics_source.go
@@ -18,7 +18,6 @@ package metrics
 
 import (
 	"context"
-	"os"
 	"time"
 
 	k8sapiv1 "k8s.io/api/core/v1"
@@ -73,7 +72,7 @@ func NewExternalClient(c *rest.Config, clusterState model.ClusterState, options
 	extClient, err := external_metrics.NewForConfig(c)
 	if err != nil {
 		klog.ErrorS(err, "Failed initializing external metrics client")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 	return &externalMetricsClient{
 		externalClient: extClient,
diff --git a/vertical-pod-autoscaler/pkg/recommender/main.go b/vertical-pod-autoscaler/pkg/recommender/main.go
@@ -141,7 +141,7 @@ func main() {
 
 	if len(commonFlags.VpaObjectNamespace) > 0 && len(commonFlags.IgnoredVpaObjectNamespaces) > 0 {
 		klog.ErrorS(nil, "--vpa-object-namespace and --ignored-vpa-object-namespaces are mutually exclusive and can't be set together.")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 
 	if *routines.MinCheckpointsPerRun != 10 { // Default value is 10
@@ -162,7 +162,7 @@ func main() {
 		id, err := os.Hostname()
 		if err != nil {
 			klog.ErrorS(err, "Unable to get hostname")
-			os.Exit(255)
+			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 		id = id + "_" + string(uuid.NewUUID())
 
@@ -181,7 +181,7 @@ func main() {
 		)
 		if err != nil {
 			klog.ErrorS(err, "Unable to create leader election lock")
-			os.Exit(255)
+			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 
 		leaderelection.RunOrDie(ctx, leaderelection.LeaderElectionConfig{
@@ -296,7 +296,7 @@ func run(ctx context.Context, healthCheck *metrics.HealthCheck, commonFlag *comm
 	promQueryTimeout, err := time.ParseDuration(*queryTimeout)
 	if err != nil {
 		klog.ErrorS(err, "Could not parse --prometheus-query-timeout as a time.Duration")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 
 	if useCheckpoints {
@@ -324,7 +324,7 @@ func run(ctx context.Context, healthCheck *metrics.HealthCheck, commonFlag *comm
 		provider, err := history.NewPrometheusHistoryProvider(config)
 		if err != nil {
 			klog.ErrorS(err, "Could not initialize history provider")
-			os.Exit(255)
+			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 		recommender.GetClusterStateFeeder().InitFromHistoryProvider(provider)
 	}
diff --git a/vertical-pod-autoscaler/pkg/recommender/model/cluster_test.go b/vertical-pod-autoscaler/pkg/recommender/model/cluster_test.go
@@ -19,7 +19,6 @@ package model
 import (
 	"context"
 	"fmt"
-	"os"
 	"testing"
 	"time"
 
@@ -354,7 +353,7 @@ func addVpaObject(cluster ClusterState, id VpaID, vpa *vpa_types.VerticalPodAuto
 	err := cluster.AddOrUpdateVpa(vpa, parsedSelector)
 	if err != nil {
 		klog.ErrorS(err, "AddOrUpdateVpa() failed")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 	return cluster.VPAs()[id]
 }
diff --git a/vertical-pod-autoscaler/pkg/target/controller_fetcher/controller_fetcher.go b/vertical-pod-autoscaler/pkg/target/controller_fetcher/controller_fetcher.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -117,7 +116,7 @@ func NewControllerFetcher(config *rest.Config, kubeClient kube_client.Interface,
 	discoveryClient, err := discovery.NewDiscoveryClientForConfig(config)
 	if err != nil {
 		klog.ErrorS(err, "Could not create discoveryClient")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 	resolver := scale.NewDiscoveryScaleKindResolver(discoveryClient)
 	restClient := kubeClient.CoreV1().RESTClient()
diff --git a/vertical-pod-autoscaler/pkg/target/fetcher.go b/vertical-pod-autoscaler/pkg/target/fetcher.go
@@ -19,7 +19,6 @@ package target
 import (
 	"context"
 	"fmt"
-	"os"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -72,7 +71,7 @@ func NewVpaTargetSelectorFetcher(config *rest.Config, kubeClient kube_client.Int
 	discoveryClient, err := discovery.NewDiscoveryClientForConfig(config)
 	if err != nil {
 		klog.ErrorS(err, "Could not create discoveryClient")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 	resolver := scale.NewDiscoveryScaleKindResolver(discoveryClient)
 	restClient := kubeClient.CoreV1().RESTClient()
@@ -98,7 +97,7 @@ func NewVpaTargetSelectorFetcher(config *rest.Config, kubeClient kube_client.Int
 		synced := cache.WaitForCacheSync(stopCh, informer.HasSynced)
 		if !synced {
 			klog.ErrorS(nil, "Could not sync cache for "+string(kind))
-			os.Exit(255)
+			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		} else {
 			klog.InfoS("Initial sync completed", "kind", kind)
 		}
diff --git a/vertical-pod-autoscaler/pkg/updater/logic/updater.go b/vertical-pod-autoscaler/pkg/updater/logic/updater.go
@@ -19,7 +19,6 @@ package logic
 import (
 	"context"
 	"fmt"
-	"os"
 	"slices"
 	"time"
 
@@ -152,7 +151,7 @@ func (u *updater) RunOnce(ctx context.Context) {
 	vpaList, err := u.vpaLister.List(labels.Everything())
 	if err != nil {
 		klog.ErrorS(err, "Failed to get VPA list")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 	timer.ObserveStep("ListVPAs")
 
@@ -406,7 +405,7 @@ func newEventRecorder(kubeClient kube_client.Interface) record.EventRecorder {
 	vpascheme := scheme.Scheme
 	if err := corescheme.AddToScheme(vpascheme); err != nil {
 		klog.ErrorS(err, "Error adding core scheme")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 
 	return eventBroadcaster.NewRecorder(vpascheme, apiv1.EventSource{Component: "vpa-updater"})
diff --git a/vertical-pod-autoscaler/pkg/updater/main.go b/vertical-pod-autoscaler/pkg/updater/main.go
@@ -99,7 +99,7 @@ func main() {
 
 	if len(commonFlags.VpaObjectNamespace) > 0 && len(commonFlags.IgnoredVpaObjectNamespaces) > 0 {
 		klog.ErrorS(nil, "--vpa-object-namespace and --ignored-vpa-object-namespaces are mutually exclusive and can't be set together.")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 
 	healthCheck := metrics.NewHealthCheck(*updaterInterval * 5)
@@ -113,7 +113,7 @@ func main() {
 		id, err := os.Hostname()
 		if err != nil {
 			klog.ErrorS(err, "Unable to get hostname")
-			os.Exit(255)
+			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 		id = id + "_" + string(uuid.NewUUID())
 
@@ -132,7 +132,7 @@ func main() {
 		)
 		if err != nil {
 			klog.ErrorS(err, "Unable to create leader election lock")
-			os.Exit(255)
+			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 
 		leaderelection.RunOrDie(context.TODO(), leaderelection.LeaderElectionConfig{
@@ -216,7 +216,7 @@ func run(healthCheck *metrics.HealthCheck, commonFlag *common.CommonFlags) {
 	)
 	if err != nil {
 		klog.ErrorS(err, "Failed to create updater")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 
 	// Start updating health check endpoint.
diff --git a/vertical-pod-autoscaler/pkg/utils/metrics/healthcheck.go b/vertical-pod-autoscaler/pkg/utils/metrics/healthcheck.go
@@ -19,7 +19,6 @@ package metrics
 import (
 	"fmt"
 	"net/http"
-	"os"
 	"sync"
 	"time"
 
@@ -77,7 +76,7 @@ func (hc *HealthCheck) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		_, err := w.Write([]byte("OK"))
 		if err != nil {
 			klog.ErrorS(err, "Failed to write response message")
-			os.Exit(255)
+			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 	}
 }
diff --git a/vertical-pod-autoscaler/pkg/utils/server/server.go b/vertical-pod-autoscaler/pkg/utils/server/server.go
@@ -20,7 +20,6 @@ package server
 import (
 	"net/http"
 	"net/http/pprof"
-	"os"
 
 	"k8s.io/klog/v2"
 
@@ -49,6 +48,6 @@ func Initialize(enableProfiling *bool, healthCheck *metrics.HealthCheck, address
 
 		err := http.ListenAndServe(*address, mux)
 		klog.ErrorS(err, "Failed to start metrics")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}()
 }
diff --git a/vertical-pod-autoscaler/pkg/utils/vpa/api.go b/vertical-pod-autoscaler/pkg/utils/vpa/api.go
@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 	"time"
 
@@ -95,13 +94,13 @@ func NewVpasLister(vpaClient *vpa_clientset.Clientset, stopChannel <-chan struct
 	indexer, ok := store.(cache.Indexer)
 	if !ok {
 		klog.ErrorS(nil, "Expected Indexer, but got a Store that does not implement Indexer")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	}
 	vpaLister := vpa_lister.NewVerticalPodAutoscalerLister(indexer)
 	go controller.Run(stopChannel)
 	if !cache.WaitForCacheSync(stopChannel, controller.HasSynced) {
 		klog.ErrorS(nil, "Failed to sync VPA cache during initialization")
-		os.Exit(255)
+		klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 	} else {
 		klog.InfoS("Initial VPA synced successfully")
 	}

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func main() {`
`89`	`89`
`90`	`90`	`if len(commonFlags.VpaObjectNamespace) > 0 && len(commonFlags.IgnoredVpaObjectNamespaces) > 0 {`
`91`	`91`	`klog.ErrorS(nil, "--vpa-object-namespace and --ignored-vpa-object-namespaces are mutually exclusive and can't be set together.")`
`92`		`- os.Exit(255)`
	`92`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`healthCheck := metrics.NewHealthCheck(time.Minute)`
`@@ -118,7 +118,7 @@ func main() {`
`118`	`118`	`hostname, err := os.Hostname()`
`119`	`119`	`if err != nil {`
`120`	`120`	`klog.ErrorS(err, "Unable to get hostname")`
`121`		`- os.Exit(255)`
	`121`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`statusNamespace := status.AdmissionControllerStatusNamespace`
`@@ -157,6 +157,6 @@ func main() {`
`157`	`157`
`158`	`158`	`if err = server.ListenAndServeTLS("", ""); err != nil {`
`159`	`159`	`klog.ErrorS(err, "Failed to start HTTPS server")`
`160`		`- os.Exit(255)`
	`160`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`161`	`161`	`}`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func main() {`
`141`	`141`
`142`	`142`	`if len(commonFlags.VpaObjectNamespace) > 0 && len(commonFlags.IgnoredVpaObjectNamespaces) > 0 {`
`143`	`143`	`klog.ErrorS(nil, "--vpa-object-namespace and --ignored-vpa-object-namespaces are mutually exclusive and can't be set together.")`
`144`		`- os.Exit(255)`
	`144`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`if *routines.MinCheckpointsPerRun != 10 { // Default value is 10`
`@@ -162,7 +162,7 @@ func main() {`
`162`	`162`	`id, err := os.Hostname()`
`163`	`163`	`if err != nil {`
`164`	`164`	`klog.ErrorS(err, "Unable to get hostname")`
`165`		`- os.Exit(255)`
	`165`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`166`	`166`	`}`
`167`	`167`	`id = id + "_" + string(uuid.NewUUID())`
`168`	`168`
`@@ -181,7 +181,7 @@ func main() {`
`181`	`181`	`)`
`182`	`182`	`if err != nil {`
`183`	`183`	`klog.ErrorS(err, "Unable to create leader election lock")`
`184`		`- os.Exit(255)`
	`184`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`leaderelection.RunOrDie(ctx, leaderelection.LeaderElectionConfig{`
`@@ -296,7 +296,7 @@ func run(ctx context.Context, healthCheck metrics.HealthCheck, commonFlag comm`
`296`	`296`	`promQueryTimeout, err := time.ParseDuration(*queryTimeout)`
`297`	`297`	`if err != nil {`
`298`	`298`	`klog.ErrorS(err, "Could not parse --prometheus-query-timeout as a time.Duration")`
`299`		`- os.Exit(255)`
	`299`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`if useCheckpoints {`
`@@ -324,7 +324,7 @@ func run(ctx context.Context, healthCheck metrics.HealthCheck, commonFlag comm`
`324`	`324`	`provider, err := history.NewPrometheusHistoryProvider(config)`
`325`	`325`	`if err != nil {`
`326`	`326`	`klog.ErrorS(err, "Could not initialize history provider")`
`327`		`- os.Exit(255)`
	`327`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`328`	`328`	`}`
`329`	`329`	`recommender.GetClusterStateFeeder().InitFromHistoryProvider(provider)`
`330`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func main() {`
`99`	`99`
`100`	`100`	`if len(commonFlags.VpaObjectNamespace) > 0 && len(commonFlags.IgnoredVpaObjectNamespaces) > 0 {`
`101`	`101`	`klog.ErrorS(nil, "--vpa-object-namespace and --ignored-vpa-object-namespaces are mutually exclusive and can't be set together.")`
`102`		`- os.Exit(255)`
	`102`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`healthCheck := metrics.NewHealthCheck(updaterInterval 5)`
`@@ -113,7 +113,7 @@ func main() {`
`113`	`113`	`id, err := os.Hostname()`
`114`	`114`	`if err != nil {`
`115`	`115`	`klog.ErrorS(err, "Unable to get hostname")`
`116`		`- os.Exit(255)`
	`116`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`117`	`117`	`}`
`118`	`118`	`id = id + "_" + string(uuid.NewUUID())`
`119`	`119`
`@@ -132,7 +132,7 @@ func main() {`
`132`	`132`	`)`
`133`	`133`	`if err != nil {`
`134`	`134`	`klog.ErrorS(err, "Unable to create leader election lock")`
`135`		`- os.Exit(255)`
	`135`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`leaderelection.RunOrDie(context.TODO(), leaderelection.LeaderElectionConfig{`
`@@ -216,7 +216,7 @@ func run(healthCheck metrics.HealthCheck, commonFlag common.CommonFlags) {`
`216`	`216`	`)`
`217`	`217`	`if err != nil {`
`218`	`218`	`klog.ErrorS(err, "Failed to create updater")`
`219`		`- os.Exit(255)`
	`219`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`// Start updating health check endpoint.`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ package metrics`
`19`	`19`	`import (`
`20`	`20`	`"fmt"`
`21`	`21`	`"net/http"`
`22`		`- "os"`
`23`	`22`	`"sync"`
`24`	`23`	`"time"`
`25`	`24`
`@@ -77,7 +76,7 @@ func (hc HealthCheck) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`77`	`76`	`_, err := w.Write([]byte("OK"))`
`78`	`77`	`if err != nil {`
`79`	`78`	`klog.ErrorS(err, "Failed to write response message")`
`80`		`- os.Exit(255)`
	`79`	`+ klog.FlushAndExit(klog.ExitFlushTimeout, 1)`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`	`}`