Skip to content

Commit 2deb457

Browse files
authored
Merge pull request #16785 from justinsb/better_error_message_around_challenge
refactor: give clear error message if challenge endpoint cannot be found
2 parents 2a71599 + 6a2a723 commit 2deb457

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

cmd/kops-controller/pkg/server/server.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,12 @@ func (s *Server) bootstrap(w http.ResponseWriter, r *http.Request) {
210210
}
211211

212212
if model.UseChallengeCallback(kops.CloudProviderID(s.opt.Cloud)) {
213+
if id.ChallengeEndpoint == "" {
214+
klog.Infof("cannot determine endpoint for bootstrap callback challenge from %q", r.RemoteAddr)
215+
w.WriteHeader(http.StatusBadRequest)
216+
_, _ = w.Write([]byte("callback failed"))
217+
return
218+
}
213219
if err := s.challengeClient.DoCallbackChallenge(ctx, s.opt.ClusterName, id.ChallengeEndpoint, req); err != nil {
214220
klog.Infof("bootstrap %s callback challenge failed: %v", r.RemoteAddr, err)
215221
w.WriteHeader(http.StatusBadRequest)

0 commit comments

Comments
 (0)