Refactor the code

Signed-off-by: Aswin Suryanarayanan <[email protected]>
submariner-io · Jul 31, 2023 · 24babec · 24babec
1 parent 19a4925
commit 24babec
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 27 deletions.
diff --git a/controllers/submariner/route_agent_resources.go b/controllers/submariner/route_agent_resources.go
@@ -135,20 +135,18 @@ func newRouteAgentDaemonSet(cr *v1alpha1.Submariner, clusterNetwork *network.Clu
 		},
 	}
 
-	if clusterNetwork.PluginSettings != nil {
-		if ovndb, ok := clusterNetwork.PluginSettings[network.OvnNBDB]; ok {
-			ds.Spec.Template.Spec.Containers[0].Env = append(
-				ds.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{
-					Name: network.OvnNBDB, Value: ovndb,
-				})
-		}
+	if ovndb, ok := clusterNetwork.PluginSettings[network.OvnNBDB]; ok {
+		ds.Spec.Template.Spec.Containers[0].Env = append(
+			ds.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{
+				Name: network.OvnNBDB, Value: ovndb,
+			})
+	}
 
-		if ovnsb, ok := clusterNetwork.PluginSettings[network.OvnSBDB]; ok {
-			ds.Spec.Template.Spec.Containers[0].Env = append(
-				ds.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{
-					Name: network.OvnSBDB, Value: ovnsb,
-				})
-		}
+	if ovnsb, ok := clusterNetwork.PluginSettings[network.OvnSBDB]; ok {
+		ds.Spec.Template.Spec.Containers[0].Env = append(
+			ds.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{
+				Name: network.OvnSBDB, Value: ovnsb,
+			})
 	}
 
 	return ds

diff --git a/pkg/discovery/network/ovnkubernetes.go b/pkg/discovery/network/ovnkubernetes.go
@@ -90,19 +90,15 @@ func discoverOvnNodeClusterNetwork(ctx context.Context, client controllerClient.
 
 	endpointList, err := findEndpoint(ctx, client, ovnPod.Namespace)
 	if err != nil {
-		return nil, errors.Wrapf(err, "Error retrieving the endpoints from namespace %q", ovnPod.Namespace)
+		return nil, errors.Wrapf(err, "error retrieving the endpoints from namespace %q", ovnPod.Namespace)
 	}
 
 	var clusterNetwork *ClusterNetwork
 
 	if endpointList == nil || len(endpointList.Items) == 0 {
-		clusterNetwork, err = createLocalClusterNetwork(), nil
+		clusterNetwork = createLocalClusterNetwork()
 	} else {
-		clusterNetwork, err = createClusterNetworkWithEndpoints(endpointList.Items), nil
-	}
-
-	if err != nil {
-		return nil, err
+		clusterNetwork = createClusterNetworkWithEndpoints(endpointList.Items)
 	}
 
 	updateClusterNetworkFromConfigMap(ctx, client, ovnPod.Namespace, clusterNetwork)
@@ -119,24 +115,21 @@ func createLocalClusterNetwork() *ClusterNetwork {
 }
 
 func createClusterNetworkWithEndpoints(endPoints []corev1.Endpoints) *ClusterNetwork {
-	pluginSettings := map[string]string{}
-	var northboundDBIPs string
+	var northboundDBIPs[] string
 
-	for index := 0; index < len(endPoints); index++ {
+	for index := range endPoints {
 		for _, subset := range endPoints[index].Subsets {
 			for _, port := range subset.Ports {
 				if strings.Contains(port.Name, "north") {
-					northboundDBIPs += fmt.Sprintf("IC:%s:%s:%s:%d,",
+					northboundDBIPs = append(northboundDBIPs, fmt.Sprintf("IC:%s:%s:%s:%d",
 						endPoints[index].Name, port.Protocol, subset.Addresses[0].IP, OvnNBDBDefaultPort)
 				}
 			}
 		}
 	}
 
-	pluginSettings[OvnNBDB] = northboundDBIPs
-
 	return &ClusterNetwork{
-		PluginSettings: pluginSettings,
+		PluginSettings: map[string]string{OvnNBDB: strings.Join(northboundDBIPs, ",")},
 	}
 }