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

Avoid panic if cert or key of a secret is not found

Browse Source
This commit is contained in:
galal-hussein 2018-09-04 21:26:59 +02:00 committed by Alena Prokharchyk
parent 3c76263096
commit f314d1dc96
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/certificates.go
View File

@ -140,14 +140,23 @@ func getClusterCerts(ctx context.Context, kubeClient *kubernetes.Clientset, etcd
return nil, err return nil, err
} }
// If I can't find an etcd cert, I will not fail and will create it later. // If I can't find an etcd cert, I will not fail and will create it later.
if secret == nil && strings.HasPrefix(certName, "kube-etcd") { if (secret == nil || secret.Data == nil) && strings.HasPrefix(certName, "kube-etcd") {
certMap[certName] = pki.CertificatePKI{} certMap[certName] = pki.CertificatePKI{}
continue continue
} }
secretCert, _ := cert.ParseCertsPEM(secret.Data["Certificate"]) secretCert, err := cert.ParseCertsPEM(secret.Data["Certificate"])
secretKey, _ := cert.ParsePrivateKeyPEM(secret.Data["Key"]) if err != nil {
return nil, fmt.Errorf("Failed to parse certificate of %s: %v", certName, err)
}
secretKey, err := cert.ParsePrivateKeyPEM(secret.Data["Key"])
if err != nil {
return nil, fmt.Errorf("Failed to parse private key of %s: %v", certName, err)
}
secretConfig := string(secret.Data["Config"]) secretConfig := string(secret.Data["Config"])
if len(secretCert) == 0 || secretKey == nil {
return nil, fmt.Errorf("certificate or key of %s is not found", certName)
}
certMap[certName] = pki.CertificatePKI{ certMap[certName] = pki.CertificatePKI{
Certificate: secretCert[0], Certificate: secretCert[0],
Key: secretKey.(*rsa.PrivateKey), Key: secretKey.(*rsa.PrivateKey),