Skip to content

Conversation

@adityaraj178
Copy link
Contributor

Closes #26154

Issue: When multiple applications shared the same DRY source repository/branch and hydrated to the same destination branch, but used different paths, the second app would fail to hydrate. It would incorrectly skip hydration because the first app had already been hydrated.

If the first app was hydrated in the batch, it assumed all apps were done
and it was only comparing drySha to decide whether to hydarte or not, ignored the condition that apps might write to different paths in the same repo

Changes:
Looped through all apps and check every app by comparing both drySha and path, only skip if all apps passes the condition

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Title of the PR
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

Signed-off-by: Aditya Raj <adityaraj10600@gmail.com>
@adityaraj178 adityaraj178 requested a review from a team as a code owner January 29, 2026 14:38
@bunnyshell
Copy link

bunnyshell bot commented Jan 29, 2026

✅ Preview Environment deployed on Bunnyshell

Component Endpoints
argocd https://argocd-oaklrp.bunnyenv.com/
argocd-ttyd https://argocd-web-cli-oaklrp.bunnyenv.com/

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔴 /bns:stop to stop the environment
  • 🚀 /bns:deploy to redeploy the environment
  • /bns:delete to remove the environment

@epini-dw
Copy link

I re-ran scenario 1 from the bug reproduction repo using an image I built with these changes and it didn't seem to fix the issue, unfortunately.

Logs
App/scenario-1-one.yaml
App/scenario-1-two.yaml

The git log for the hydrated branch only shows one commit for the DRY source:

* ddafa61 (hydrated) 354f4af: Update README with correct issue number
* 2f41c1e Initial commit

Searching through the commit-server logs, it also only pushes a new commit when the first app is added.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

hydrator: hydrator.metadata git note can prevent necessary Application hydration

2 participants