rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-20 10:59:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #524 from ibuildthecloud/master

Browse Source 
WIP Use new rke-tools image
This commit is contained in:
Alena Prokharchyk
2018-04-19 11:07:22 -07:00
committed by GitHub
parent c490a0b989 dd9f37dbee
commit d49016714a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/plan.go
View File

@@ -29,7 +29,10 @@ const (
func GeneratePlan(ctx context.Context, rkeConfig *v3.RancherKubernetesEngineConfig, hostsInfoMap map[string]types.Info) (v3.RKEPlan, error) { func GeneratePlan(ctx context.Context, rkeConfig *v3.RancherKubernetesEngineConfig, hostsInfoMap map[string]types.Info) (v3.RKEPlan, error) {
clusterPlan := v3.RKEPlan{} 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. // 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) uniqHosts := hosts.GetUniqueHostList(myCluster.EtcdHosts, myCluster.ControlPlaneHosts, myCluster.WorkerHosts)
for _, host := range uniqHosts { for _, host := range uniqHosts {
@@ -437,7 +440,7 @@ func (c *Cluster) BuildProxyProcess() v3.Process {
return v3.Process{ return v3.Process{
Name: services.NginxProxyContainerName, Name: services.NginxProxyContainerName,
Env: Env, Env: Env,
Args: Env, Args: []string{"nginx-proxy"},
NetworkMode: "host", NetworkMode: "host",
RestartPolicy: "always", RestartPolicy: "always",
HealthCheck: v3.HealthCheck{}, HealthCheck: v3.HealthCheck{},

1
pki/deploy.go
View File

@@ -46,6 +46,7 @@ func doRunDeployer(ctx context.Context, host *hosts.Host, containerEnv []string,
} }
imageCfg := &container.Config{ imageCfg := &container.Config{
Image: certDownloaderImage, Image: certDownloaderImage,
Cmd: []string{"cert-deployer"},
Env: containerEnv, Env: containerEnv,
} }
hostCfg := &container.HostConfig{ hostCfg := &container.HostConfig{