From 169792b3fbe5c9152152def55658b60bfc31732c Mon Sep 17 00:00:00 2001
From: Karan Goel <karangoel@google.com>
Date: Wed, 11 Apr 2018 09:45:23 -0700
Subject: [PATCH] Remove the default clustername, and make it optional in api

---
 cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go | 1 +
 cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go    | 4 ++--
 cmd/kubeadm/app/cmd/init.go                       | 2 +-
 cmd/kubeadm/app/cmd/join.go                       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
index b26e2a51d7..46d0535506 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
@@ -191,6 +191,7 @@ func SetDefaults_NodeConfiguration(obj *NodeConfiguration) {
 		obj.DiscoveryTimeout = &metav1.Duration{
 			Duration: DefaultDiscoveryTimeout,
 		}
+	}
 	if obj.ClusterName == "" {
 		obj.ClusterName = DefaultClusterName
 	}
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go
index 2c51755b1c..e677023dbe 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go
@@ -118,7 +118,7 @@ type MasterConfiguration struct {
 	FeatureGates map[string]bool `json:"featureGates,omitempty"`
 
 	// The cluster name
-	ClusterName string `json:"clusterName"`
+	ClusterName string `json:"clusterName,omitempty"`
 }
 
 // API struct contains elements of API server address.
@@ -230,7 +230,7 @@ type NodeConfiguration struct {
 	// CRISocket is used to retrieve container runtime info.
 	CRISocket string `json:"criSocket,omitempty"`
 	// ClusterName is the name for the cluster in kubeconfig.
-	ClusterName string `json:"clusterName"`
+	ClusterName string `json:"clusterName,omitempty"`
 
 	// DiscoveryTokenCACertHashes specifies a set of public key pins to verify
 	// when token-based discovery is used. The root CA found during discovery
diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go
index 21136d3c53..a1b7218ae9 100644
--- a/cmd/kubeadm/app/cmd/init.go
+++ b/cmd/kubeadm/app/cmd/init.go
@@ -108,7 +108,7 @@ var (
 
 // NewCmdInit returns "kubeadm init" command.
 func NewCmdInit(out io.Writer) *cobra.Command {
-	cfg := &kubeadmapiext.MasterConfiguration{ClusterName: "kubernetes"}
+	cfg := &kubeadmapiext.MasterConfiguration{}
 	legacyscheme.Scheme.Default(cfg)
 
 	var cfgPath string
diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go
index c4689a4823..d6fc5bfbea 100644
--- a/cmd/kubeadm/app/cmd/join.go
+++ b/cmd/kubeadm/app/cmd/join.go
@@ -102,7 +102,7 @@ var (
 
 // NewCmdJoin returns "kubeadm join" command.
 func NewCmdJoin(out io.Writer) *cobra.Command {
-	cfg := &kubeadmapiext.NodeConfiguration{ClusterName: "kubernetes"}
+	cfg := &kubeadmapiext.NodeConfiguration{}
 	legacyscheme.Scheme.Default(cfg)
 
 	var skipPreFlight bool