rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-07 01:44:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #470 from galal-hussein/set_cert_paths

Browse Source 
Set cluster certificate paths
This commit is contained in:
Alena Prokharchyk 2018-04-02 15:18:55 -07:00 committed by GitHub
commit 0503bb87ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/certificates.go
View File

@ -110,6 +110,9 @@ func getClusterCerts(ctx context.Context, kubeClient *kubernetes.Clientset, etcd
EnvName: string(secret.Data["EnvName"]), EnvName: string(secret.Data["EnvName"]),
ConfigEnvName: string(secret.Data["ConfigEnvName"]), ConfigEnvName: string(secret.Data["ConfigEnvName"]),
KeyEnvName: string(secret.Data["KeyEnvName"]), KeyEnvName: string(secret.Data["KeyEnvName"]),
Path: string(secret.Data["Path"]),
KeyPath: string(secret.Data["KeyPath"]),
ConfigPath: string(secret.Data["ConfigPath"]),
} }
} }
log.Infof(ctx, "[certificates] Successfully fetched Cluster certificates from Kubernetes") log.Infof(ctx, "[certificates] Successfully fetched Cluster certificates from Kubernetes")
@ -143,14 +146,17 @@ func saveCertToKubernetes(kubeClient *kubernetes.Clientset, crtName string, crt
if crt.Certificate != nil { if crt.Certificate != nil {
secretData["Certificate"] = cert.EncodeCertPEM(crt.Certificate) secretData["Certificate"] = cert.EncodeCertPEM(crt.Certificate)
secretData["EnvName"] = []byte(crt.EnvName) secretData["EnvName"] = []byte(crt.EnvName)
secretData["Path"] = []byte(crt.Path)
} }
if crt.Key != nil { if crt.Key != nil {
secretData["Key"] = cert.EncodePrivateKeyPEM(crt.Key) secretData["Key"] = cert.EncodePrivateKeyPEM(crt.Key)
secretData["KeyEnvName"] = []byte(crt.KeyEnvName) secretData["KeyEnvName"] = []byte(crt.KeyEnvName)
secretData["KeyPath"] = []byte(crt.KeyPath)
} }
if len(crt.Config) > 0 { if len(crt.Config) > 0 {
secretData["ConfigEnvName"] = []byte(crt.ConfigEnvName) secretData["ConfigEnvName"] = []byte(crt.ConfigEnvName)
secretData["Config"] = []byte(crt.Config) secretData["Config"] = []byte(crt.Config)
secretData["ConfigPath"] = []byte(crt.ConfigPath)
} }
go func() { go func() {
for { for {