Merge pull request kubernetes#36294 from madhusudancs/federation-kubefed-init-10d

Automatic merge from submit-queue

[Federation][init-10d] Use the right service names in controller manager.

Please review only the last commit here. This is based on PR kubernetes#36048 which will be reviewed independently.

Design Doc: PR kubernetes#34484

cc @kubernetes/sig-cluster-federation @nikhiljindal

Author: Kubernetes Submit Queue

federation/pkg/kubefed/init/init.go

@@ -212,7 +212,7 @@ func initFederation(cmdOut io.Writer, config util.AdminConfig, cmd *cobra.Comman
 	}
 
 	// 7. Create federation controller manager
-	_, err = createControllerManager(hostClientset, initFlags.FederationSystemNamespace, initFlags.Name, cmName, image, cmKubeconfigName, dnsZoneName, dnsProvider)
+	_, err = createControllerManager(hostClientset, initFlags.FederationSystemNamespace, initFlags.Name, svc.Name, cmName, image, cmKubeconfigName, dnsZoneName, dnsProvider)
 	if err != nil {
 		return err
 	}
@@ -481,7 +481,7 @@ func createAPIServer(clientset *client.Clientset, namespace, name, image, creden
 	return clientset.Extensions().Deployments(namespace).Create(dep)
 }
 
-func createControllerManager(clientset *client.Clientset, namespace, name, cmName, image, kubeconfigName, dnsZoneName, dnsProvider string) (*extensions.Deployment, error) {
+func createControllerManager(clientset *client.Clientset, namespace, name, svcName, cmName, image, kubeconfigName, dnsZoneName, dnsProvider string) (*extensions.Deployment, error) {
 	dep := &extensions.Deployment{
 		ObjectMeta: api.ObjectMeta{
 			Name:      cmName,
@@ -503,7 +503,7 @@ func createControllerManager(clientset *client.Clientset, namespace, name, cmNam
 							Command: []string{
 								"/hyperkube",
 								"federation-controller-manager",
-								"--master=https://federation-apiserver",
+								fmt.Sprintf("--master=https://%s", svcName),
 								"--kubeconfig=/etc/federation/controller-manager/kubeconfig",
 								fmt.Sprintf("--dns-provider=%s", dnsProvider),
 								"--dns-provider-config=",

federation/pkg/kubefed/init/init_test.go

@@ -617,7 +617,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image,
 							Command: []string{
 								"/hyperkube",
 								"federation-controller-manager",
-								"--master=https://federation-apiserver",
+								"--master=https://" + svcName,
 								"--kubeconfig=/etc/federation/controller-manager/kubeconfig",
 								fmt.Sprintf("--dns-provider=%s", dnsProvider),
 								"--dns-provider-config=",