Retry update_kubernetes_deployment push on concurrent-push race - #90
Closed
Christdej wants to merge 1 commit into
Closed
Retry update_kubernetes_deployment push on concurrent-push race#90Christdej wants to merge 1 commit into
Christdej wants to merge 1 commit into
Conversation
Contributor
Author
|
Closing for now — the concurrent-push race has only been observed once so far. Will reopen (or recreate) if the flake recurs. |
Christdej
deleted the
fix/update-kubernetes-deployment-retry-with-rebase
branch
August 17, 2026 05:16
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
update_kubernetes_deployment.ymlhitting the same infrastructure repomainat once race ongit push— one wins, the rest fail with a non-fast-forward reject and require a manual rerun. Observed as a flake onsara-timeseriesdeploy_to_developmentafter the SARA promote fanned out multiple tag bumps againstanalytics-infrastructuremain.git fetch origin main && git reset --hard origin/main, re-applies thesed, commits, and pushes. If another job's commit landed in between, the reset picks it up and we replay on top; thesedis idempotent so no data is lost.Update image tag in kustomization+Commit and push changes) into a single step so the retry envelops both. Explicitgit push origin HEAD:mainto keep the refspec unambiguous.Behaviour
Test plan
sed/greplogic unchanged; only the surrounding control flow moved.deploy_to_developmentfan-out will exercise it. Since this workflow isworkflow_call-only, no additional trigger wiring needed.