fix kubeconfig to use correct cluster name (kubernetes-sigs#457)

Signed-off-by: Ashish Amarnath <[email protected]>

.gitignore

@@ -41,3 +41,6 @@ kubeconfig
 /bazel-genfiles
 /bazel-out
 /bazel-testlogs
+
+# vscode
+.vscode

pkg/cloud/aws/services/certificates/certificates.go

@@ -143,7 +143,7 @@ func NewSelfSignedCACert(key *rsa.PrivateKey) (*x509.Certificate, error) {
 }
 
 // NewKubeconfig creates a new Kubeconfig where endpoint is the ELB endpoint.
-func NewKubeconfig(endpoint string, caCert *x509.Certificate, caKey *rsa.PrivateKey) (*api.Config, error) {
+func NewKubeconfig(clusterName, endpoint string, caCert *x509.Certificate, caKey *rsa.PrivateKey) (*api.Config, error) {
 	cfg := &Config{
 		CommonName:   "kubernetes-admin",
 		Organization: []string{"system:masters"},
@@ -160,8 +160,6 @@ func NewKubeconfig(endpoint string, caCert *x509.Certificate, caKey *rsa.Private
 		return nil, errors.Wrap(err, "unable to sign certificate")
 	}
 
-	// TODO: make this configurable.
-	clusterName := "test1"
 	userName := "kubernetes-admin"
 	contextName := fmt.Sprintf("%s@%s", userName, clusterName)
 

pkg/deployer/deployer.go

@@ -90,7 +90,7 @@ func (d *Deployer) GetKubeConfig(cluster *clusterv1.Cluster, _ *clusterv1.Machin
 
 	server := fmt.Sprintf("https://%s:6443", dnsName)
 
-	cfg, err := certificates.NewKubeconfig(server, cert, key)
+	cfg, err := certificates.NewKubeconfig(cluster.Name, server, cert, key)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to generate a kubeconfig")
 	}