Merge pull request #46483 from shashidharatd/fed-sc-ut-delete

Automatic merge from submit-queue (batch tested with PRs 36721, 46483, 45500, 46724, 46036)

Federation: Minor corrections in service controller and add a unit testcase

**What this PR does / why we need it**:
This PR fixes few outdated comments in federation service controller and few other minor fixes.
This also adds a unit test case to test federated service deletion.


/assign @quinton-hoole 
/cc @marun @kubernetes/sig-federation-pr-reviews 

```release-note
NONE
```

federation/pkg/federation-controller/service/servicecontroller_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/cache"
@@ -34,6 +35,7 @@ import (
 	fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake"
 	"k8s.io/kubernetes/federation/pkg/federation-controller/service/ingress"
 	fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
+	"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
 	. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
 	"k8s.io/kubernetes/pkg/api/v1"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
@@ -71,6 +73,7 @@ func TestServiceController(t *testing.T) {
 	RegisterFakeOnUpdate(clusters, &fedClient.Fake, fedclusterWatch)
 	RegisterFakeOnCreate(services, &fedClient.Fake, fedServiceWatch)
 	RegisterFakeOnUpdate(services, &fedClient.Fake, fedServiceWatch)
+	RegisterFakeOnDelete(services, &fedClient.Fake, fedServiceWatch, serviceObjectGetter)
 
 	cluster1Client := &fakekubeclientset.Clientset{}
 	RegisterFakeList(services, &cluster1Client.Fake, &v1.ServiceList{Items: []v1.Service{}})
@@ -79,6 +82,7 @@ func TestServiceController(t *testing.T) {
 	c1EndpointWatch := RegisterFakeWatch(endpoints, &cluster1Client.Fake)
 	RegisterFakeOnCreate(services, &cluster1Client.Fake, c1ServiceWatch)
 	RegisterFakeOnUpdate(services, &cluster1Client.Fake, c1ServiceWatch)
+	RegisterFakeOnDelete(services, &cluster1Client.Fake, c1ServiceWatch, serviceObjectGetter)
 	RegisterFakeOnCreate(endpoints, &cluster1Client.Fake, c1EndpointWatch)
 	RegisterFakeOnUpdate(endpoints, &cluster1Client.Fake, c1EndpointWatch)
 
@@ -89,6 +93,7 @@ func TestServiceController(t *testing.T) {
 	c2EndpointWatch := RegisterFakeWatch(endpoints, &cluster2Client.Fake)
 	RegisterFakeOnCreate(services, &cluster2Client.Fake, c2ServiceWatch)
 	RegisterFakeOnUpdate(services, &cluster2Client.Fake, c2ServiceWatch)
+	RegisterFakeOnDelete(services, &cluster2Client.Fake, c2ServiceWatch, serviceObjectGetter)
 	RegisterFakeOnCreate(endpoints, &cluster2Client.Fake, c2EndpointWatch)
 	RegisterFakeOnUpdate(endpoints, &cluster2Client.Fake, c2EndpointWatch)
 
@@ -119,7 +124,6 @@ func TestServiceController(t *testing.T) {
 
 	service := NewService("test-service-1", 80)
 
-	// Test add federated service.
 	glog.Infof("Adding federated service")
 	fedServiceWatch.Add(service)
 	key := types.NamespacedName{Namespace: service.Namespace, Name: service.Name}.String()
@@ -194,19 +198,28 @@ func TestServiceController(t *testing.T) {
 	require.NoError(t, WaitForFederatedServiceUpdate(t, sc.serviceStore,
 		key, desiredService, serviceIngressCompare, wait.ForeverTestTimeout))
 
-	// Test update federated service.
 	glog.Infof("Test modifying federated service by changing the port")
 	service.Spec.Ports[0].Port = 9090
 	fedServiceWatch.Modify(service)
 	require.NoError(t, WaitForClusterService(t, sc.federatedInformer.GetTargetStore(), cluster1.Name,
 		key, service, wait.ForeverTestTimeout))
 
-	// Test cluster service is recreated when deleted.
 	glog.Infof("Test cluster service is recreated when deleted")
-	c1ServiceWatch.Delete(service)
+	c1Service := NewService("test-service-1", 80)
+	c1Service.DeletionTimestamp = &metav1.Time{Time: time.Now()}
+	c1ServiceWatch.Delete(c1Service)
 	require.NoError(t, WaitForClusterService(t, sc.federatedInformer.GetTargetStore(), cluster1.Name,
 		key, service, wait.ForeverTestTimeout))
 
+	glog.Infof("Test cluster services are deleted when federated service is deleted")
+	service.ObjectMeta.Finalizers = append(service.ObjectMeta.Finalizers, deletionhelper.FinalizerDeleteFromUnderlyingClusters)
+	service.DeletionTimestamp = &metav1.Time{Time: time.Now()}
+	fedServiceWatch.Modify(service)
+	require.NoError(t, WaitForClusterServiceDelete(t, sc.federatedInformer.GetTargetStore(), cluster1.Name,
+		key, wait.ForeverTestTimeout))
+	require.NoError(t, WaitForClusterServiceDelete(t, sc.federatedInformer.GetTargetStore(), cluster2.Name,
+		key, wait.ForeverTestTimeout))
+
 	close(stop)
 }
 
@@ -257,6 +270,15 @@ func TestGetOperationsToPerformOnCluster(t *testing.T) {
 	}
 }
 
+// serviceObjectGetter gives dummy service objects to use with RegisterFakeOnDelete
+// This is just so that federated informer can be tested for delete scenarios.
+func serviceObjectGetter(name, namespace string) runtime.Object {
+	service := new(v1.Service)
+	service.Namespace = namespace
+	service.Name = name
+	return service
+}
+
 func NewService(name string, port int32) *v1.Service {
 	return &v1.Service{
 		ObjectMeta: metav1.ObjectMeta{
@@ -306,6 +328,18 @@ func WaitForClusterService(t *testing.T, store fedutil.FederatedReadOnlyStore, c
 	return err
 }
 
+// WaitForClusterServiceDelete waits for the cluster service to be deleted.
+func WaitForClusterServiceDelete(t *testing.T, store fedutil.FederatedReadOnlyStore, clusterName, key string, timeout time.Duration) error {
+	err := wait.PollImmediate(retryInterval, timeout, func() (bool, error) {
+		_, found, _ := store.GetByKey(clusterName, key)
+		if !found {
+			return true, nil
+		}
+		return false, nil
+	})
+	return err
+}
+
 type serviceCompare func(current, desired *v1.Service) (match bool)
 
 func serviceStatusCompare(current, desired *v1.Service) bool {