Merge pull request #690 from prankul88/flags-update-ups

✨ Align flag names with upstream Kubernetes components

Author: k8s-ci-robot

config/manager/manager.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - args:
-        - --enable-leader-election
+        - --leader-elect
         image: controller:latest
         imagePullPolicy: IfNotPresent
         name: manager

config/manager/manager_auth_proxy_patch.yaml

@@ -21,5 +21,5 @@ spec:
           name: https
       - name: manager
         args:
-        - "--metrics-addr=127.0.0.1:8080"
-        - "--enable-leader-election"
+        - "--metrics-bind-addr=127.0.0.1:8080"
+        - "--leader-elect"

config/webhook/manager_webhook_patch.yaml

@@ -9,7 +9,7 @@ spec:
       containers:
       - name: manager
         args:
-        - "--metrics-addr=127.0.0.1:8080"
+        - "--metrics-bind-addr=127.0.0.1:8080"
         - "--webhook-port=9443"
         ports:
         - containerPort: 9443

main.go

@@ -56,7 +56,7 @@ func main() {
 	klog.InitFlags(nil)
 
 	var (
-		metricsAddr                 string
+		metricsBindAddr             string
 		enableLeaderElection        bool
 		leaderElectionNamespace     string
 		watchNamespace              string
@@ -69,15 +69,15 @@ func main() {
 	)
 
 	flag.StringVar(
-		&metricsAddr,
-		"metrics-addr",
+		&metricsBindAddr,
+		"metrics-bind-addr",
 		":8080",
 		"The address the metric endpoint binds to.",
 	)
 
 	flag.BoolVar(
 		&enableLeaderElection,
-		"enable-leader-election",
+		"leader-elect",
 		false,
 		"Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.",
 	)
@@ -160,7 +160,7 @@ func main() {
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		MetricsBindAddress:      metricsBindAddr,
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionID:        "controller-leader-election-capo",
 		LeaderElectionNamespace: leaderElectionNamespace,