Azure doc updated (#328)

pharmer · Dec 11, 2017 · 15338a1 · 15338a1
1 parent fa61c44
commit 15338a1
Show file tree

Hide file tree

Showing 6 changed files with 688 additions and 12 deletions.
diff --git a/cloud/providers/azure/apply.go b/cloud/providers/azure/apply.go
@@ -307,6 +307,7 @@ func (cm *ClusterManager) applyCreate(dryRun bool) (acts []api.Action, err error
 			Message:  fmt.Sprintf("Masater network interface %v will be created", cm.namer.NetworkInterfaceName(cm.namer.MasterName())),
 		})
 		if !dryRun {
+			cm.cluster.Spec.MasterInternalIP = "10.240.1.4"
 			if masterNIC, err = cm.conn.createNetworkInterface(cm.namer.NetworkInterfaceName(cm.namer.MasterName()), sg, sn, network.Static, cm.cluster.Spec.MasterInternalIP, masterPIP); err != nil {
 				return
 			}

diff --git a/cloud/providers/azure/startupscript.go b/cloud/providers/azure/startupscript.go
@@ -75,7 +75,7 @@ func newNodeTemplateData(ctx context.Context, cluster *api.Cluster, ng *api.Node
 		td.CloudConfig = string(data)
 
 		// ref: https://github.com/kubernetes/kubernetes/blob/1910086bbce4f08c2b3ab0a4c0a65c913d4ec921/cmd/kubeadm/app/phases/controlplane/manifests.go#L41
-		td.KubeletExtraArgs["cloud-config"] = "/etc/kubernetes/pharmer/cloud-config"
+		//td.KubeletExtraArgs["cloud-config"] = "/etc/kubernetes/ccm/cloud-config"
 
 		// Kubeadm will send cloud-config to kube-apiserver and kube-controller-manager
 		// ref: https://github.com/kubernetes/kubernetes/blob/1910086bbce4f08c2b3ab0a4c0a65c913d4ec921/cmd/kubeadm/app/phases/controlplane/manifests.go#L193

diff --git a/credential/cmds/create.go b/credential/cmds/create.go
@@ -89,8 +89,10 @@ func runCreateCredential(ctx context.Context, cmd *cobra.Command, args []string)
 			if err != nil {
 				term.Fatalln(err)
 			}
+		} else {
+			return fmt.Errorf("can't issue credential for provider %s", provider)
 		}
-		return fmt.Errorf("can't issue credential for provider %s", provider)
+		return nil
 	}
 
 	cred := &api.Credential{