Update Pod annotations for Service type change,

includes a UT for the same.
Fixes antrea-io#1910

pkg/agent/nodeportlocal/k8s/npl_controller.go

@@ -210,11 +210,19 @@ func (c *NPLController) enqueueSvcUpdate(oldObj, newObj interface{}) {
 		} else if newSvcAnnotation == "true" {
 			podKeys = sets.NewString(c.getPodsFromService(newSvc)...)
 		}
-	} else if !reflect.DeepEqual(oldSvc.Spec.Selector, newSvc.Spec.Selector) {
+	}
+
+	var oldPodSet, newPodSet sets.String
+	if oldSvc.Spec.Type != newSvc.Spec.Type {
+		newPodSet = sets.NewString(c.getPodsFromService(newSvc)...)
+		podKeys = podKeys.Union(newPodSet)
+	}
+
+	if !reflect.DeepEqual(oldSvc.Spec.Selector, newSvc.Spec.Selector) {
 		// Disjunctive union of Pods from both Service sets.
-		oldPodSet := sets.NewString(c.getPodsFromService(oldSvc)...)
-		newPodSet := sets.NewString(c.getPodsFromService(newSvc)...)
-		podKeys = oldPodSet.Difference(newPodSet).Union(newPodSet.Difference(oldPodSet))
+		oldPodSet = sets.NewString(c.getPodsFromService(oldSvc)...)
+		newPodSet = sets.NewString(c.getPodsFromService(newSvc)...)
+		podKeys = podKeys.Union(oldPodSet.Difference(newPodSet).Union(newPodSet.Difference(oldPodSet)))
 	}
 
 	for podKey := range podKeys {

pkg/agent/nodeportlocal/npl_agent_test.go

@@ -259,6 +259,24 @@ func TestSvcNamespaceUpdate(t *testing.T) {
 	assert.False(t, testData.portTable.RuleExists(defaultPodIP, defaultPort))
 }
 
+// TestSvcTypeUpdate updates Service type from ClusterIP to NodePort
+// and checks whether Pod annotations are removed.
+func TestSvcTypeUpdate(t *testing.T) {
+	testData, testSvc, testPod := setUpWithTestServiceAndPod(t)
+	defer testData.tearDown()
+
+	// Update Service type to NodePort.
+	testSvc.Spec.Type = "NodePort"
+	_, err := testData.k8sClient.CoreV1().Services(defaultNS).Update(context.TODO(), testSvc, metav1.UpdateOptions{})
+	require.NoError(t, err, "Service update failed")
+	t.Logf("successfully updated Service: %v", testSvc)
+
+	// Check that annotation and the rule are removed.
+	_, err = testData.pollForPodAnnotation(testPod.Name, false)
+	require.NoError(t, err, "Poll for annotation check failed")
+	assert.False(t, testData.portTable.RuleExists(defaultPodIP, defaultPort))
+}
+
 // TestSvcUpdateAnnotation updates the Service spec to disabled NPL. It then verifies that the Pod's
 // NPL annotation is removed and that the port table is updated.
 func TestSvcUpdateAnnotation(t *testing.T) {