Skip to content

Conversation

@p-se
Copy link
Contributor

@p-se p-se commented Jan 8, 2026

Refers to #4502

Additional Information

Checklist

  • I have updated the documentation via a pull request in the
    fleet-docs repository.

p-se and others added 5 commits January 8, 2026 12:47
and go-getter is used to clone an HTTPS git repository.

(cherry picked from commit 948a7e9)
Co-authored-by: Corentin Néau <[email protected]>
(cherry picked from commit 7e218f7)
Co-authored-by: Copilot <[email protected]>
(cherry picked from commit 7bcad2f)
When cloning content with git over HTTPS with different settings, a race
could still occur. By ensuring that every cloning with git over HTTPS,
regardless the settings of all bundles, we ensure there isn't a race.

This is actually suboptimal, as bundles with equal settings could
theoretically be cloned concurrently. However, should the need for this
actually arise, it would be cleaner and more maintainable to extend the
functionality of go-getter than having to use locks for this
functionality in our code at all.

The lock still ensures that all other fetch operations of bundle
creation (including fetch of content with go-getter that is using git
over HTTPS) can run concurrently.

(cherry picked from commit bd51100)
* Fix octal number interpretation in cache key calculation

The date +%j format returns values with leading zeros (e.g., 008 for
January 8th). Bash interprets numbers with leading zeros as octal in
arithmetic expressions, causing an error since octal only supports
digits 0-7.

Use date +%-j instead to get the day of year without leading zeros,
avoiding the octal interpretation issue.

* Extract cache key logic to shared script

Move the cache key determination logic to a reusable script to reduce
redundancy across 7 workflow files.

(cherry picked from commit fb55b29)
@p-se p-se marked this pull request as ready for review January 8, 2026 11:56
@p-se p-se requested a review from a team as a code owner January 8, 2026 11:56
@kkaempf kkaempf added this to the v2.13.2 milestone Jan 8, 2026
@kkaempf kkaempf added this to Fleet Jan 8, 2026
@kkaempf kkaempf moved this to 👀 In review in Fleet Jan 8, 2026
@kkaempf kkaempf removed this from Fleet Jan 8, 2026
@0xavi0 0xavi0 changed the title Issue 4487 backport v2.13 v0.14 [v0.14] - Prevent race when bundles are created concurrently Jan 8, 2026
@weyfonk weyfonk merged commit 7d79996 into rancher:release/v0.14 Jan 9, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants