rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-14 06:00:53 +00:00
Code Issues Releases Wiki Activity

updates for prefix path

Browse Source
This commit is contained in:
Luther Monson
2020-08-05 15:39:25 -07:00
parent 7d6181a290
commit 23d2341172
5 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pki/deploy.go
View File

@@ -24,9 +24,16 @@ const (
StateDeployerContainerName = "cluster-state-deployer"
)
func DeployCertificatesOnPlaneHost(ctx context.Context, host *hosts.Host, rkeConfig v3.RancherKubernetesEngineConfig, crtMap map[string]CertificatePKI, certDownloaderImage string, prsMap map[string]v3.PrivateRegistry, forceDeploy bool) error {
func DeployCertificatesOnPlaneHost(
ctx context.Context,
host *hosts.Host,
rkeConfig v3.RancherKubernetesEngineConfig,
crtMap map[string]CertificatePKI,
certDownloaderImage string,
prsMap map[string]v3.PrivateRegistry,
forceDeploy bool,
env []string) error {
crtBundle := GenerateRKENodeCerts(ctx, rkeConfig, host.Address, crtMap)
env := []string{}
// Strip CA key as its sensitive and unneeded on nodes without controlplane role
if !host.IsControl {
@@ -119,12 +126,13 @@ func doRunDeployer(ctx context.Context, host *hosts.Host, containerEnv []string,
if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, certDownloaderImage, CertificatesServiceName, prsMap); err != nil {
return err
}
imageCfg := &container.Config{
Image: certDownloaderImage,
Cmd: []string{"cert-deployer"},
Env: containerEnv,
}
if host.DockerInfo.OSType == "windows" { // compatible with Windows
if host.IsWindows() { // compatible with Windows
imageCfg = &container.Config{
Image: certDownloaderImage,
Cmd: []string{
@@ -139,7 +147,7 @@ func doRunDeployer(ctx context.Context, host *hosts.Host, containerEnv []string,
},
Privileged: true,
}
if host.DockerInfo.OSType == "windows" { // compatible with Windows
if host.IsWindows() { // compatible with Windows
hostCfg = &container.HostConfig{
Binds: []string{
fmt.Sprintf("%s:c:/etc/kubernetes", path.Join(host.PrefixPath, "/etc/kubernetes")),