From c3825193c2db9a3712015b87224d0070006529fd Mon Sep 17 00:00:00 2001 From: Devansh Das Date: Tue, 3 Sep 2024 09:41:54 +0000 Subject: [PATCH] Add lease resource name customization using flag --- cluster-autoscaler/main.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cluster-autoscaler/main.go b/cluster-autoscaler/main.go index 600102c1b2d7..efa3042e0c20 100644 --- a/cluster-autoscaler/main.go +++ b/cluster-autoscaler/main.go @@ -110,6 +110,7 @@ func multiStringFlag(name string, usage string) *MultiStringFlag { } var ( + leaseResourceName = flag.String("lease-resource-name", "cluster-autoscaler", "The lease resource to use in leader election.") clusterName = flag.String("cluster-name", "", "Autoscaled cluster name, if available") address = flag.String("address", ":8085", "The address to expose prometheus metrics.") kubernetes = flag.String("kubernetes", "", "Kubernetes master location. Leave blank for default") @@ -643,10 +644,6 @@ func run(healthCheck *metrics.HealthCheck, debuggingSnapshotter debuggingsnapsho func main() { klog.InitFlags(nil) - leaderElection := defaultLeaderElectionConfiguration() - leaderElection.LeaderElect = true - componentopts.BindLeaderElectionFlags(&leaderElection, pflag.CommandLine) - featureGate := utilfeature.DefaultMutableFeatureGate loggingConfig := logsapi.NewLoggingConfiguration() @@ -658,6 +655,10 @@ func main() { featureGate.AddFlag(pflag.CommandLine) kube_flag.InitFlags() + leaderElection := defaultLeaderElectionConfiguration() + leaderElection.LeaderElect = true + componentopts.BindLeaderElectionFlags(&leaderElection, pflag.CommandLine) + logs.InitLogs() if err := logsapi.ValidateAndApply(loggingConfig, featureGate); err != nil { klog.Fatalf("Failed to validate and apply logging configuration: %v", err) @@ -744,7 +745,7 @@ func defaultLeaderElectionConfiguration() componentbaseconfig.LeaderElectionConf RenewDeadline: metav1.Duration{Duration: defaultRenewDeadline}, RetryPeriod: metav1.Duration{Duration: defaultRetryPeriod}, ResourceLock: resourcelock.LeasesResourceLock, - ResourceName: "cluster-autoscaler", + ResourceName: *leaseResourceName, } }