From 24babec182ff4bc3bb52133363bc47840d6ed284 Mon Sep 17 00:00:00 2001 From: Aswin Suryanarayanan Date: Mon, 31 Jul 2023 13:51:24 -0400 Subject: [PATCH] Refactor the code Signed-off-by: Aswin Suryanarayanan --- .../submariner/route_agent_resources.go | 24 +++++++++---------- pkg/discovery/network/ovnkubernetes.go | 21 ++++++---------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/controllers/submariner/route_agent_resources.go b/controllers/submariner/route_agent_resources.go index 2bffa45907..f5dda24865 100644 --- 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 index 9e6bdaba6b..680a96c6ec 100644 --- 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, ",")}, } }