rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-26 23:43:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1978 from rmweir/redundant-errors

Browse Source 
No longer add first errors twice
This commit is contained in:
rmweir
2020-03-18 17:15:34 -07:00
committed by GitHub
parent e842b8b637 4b5d4cbf6c
commit 5c075473e2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/etcd.go
View File

@@ -213,10 +213,11 @@ func validateCerts(state cluster.State) error {
if _, err := cert.Verify(x509.VerifyOptions{Roots: certPool, KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}}); err != nil { if _, err := cert.Verify(x509.VerifyOptions{Roots: certPool, KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}}); err != nil {
if failedErrs == nil { if failedErrs == nil {
failedErrs = fmt.Errorf("Certificate [%s] failed verification: %v", certPKI.Name, err) failedErrs = fmt.Errorf("Certificate [%s] failed verification: %v", certPKI.Name, err)
} } else {
failedErrs = errors.Wrap(failedErrs, fmt.Sprintf("Certificate [%s] failed verification: %v", certPKI.Name, err)) failedErrs = errors.Wrap(failedErrs, fmt.Sprintf("Certificate [%s] failed verification: %v", certPKI.Name, err))
} }
} }
}
if failedErrs != nil { if failedErrs != nil {
return errors.Wrap(failedErrs, "[etcd] Failed to restore etcd snapshot: invalid certs") return errors.Wrap(failedErrs, "[etcd] Failed to restore etcd snapshot: invalid certs")
} }