Avoid deleting local endpoint when Engine pod is restarted

In datastoresyncer, ensureExclusiveEndpoint API when the local endpoints are compared, they were not matching due to small mismatch in BackendConfig and this was causing deletion of local endpoint followed by creation of local endpoint. Fixes issue: submariner-io#960 Signed-Off-by: Sridhar Gaddam <[email protected]>
aswinsuryan · Nov 23, 2020 · 47689b8 · 47689b8
1 parent 3953a94
commit 47689b8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/main.go b/main.go
@@ -108,7 +108,7 @@ func main() {
 
 	submSpec.CableDriver = strings.ToLower(submSpec.CableDriver)
 
-	localEndpoint, err := util.GetLocalEndpoint(submSpec.ClusterID, submSpec.CableDriver, map[string]string{}, submSpec.NatEnabled,
+	localEndpoint, err := util.GetLocalEndpoint(submSpec.ClusterID, submSpec.CableDriver, nil, submSpec.NatEnabled,
 		localSubnets, util.GetLocalIP())
 
 	if err != nil {

diff --git a/pkg/cable/wireguard/driver.go b/pkg/cable/wireguard/driver.go
@@ -116,11 +116,7 @@ func NewDriver(localEndpoint types.SubmarinerEndpoint, localCluster types.Submar
 
 	pub = priv.PublicKey()
 
-	if localEndpoint.Spec.BackendConfig == nil {
-		localEndpoint.Spec.BackendConfig = make(map[string]string)
-	}
-
-	localEndpoint.Spec.BackendConfig[PublicKey] = pub.String()
+	w.localEndpoint.Spec.BackendConfig[PublicKey] = pub.String()
 
 	// configure the device. still not up
 	port := w.spec.NATTPort

diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -5,7 +5,6 @@ import (
 	"log"
 	"net"
 	"os"
-	"reflect"
 	"strings"
 	"syscall"
 
@@ -15,6 +14,7 @@ import (
 	subv1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1"
 	"github.com/submariner-io/submariner/pkg/types"
 	"github.com/vishvananda/netlink"
+	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/klog"
 )
 
@@ -92,6 +92,10 @@ func GetLocalEndpoint(clusterID, backend string, backendConfig map[string]string
 		return types.SubmarinerEndpoint{}, fmt.Errorf("Error getting hostname: %v", err)
 	}
 
+	if backendConfig == nil {
+		backendConfig = make(map[string]string)
+	}
+
 	endpoint := types.SubmarinerEndpoint{
 		Spec: subv1.EndpointSpec{
 			CableName:     fmt.Sprintf("submariner-cable-%s-%s", clusterID, strings.ReplaceAll(privateIP, ".", "-")),
@@ -154,7 +158,7 @@ func GetClusterCRDName(cluster *types.SubmarinerCluster) (string, error) {
 func CompareEndpointSpec(left, right subv1.EndpointSpec) bool {
 	// maybe we have to use just reflect.DeepEqual(left, right), but in this case the subnets order will influence.
 	return left.ClusterID == right.ClusterID && left.CableName == right.CableName && left.Hostname == right.Hostname &&
-		left.Backend == right.Backend && reflect.DeepEqual(left.BackendConfig, right.BackendConfig)
+		left.Backend == right.Backend && equality.Semantic.DeepEqual(left.BackendConfig, right.BackendConfig)
 }
 
 func GetDefaultGatewayInterface() (*net.Interface, error) {

diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go
@@ -197,6 +197,23 @@ func testCompareEndpointSpec() {
 					BackendConfig: map[string]string{"key": "aaa"},
 				})).To(BeTrue())
 		})
+
+		It("should return true", func() {
+			Expect(util.CompareEndpointSpec(
+				subv1.EndpointSpec{
+					ClusterID:     "east",
+					CableName:     "submariner-cable-east-172-16-32-5",
+					Hostname:      "my-host",
+					Backend:       "strongswan",
+					BackendConfig: map[string]string{},
+				},
+				subv1.EndpointSpec{
+					ClusterID: "east",
+					CableName: "submariner-cable-east-172-16-32-5",
+					Hostname:  "my-host",
+					Backend:   "strongswan",
+				})).To(BeTrue())
+		})
 	})
 
 	Context("with different cluster IDs", func() {