DRY up the validation of common flags

Author: adrianmoisey

vertical-pod-autoscaler/pkg/admission-controller/config/config.go

@@ -20,8 +20,16 @@ import (
 	"flag"
 	"os"
 
+<<<<<<< HEAD
 	"k8s.io/apimachinery/pkg/api/resource"
+=======
+	"github.com/spf13/pflag"
+	kube_flag "k8s.io/component-base/cli/flag"
+	"k8s.io/klog/v2"
+
+>>>>>>> cee795bd3 (DRY up the validation of common flags)
 	"k8s.io/autoscaler/vertical-pod-autoscaler/common"
+	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 )
 
 // CertsConfig holds configuration related to TLS certificates
@@ -109,6 +117,16 @@ func InitAdmissionControllerFlags() *AdmissionControllerConfig {
 
 	flag.Var(&config.MaxAllowedCPUBoost, "max-allowed-cpu-boost", "Maximum amount of CPU that will be applied for a container with boost.")
 
+	// These need to happen last. kube_flag.InitFlags() synchronizes and parses
+	// flags from the flag package to pflag, so feature gates must be added to
+	// pflag before InitFlags() is called.
+	klog.InitFlags(nil)
+	common.InitLoggingFlags()
+	features.MutableFeatureGate.AddFlag(pflag.CommandLine)
+	kube_flag.InitFlags()
+
+	ValidateAdmissionControllerConfig(config)
+	
 	return config
 }
 

vertical-pod-autoscaler/pkg/admission-controller/main.go

@@ -23,11 +23,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/spf13/pflag"
 	"k8s.io/client-go/informers"
 	kube_client "k8s.io/client-go/kubernetes"
 	typedadmregv1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1"
-	kube_flag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
 
 	"k8s.io/autoscaler/vertical-pod-autoscaler/common"
