diff --git a/.circleci/config.yml b/.circleci/config.yml index 734043d..0ad69cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -132,6 +132,7 @@ jobs: name: Push multiarch Docker image command: | apk add -U make bash curl + apk upgrade make manifest-push DOCKER_IMAGE_TAG=${CIRCLE_TAG:-latest} workflows: diff --git a/configmap-reload.go b/configmap-reload.go index 9aa2ab5..2f0431d 100644 --- a/configmap-reload.go +++ b/configmap-reload.go @@ -115,8 +115,11 @@ func main() { req.SetBasicAuth(userInfo.Username(), password) } } + + successfulReloadWebhook := false + for retries := *webhookRetries; retries != 0; retries-- { - log.Printf("performing webhook request (%d/%d)", retries, *webhookRetries+1) + log.Printf("performing webhook request (%d/%d)", retries, *webhookRetries) resp, err := http.DefaultClient.Do(req) if err != nil { setFailureMetrics(h.String(), "client_request_do") @@ -132,9 +135,16 @@ func main() { time.Sleep(time.Second * 10) continue } + setSuccessMetrict(h.String(), begun) log.Println("successfully triggered reload") - return + successfulReloadWebhook = true + break + } + + if !successfulReloadWebhook { + setFailureMetrics(h.String(), "retries_exhausted") + log.Println("error:", "Webhook reload retries exhausted") } } case err := <-watcher.Errors: