bugfix #1340: not compare all svc.spec for user modified scene

Signed-off-by: spwangxp <wangshengpeng@cestc.cn>
envoyproxy · Apr 28, 2023 · 1500e2c · 1500e2c
1 parent 2ac09c7
commit 1500e2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/infrastructure/kubernetes/resource/resource.go b/internal/infrastructure/kubernetes/resource/resource.go
@@ -34,8 +34,9 @@ func ExpectedServiceSpec(serviceType *egcfgv1a1.ServiceType) corev1.ServiceSpec
 	return serviceSpec
 }
 
-// CompareSvc Only compare the selector and ports(not include nodePort) in case user have modified for some scene.
+// CompareSvc Only compare the type, selector and ports(not include nodePort) in case user have modified for some scene.
 func CompareSvc(currentSvc, originalSvc *corev1.Service) bool {
-	return cmp.Equal(currentSvc.Spec.Selector, originalSvc.Spec.Selector) &&
+	return cmp.Equal(currentSvc.Spec.Type, originalSvc.Spec.Type) &&
+		cmp.Equal(currentSvc.Spec.Selector, originalSvc.Spec.Selector) &&
 		cmp.Equal(currentSvc.Spec.Ports, originalSvc.Spec.Ports, cmpopts.IgnoreFields(corev1.ServicePort{}, "NodePort"))
 }
diff --git a/internal/infrastructure/kubernetes/resource/resource_test.go b/internal/infrastructure/kubernetes/resource/resource_test.go
@@ -126,7 +126,7 @@ func TestCompareSvc(t *testing.T) {
 					Selector: map[string]string{
 						"app": "my-app",
 					},
-					Type: "ClusterIP",
+					Type: "NodePort",
 				},
 			},
 		}, {