Address review comments

squash please
submariner-io · Aug 29, 2022 · d39f841 · d39f841
1 parent 1df0e56
commit d39f841
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/controllers/constants/constants.go b/controllers/constants/constants.go
@@ -18,6 +18,4 @@ limitations under the License.
 
 package constants
 
-const (
-	CleanupFinalizer = "controllers.submariner.io/cleanup"
-)
+const CleanupFinalizer = "controllers.submariner.io/cleanup"
diff --git a/controllers/metrics/metrics.go b/controllers/metrics/metrics.go
@@ -34,13 +34,11 @@ import (
 	controllerClient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func Setup(serviceName, namespace, applicationKey, applicationName string, owner metav1.Object,  port int32,
-	client controllerClient.Client, config *rest.Config, scheme *runtime.Scheme,
-	reqLogger logr.Logger,
+func Setup(serviceName, namespace, applicationKey, applicationName string, owner metav1.Object, port int32,
+	client controllerClient.Client, config *rest.Config, scheme *runtime.Scheme, reqLogger logr.Logger,
 ) error {
-	metricsService, err := helpers.ReconcileService(owner, newMetricsService(serviceName, namespace, applicationKey, applicationName, port), reqLogger,
-		client, scheme)
-
+	metricsService, err := helpers.ReconcileService(owner, newMetricsService(serviceName, namespace, applicationKey,
+		applicationName, port), reqLogger, client, scheme)
 	if err != nil {
 		return err // nolint:wrapcheck // No need to wrap here
 	}

diff --git a/controllers/servicediscovery/servicediscovery_controller.go b/controllers/servicediscovery/servicediscovery_controller.go
@@ -713,7 +713,6 @@ func (r *Reconciler) ensureLightHouseAgent(instance *submarinerv1alpha1.ServiceD
 
 	err := metrics.Setup(names.ServiceDiscoveryComponent, instance.Namespace, "app", names.ServiceDiscoveryComponent,
 		instance, 8082, r.Client, r.RestConfig, r.Scheme, reqLogger)
-
 	if err != nil {
 		return errors.Wrap(err, "error setting up metrics")
 	}
@@ -731,7 +730,6 @@ func (r *Reconciler) ensureLighthouseCoreDNSDeployment(instance *submarinerv1alp
 
 	err := metrics.Setup(names.LighthouseCoreDNSComponent, instance.Namespace, "app", names.LighthouseCoreDNSComponent, instance,
 		9153, r.Client, r.RestConfig, r.Scheme, reqLogger)
-
 	if err != nil {
 		return errors.Wrap(err, "error setting up coredns metrics")
 	}

diff --git a/controllers/submariner/gateway_resources.go b/controllers/submariner/gateway_resources.go
@@ -199,7 +199,7 @@ func newGatewayPodTemplate(cr *v1alpha1.Submariner, name string, podSelectorLabe
 						{Name: "SUBMARINER_HEALTHCHECKENABLED", Value: strconv.FormatBool(healthCheckEnabled)},
 						{Name: "SUBMARINER_HEALTHCHECKINTERVAL", Value: strconv.FormatUint(healthCheckInterval, 10)},
 						{Name: "SUBMARINER_HEALTHCHECKMAXPACKETLOSSCOUNT", Value: strconv.FormatUint(healthCheckMaxPacketLossCount, 10)},
-						{Name: "SUBMARINER_GWMETRICSPORT", Value: gwMetricsServerPort},
+						{Name: "SUBMARINER_GWMETRICSPORT", Value: gatewayMetricsServerPort},
 						{Name: "NODE_NAME", ValueFrom: &corev1.EnvVarSource{
 							FieldRef: &corev1.ObjectFieldSelector{
 								FieldPath: "spec.nodeName",

diff --git a/controllers/submariner/globalnet_resources.go b/controllers/submariner/globalnet_resources.go
@@ -40,8 +40,8 @@ func (r *Reconciler) reconcileGlobalnetDaemonSet(instance *v1alpha1.Submariner,
 		return nil, err
 	}
 
-	err = metrics.Setup(names.GlobalnetComponent, instance.Namespace, "app", names.MetricsProxyComponent, instance, globalnetMetricsServicePort,
-		r.config.ScopedClient, r.config.RestConfig, r.config.Scheme, reqLogger)
+	err = metrics.Setup(names.GlobalnetComponent, instance.Namespace, "app", names.MetricsProxyComponent,
+		instance, globalnetMetricsServicePort, r.config.ScopedClient, r.config.RestConfig, r.config.Scheme, reqLogger)
 
 	return daemonSet, err
 }
@@ -91,7 +91,7 @@ func newGlobalnetDaemonSet(cr *v1alpha1.Submariner, name string) *appsv1.DaemonS
 								{Name: "SUBMARINER_NAMESPACE", Value: cr.Spec.Namespace},
 								{Name: "SUBMARINER_CLUSTERID", Value: cr.Spec.ClusterID},
 								{Name: "SUBMARINER_EXCLUDENS", Value: "submariner-operator,kube-system,operators,openshift-monitoring,openshift-dns"},
-								{Name: "SUBMARINER_GNMETRICSPORT", Value: gnMetricsServerPort},
+								{Name: "SUBMARINER_GNMETRICSPORT", Value: globalnetMetricsServerPort},
 								{Name: "NODE_NAME", ValueFrom: &corev1.EnvVarSource{
 									FieldRef: &corev1.ObjectFieldSelector{
 										FieldPath: "spec.nodeName",

diff --git a/controllers/submariner/metrics_proxy_resources.go b/controllers/submariner/metrics_proxy_resources.go
@@ -60,7 +60,7 @@ func newMetricsProxyDaemonSet(cr *v1alpha1.Submariner, name string) *appsv1.Daem
 				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
-						*metricProxyContainer(cr, "gateway-metrics-proxy", fmt.Sprint(gatewayMetricsServicePort), gwMetricsServerPort),
+						*metricProxyContainer(cr, "gateway-metrics-proxy", fmt.Sprint(gatewayMetricsServicePort), gatewayMetricsServerPort),
 					},
 					NodeSelector: map[string]string{"submariner.io/gateway": "true"},
 					// The MetricsProxy Pod must be able to run on any flagged node, regardless of existing taints
@@ -72,7 +72,7 @@ func newMetricsProxyDaemonSet(cr *v1alpha1.Submariner, name string) *appsv1.Daem
 
 	if cr.Spec.GlobalCIDR != "" {
 		daemonSet.Spec.Template.Spec.Containers = append(daemonSet.Spec.Template.Spec.Containers,
-			*metricProxyContainer(cr, "globalnet-metrics-proxy", fmt.Sprint(globalnetMetricsServicePort), gnMetricsServerPort))
+			*metricProxyContainer(cr, "globalnet-metrics-proxy", fmt.Sprint(globalnetMetricsServicePort), globalnetMetricsServerPort))
 	}
 
 	return daemonSet

diff --git a/controllers/submariner/submariner_controller.go b/controllers/submariner/submariner_controller.go
@@ -57,8 +57,8 @@ import (
 const (
 	gatewayMetricsServicePort   = 8080
 	globalnetMetricsServicePort = 8081
-	gwMetricsServerPort         = "32780"
-	gnMetricsServerPort         = "32781"
+	gatewayMetricsServerPort    = "32780"
+	globalnetMetricsServerPort  = "32781"
 )
 
 var log = logf.Log.WithName("controller_submariner")