fix: healthz/metrics port args kimup-controller

Author: azrod

cmd/operator/main.go

@@ -76,8 +76,6 @@ func main() {
 
 	ctrl.SetLogger(logrusr.New(log.GetLogger()))
 
-	webhook := webhook.NewServer(webhook.Options{Port: models.MutatorDefaultPort})
-
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme: scheme,
 		Metrics: metricsserver.Options{
@@ -99,7 +97,7 @@ func main() {
 		}(),
 		LeaderElection:   enableLeaderElection,
 		LeaderElectionID: "71be4586.kimup.cloudavenue.io",
-		WebhookServer:    webhook,
+		WebhookServer:    webhook.NewServer(webhook.Options{Port: models.MutatorDefaultPort}),
 	})
 	if err != nil {
 		log.WithError(err).Error("unable to start manager")

internal/controller/resources_common.go

@@ -24,7 +24,7 @@ func buildKimupArgs(extra v1alpha1.KimupExtraSpec) (args []string) {
 
 		// set the healthz port
 		healthzPort := extra.Healthz.Port
-		if healthzPort != 0 {
+		if healthzPort == 0 {
 			healthzPort = models.HealthzDefaultPort
 		}
 		args = append(args, fmt.Sprintf("--%s=%d", models.HealthzPortFlagName, healthzPort))
@@ -43,7 +43,7 @@ func buildKimupArgs(extra v1alpha1.KimupExtraSpec) (args []string) {
 
 		// set the metrics port
 		metricsPort := extra.Metrics.Port
-		if metricsPort != 0 {
+		if metricsPort == 0 {
 			metricsPort = models.MetricsDefaultPort
 		}
 
@@ -58,7 +58,6 @@ func buildKimupArgs(extra v1alpha1.KimupExtraSpec) (args []string) {
 		args = append(args, fmt.Sprintf("--%s=%s", models.MetricsPathFlagName, metricsPath))
 	}
 
-	// TODO
 	args = append(args, fmt.Sprintf("--%s=%s", models.LogLevelFlagName, extra.LogLevel))
 
 	return args