Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: repository.Init() to Add gitRepoPaths using the proper new cache key format #20962

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: repository.Init() to Add gitRepoPaths using the proper new cache key format #20962

wants to merge 1 commit into from
+6 −1

Conversation

jpbelangerupgrade
Copy link

@jpbelangerupgrade jpbelangerupgrade commented Nov 26, 2024 •
edited
Loading

Regression from #18388

The gitRepoPaths cache key was updated to now include not just the repository url but the repository Project. Since during init we have no way of knowing the repository project. At least add that repository into cache as the "default" / undefined project.

Note: Cherrypicking this in all active release would be great given 2.12+ are all impacted.

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 Toolchain Guide
  • 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).

@jpbelangerupgrade jpbelangerupgrade requested a review from a team as a code owner November 26, 2024 14:44
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Nov 26, 2024 •
edited
Loading

✅ Preview Environment deployed on Bunnyshell

Component Endpoints
argocd https://argocd-l7syi3.bunnyenv.com/
argocd-ttyd https://argocd-web-cli-l7syi3.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

@jpbelangerupgrade
Fix repository.Init() to Add gitRepoPaths using the proper new cache …
c6534c0 
…key format

Signed-off-by: Jean-Philippe Bélanger <30598824+jpbelangerupgrade@users.noreply.github.com>
@jpbelangerupgrade
Copy link
Author

jpbelangerupgrade commented Nov 26, 2024 •
edited
Loading

We use pre-cloned repository so if a repository is already cloned, before it would cache that repo location. Now because of the project key, it’s ignoring the existing cloned repository and cloning a new one.
There are also other using persistent volume for their repo-server to have long live repo. Since some apparently have monorepo in the 20+ gig size.

So before this change. we’d end up with twice the repo cloned.
After, the cache is use and our existing cloned repo is getting used again (same as 2.11.x)

andrii-korotkov-verkada
andrii-korotkov-verkada reviewed Nov 27, 2024
View reviewed changes
reposerver/repository/repository.go
return err
}

s.gitRepoPaths.Add(string(keyData), fullPath)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we update getters as well? How does it work?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All other "Get" (GetPath and GetPathIfExists) have been updated already to use the Project with the composite key. Add was left behind apparently in the original PR

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

@andrii-korotkov-verkada andrii-korotkov-verkada andrii-korotkov-verkada approved these changes

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
ready-for-review
Projects
Argo CD Review
Status: Ready for final review
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jpbelangerupgrade @andrii-korotkov-verkada