From 2f00e0eeba8509dc8686a710308592b73a627726 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Sat, 5 Nov 2016 16:10:40 -0700 Subject: [PATCH] [Federation][init-10d] Use the right service and dns provider names in controller manager. --- federation/pkg/kubefed/init/init.go | 6 +++--- federation/pkg/kubefed/init/init_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index 92b4dbf91d9..8aea0c96fcc 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/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=", diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 534e3475d2e..09ea41526d2 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/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=",