1 file changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -78,14 +78,7 @@ func main() {
78
78
setupLog .Error (err , "unable to build REST config" )
79
79
os .Exit (1 )
80
80
}
81
- rtOpts := config .BuildRuntimeOptions (controllerCFG .RuntimeConfig , scheme )
82
-
83
- mgr , err := ctrl .NewManager (restCFG , rtOpts )
84
- if err != nil {
85
- setupLog .Error (err , "unable to create controller manager" )
86
- os .Exit (1 )
87
- }
88
- clientSet , err := kubernetes .NewForConfig (mgr .GetConfig ())
81
+ clientSet , err := kubernetes .NewForConfig (restCFG )
89
82
if err != nil {
90
83
setupLog .Error (err , "unable to obtain clientSet" )
91
84
os .Exit (1 )
@@ -104,6 +97,18 @@ func main() {
104
97
os .Exit (1 )
105
98
}
106
99
enableNetworkPolicyController = configMapManager .IsControllerEnabled ()
100
+ if ! enableNetworkPolicyController {
101
+ setupLog .Info ("Disabling leader election since network policy controller is not enabled" )
102
+ controllerCFG .RuntimeConfig .EnableLeaderElection = false
103
+ }
104
+ }
105
+
106
+ rtOpts := config .BuildRuntimeOptions (controllerCFG .RuntimeConfig , scheme )
107
+
108
+ mgr , err := ctrl .NewManager (restCFG , rtOpts )
109
+ if err != nil {
110
+ setupLog .Error (err , "unable to create controller manager" )
111
+ os .Exit (1 )
107
112
}
108
113
109
114
policyEndpointsManager := policyendpoints .NewPolicyEndpointsManager (mgr .GetClient (),
0 commit comments