diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go
index 22544c23a64..e5f17580d68 100644
--- a/cmd/kubeadm/app/cmd/init.go
+++ b/cmd/kubeadm/app/cmd/init.go
@@ -186,9 +186,6 @@ func (i *Init) Run(out io.Writer) error {
 
 	// PHASE 2: Generate kubeconfig files for the admin and the kubelet
 
-	// TODO this is not great, but there is only one address we can use here
-	// so we'll pick the first one, there is much of chance to have an empty
-	// slice by the time this gets called
 	masterEndpoint := fmt.Sprintf("https://%s:%d", i.cfg.API.AdvertiseAddress, i.cfg.API.BindPort)
 	err = kubeconfigphase.CreateInitKubeConfigFiles(masterEndpoint, kubeadmapi.GlobalEnvParams.HostPKIPath, kubeadmapi.GlobalEnvParams.KubernetesDir)
 	if err != nil {