Skip to content

Commit e936286

Browse files
committed
Align flag names with upstream Kubernetes components
1 parent 57f931d commit e936286

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
spec:
2121
containers:
2222
- args:
23-
- --enable-leader-election
23+
- --leader-elect
2424
image: controller:latest
2525
imagePullPolicy: IfNotPresent
2626
name: manager

config/manager/manager_auth_proxy_patch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ spec:
2121
name: https
2222
- name: manager
2323
args:
24-
- "--metrics-addr=127.0.0.1:8080"
25-
- "--enable-leader-election"
24+
- "--metrics-bind-addr=127.0.0.1:8080"
25+
- "--leader-elect"

config/webhook/manager_webhook_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
containers:
1010
- name: manager
1111
args:
12-
- "--metrics-addr=127.0.0.1:8080"
12+
- "--metrics-bind-addr=127.0.0.1:8080"
1313
- "--webhook-port=9443"
1414
ports:
1515
- containerPort: 9443

main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func main() {
5656
klog.InitFlags(nil)
5757

5858
var (
59-
metricsAddr string
59+
metricsBindAddr string
6060
enableLeaderElection bool
6161
leaderElectionNamespace string
6262
watchNamespace string
@@ -69,15 +69,15 @@ func main() {
6969
)
7070

7171
flag.StringVar(
72-
&metricsAddr,
73-
"metrics-addr",
72+
&metricsBindAddr,
73+
"metrics-bind-addr",
7474
":8080",
7575
"The address the metric endpoint binds to.",
7676
)
7777

7878
flag.BoolVar(
7979
&enableLeaderElection,
80-
"enable-leader-election",
80+
"leader-elect",
8181
false,
8282
"Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.",
8383
)
@@ -160,7 +160,7 @@ func main() {
160160

161161
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
162162
Scheme: scheme,
163-
MetricsBindAddress: metricsAddr,
163+
MetricsBindAddress: metricsBindAddr,
164164
LeaderElection: enableLeaderElection,
165165
LeaderElectionID: "controller-leader-election-capo",
166166
LeaderElectionNamespace: leaderElectionNamespace,

0 commit comments

Comments
 (0)