From 4273d1d874604cd2ee53b2fb119c8ef0cc90acc7 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Thu, 19 Apr 2018 08:53:55 -0700
Subject: [PATCH 1/2] Use new rke-tools image

---
 cluster/plan.go | 2 +-
 pki/deploy.go   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cluster/plan.go b/cluster/plan.go
index 88fc23e7..c8855941 100644
--- a/cluster/plan.go
+++ b/cluster/plan.go
@@ -437,7 +437,7 @@ func (c *Cluster) BuildProxyProcess() v3.Process {
 	return v3.Process{
 		Name:          services.NginxProxyContainerName,
 		Env:           Env,
-		Args:          Env,
+		Args:          []string{"nginx-proxy"},
 		NetworkMode:   "host",
 		RestartPolicy: "always",
 		HealthCheck:   v3.HealthCheck{},
diff --git a/pki/deploy.go b/pki/deploy.go
index 41e256a2..84eda70c 100644
--- a/pki/deploy.go
+++ b/pki/deploy.go
@@ -46,6 +46,7 @@ func doRunDeployer(ctx context.Context, host *hosts.Host, containerEnv []string,
 	}
 	imageCfg := &container.Config{
 		Image: certDownloaderImage,
+		Cmd:   []string{"cert-deployer"},
 		Env:   containerEnv,
 	}
 	hostCfg := &container.HostConfig{

From dd9f37dbeef529e0cece263e2dfae64d1e016365 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Thu, 19 Apr 2018 08:54:15 -0700
Subject: [PATCH 2/2] Don't mask error

---
 cluster/plan.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cluster/plan.go b/cluster/plan.go
index c8855941..d00a1ebc 100644
--- a/cluster/plan.go
+++ b/cluster/plan.go
@@ -29,7 +29,10 @@ const (
 
 func GeneratePlan(ctx context.Context, rkeConfig *v3.RancherKubernetesEngineConfig, hostsInfoMap map[string]types.Info) (v3.RKEPlan, error) {
 	clusterPlan := v3.RKEPlan{}
-	myCluster, _ := ParseCluster(ctx, rkeConfig, "", "", nil, nil, nil)
+	myCluster, err := ParseCluster(ctx, rkeConfig, "", "", nil, nil, nil)
+	if err != nil {
+		return clusterPlan, err
+	}
 	// rkeConfig.Nodes are already unique. But they don't have role flags. So I will use the parsed cluster.Hosts to make use of the role flags.
 	uniqHosts := hosts.GetUniqueHostList(myCluster.EtcdHosts, myCluster.ControlPlaneHosts, myCluster.WorkerHosts)
 	for _, host := range uniqHosts {