Skip to content

Commit 4db7073

Browse files
authored
Backport lastErr issue during cluster join (v2) (#297)
Backports #296.
2 parents 18d5006 + 4728c04 commit 4db7073

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

internal/rest/resources/control.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,13 @@ func joinWithToken(state state.State, r *http.Request, req *internalTypes.Contro
218218
cert, err := shared.GetRemoteCertificate(url.String(), "")
219219
if err != nil {
220220
logger.Warn("Failed to get certificate of cluster member", logger.Ctx{"address": url.String(), "error": err})
221+
lastErr = err
221222
continue
222223
}
223224

224225
fingerprint := shared.CertFingerprint(cert)
225226
if fingerprint != token.Fingerprint {
226-
logger.Warn("Cluster certificate token does not match that of cluster member", logger.Ctx{"address": url.String(), "fingerprint": fingerprint, "expected": token.Fingerprint})
227-
continue
227+
return nil, fmt.Errorf("Cluster certificate token does not match that of cluster member. Expected: %q, actual: %q", fingerprint, token.Fingerprint)
228228
}
229229

230230
d, err := internalClient.New(*url, state.ServerCert(), cert, false)

0 commit comments

Comments
 (0)