@@ -38,7 +36,6 @@ import (
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource/pod/recommendation"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource/vpa"
 	vpa_clientset "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/clientset/versioned"
-	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/target"
 	controllerfetcher "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/target/controller_fetcher"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/limitrange"
@@ -60,12 +57,7 @@ const (
 
 func main() {
 	config := admissioncontroller_config.InitAdmissionControllerFlags()
-	klog.InitFlags(nil)
-	common.InitLoggingFlags()
-	features.MutableFeatureGate.AddFlag(pflag.CommandLine)
-	kube_flag.InitFlags()
 
-	admissioncontroller_config.ValidateAdmissionControllerConfig(config)
 	klog.V(1).InfoS("Starting Vertical Pod Autoscaler Admission Controller", "version", common.VerticalPodAutoscalerVersion())
 
 	healthCheck := metrics.NewHealthCheck(time.Minute)

vertical-pod-autoscaler/pkg/recommender/config/config.go

@@ -22,10 +22,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/api/resource"
+	kube_flag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
 
 	"k8s.io/autoscaler/vertical-pod-autoscaler/common"
+	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/input"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/model"
 )
@@ -241,6 +244,16 @@ func InitRecommenderFlags() *RecommenderConfig {
 	flag.Var(&config.MaxAllowedCPU, "container-recommendation-max-allowed-cpu", "Maximum amount of CPU that will be recommended for a container. VerticalPodAutoscaler-level maximum allowed takes precedence over the global maximum allowed.")
 	flag.Var(&config.MaxAllowedMemory, "container-recommendation-max-allowed-memory", "Maximum amount of memory that will be recommended for a container. VerticalPodAutoscaler-level maximum allowed takes precedence over the global maximum allowed.")
 
+	// These need to happen last. kube_flag.InitFlags() synchronizes and parses
+	// flags from the flag package to pflag, so feature gates must be added to
+	// pflag before InitFlags() is called.
+	klog.InitFlags(nil)
+	common.InitLoggingFlags()
+	features.MutableFeatureGate.AddFlag(pflag.CommandLine)
+	kube_flag.InitFlags()
+
+	ValidateRecommenderConfig(config)
+
 	return config
 }
 

vertical-pod-autoscaler/pkg/recommender/main.go

@@ -31,15 +31,13 @@ import (
 	kube_client "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
-	kube_flag "k8s.io/component-base/cli/flag"
 	componentbaseconfig "k8s.io/component-base/config"
 	componentbaseoptions "k8s.io/component-base/config/options"
 	"k8s.io/klog/v2"
 	resourceclient "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1"
 
 	"k8s.io/autoscaler/vertical-pod-autoscaler/common"
 	vpa_clientset "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/clientset/versioned"
-	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/checkpoint"
 	recommender_config "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/config"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/input"
@@ -71,17 +69,12 @@ const (
 var config *recommender_config.RecommenderConfig
 
 func main() {
-	config = recommender_config.InitRecommenderFlags()
-	klog.InitFlags(nil)
-	common.InitLoggingFlags()
-	features.MutableFeatureGate.AddFlag(pflag.CommandLine)
-
+	// Leader election needs to be initialized before any other flag, because it may be used in other flag's validation.
 	leaderElection := defaultLeaderElectionConfiguration()
 	componentbaseoptions.BindLeaderElectionFlags(&leaderElection, pflag.CommandLine)
 
-	kube_flag.InitFlags()
+	config = recommender_config.InitRecommenderFlags()
 
-	recommender_config.ValidateRecommenderConfig(config)
 	klog.V(1).InfoS("Vertical Pod Autoscaler Recommender", "version", common.VerticalPodAutoscalerVersion(), "recommenderName", config.RecommenderName)
 
 	ctx := context.Background()

vertical-pod-autoscaler/pkg/updater/config/config.go

@@ -21,7 +21,12 @@ import (
 	"os"
 	"time"
 
+	"github.com/spf13/pflag"
+	kube_flag "k8s.io/component-base/cli/flag"
+	"k8s.io/klog/v2"
+
 	"k8s.io/autoscaler/vertical-pod-autoscaler/common"
+	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 )
 
 // UpdaterConfig holds all configuration for the admission controller component
@@ -82,6 +87,16 @@ func InitUpdaterFlags() *UpdaterConfig {
 	flag.DurationVar(&config.PodLifetimeUpdateThreshold, "in-recommendation-bounds-eviction-lifetime-threshold", config.PodLifetimeUpdateThreshold, "Pods that live for at least that long can be evicted even if their request is within the [MinRecommended...MaxRecommended] range")
 	flag.DurationVar(&config.EvictAfterOOMThreshold, "evict-after-oom-threshold", config.EvictAfterOOMThreshold, `The default duration to evict pods that have OOMed in less than evict-after-oom-threshold since start.`)
 
+	// These need to happen last. kube_flag.InitFlags() synchronizes and parses
+	// flags from the flag package to pflag, so feature gates must be added to
+	// pflag before InitFlags() is called.
+	klog.InitFlags(nil)
+	common.InitLoggingFlags()
+	features.MutableFeatureGate.AddFlag(pflag.CommandLine)
+	kube_flag.InitFlags()
+
+	ValidateUpdaterConfig(config)
+
 	return config
 }
 

vertical-pod-autoscaler/pkg/updater/main.go

@@ -30,7 +30,6 @@ import (
 	kube_client "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
-	kube_flag "k8s.io/component-base/cli/flag"
 	componentbaseconfig "k8s.io/component-base/config"
 	componentbaseoptions "k8s.io/component-base/config/options"
 	"k8s.io/klog/v2"
@@ -39,7 +38,6 @@ import (
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource/pod/recommendation"
 	vpa_clientset "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/clientset/versioned"
-	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/target"
 	controllerfetcher "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/target/controller_fetcher"
 	updater_config "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/updater/config"
@@ -64,18 +62,12 @@ const (
 var config *updater_config.UpdaterConfig
 
 func main() {
-	config = updater_config.InitUpdaterFlags()
-	klog.InitFlags(nil)
-	common.InitLoggingFlags()
-
+	// Leader election needs to be initialized before any other flag, because it may be used in other flag's validation.
 	leaderElection := defaultLeaderElectionConfiguration()
 	componentbaseoptions.BindLeaderElectionFlags(&leaderElection, pflag.CommandLine)
 
-	features.MutableFeatureGate.AddFlag(pflag.CommandLine)
-
-	kube_flag.InitFlags()
+	config = updater_config.InitUpdaterFlags()
 
-	updater_config.ValidateUpdaterConfig(config)
 	klog.V(1).InfoS("Vertical Pod Autoscaler Updater", "version", common.VerticalPodAutoscalerVersion())
 
 	healthCheck := metrics.NewHealthCheck(config.UpdaterInterval * 5)