kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6657 from drekle/openstack_env_escaping 

Openstack environment escaping
This commit is contained in:
Kubernetes Prow Robot 2019-03-22 08:34:25 -07:00 committed by GitHub
parent 21273ed160 b09bb9eb37
commit 6e20d2ee7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodeup/pkg/bootstrap/install.go
View File

@ -151,11 +151,11 @@ func (i *Installation) buildSystemdJob() *nodetasks.Service {
"OS_AUTH_URL",
"OS_REGION_NAME",
} {
buffer.WriteString("\"")
buffer.WriteString("'")
buffer.WriteString(envVar)
buffer.WriteString("=")
buffer.WriteString(os.Getenv(envVar))
buffer.WriteString("\" ")
buffer.WriteString("' ")
}
}

2
pkg/model/bootstrapscript.go
View File

@ -83,7 +83,7 @@ func (b *BootstrapScript) buildEnvironmentVariables(cluster *kops.Cluster) (map[
"OS_AUTH_URL",
"OS_REGION_NAME",
} {
env[envVar] = os.Getenv(envVar)
env[envVar] = fmt.Sprintf("'%s'", os.Getenv(envVar))
}
}