From f52196397f7988b2d2a2693424a82fd86153a2f0 Mon Sep 17 00:00:00 2001
From: "Madhusudan.C.S" <madhusudancs@google.com>
Date: Thu, 26 Jan 2017 20:23:46 -0800
Subject: [PATCH] Added labels to the newly created objects.

---
 federation/pkg/kubefed/init/init.go | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go
index 680aceeda1d..30fe14a1769 100644
--- a/federation/pkg/kubefed/init/init.go
+++ b/federation/pkg/kubefed/init/init.go
@@ -550,6 +550,7 @@ func createControllerManagerSA(clientset *client.Clientset, namespace string, dr
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      ControllerManagerSA,
 			Namespace: namespace,
+			Labels:    componentLabel,
 		},
 	}
 	if dryRun {
@@ -564,24 +565,30 @@ func createRoleBindings(clientset *client.Clientset, namespace, saName string, d
 		// a role to use for bootstrapping the federation-controller-manager so it can access
 		// secrets in the host cluster to access other clusters.
 		ObjectMeta: metav1.ObjectMeta{
-			Name: roleName,
+			Name:      roleName,
+			Namespace: namespace,
+			Labels:    componentLabel,
 		},
 		Rules: []rbac.PolicyRule{
 			rbac.NewRule("get", "list", "watch").Groups(legacyAPIGroup).Resources("secrets").RuleOrDie(),
 		},
 	}
+
 	rolebinding := rbac.NewRoleBinding(roleName, namespace).SAs(namespace, saName).BindingOrDie()
+	rolebinding.Namespace = namespace
+	rolebinding.Labels = componentLabel
 
 	if dryRun {
-		newRole, err := clientset.Rbac().Roles(namespace).Create(role)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		newRolebinding, err := clientset.Rbac().RoleBindings(namespace).Create(&rolebinding)
-		return newRole, newRolebinding, err
+		return role, &rolebinding, nil
 	}
-	return role, &rolebinding, nil
+
+	newRole, err := clientset.Rbac().Roles(namespace).Create(role)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	newRolebinding, err := clientset.Rbac().RoleBindings(namespace).Create(&rolebinding)
+	return newRole, newRolebinding, err
 }
 
 func createControllerManager(clientset *client.Clientset, namespace, name, svcName, cmName, image, kubeconfigName, dnsZoneName, dnsProvider, saName string, dryRun bool) (*extensions.Deployment, error) {