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.

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

feat(cmp): cmp parameter to enable git creds to be shared (#8820) #15107

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

jmcshane
Copy link
Contributor

@jmcshane jmcshane commented Aug 18, 2023

Closes #8820
Closes #7995

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.
  • Optional. My organization is added to USERS.md.
  • 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.

This is a work in progress at this time to get input.

Fixes #14998

@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

Attention: Patch coverage is 60.00000% with 6 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@092bb73). Learn more about missing BASE report.
Report is 13 commits behind head on master.

Files with missing lines Patch % Lines
reposerver/repository/repository.go 57.14% 4 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##             master   #15107   +/-   ##
=========================================
  Coverage          ?   55.20%           
=========================================
  Files             ?      324           
  Lines             ?    55128           
  Branches          ?        0           
=========================================
  Hits              ?    30434           
  Misses            ?    22089           
  Partials          ?     2605           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jmcshane
Copy link
Contributor Author

Resolves #8820

@jmcshane jmcshane force-pushed the feat/opt-in-git-creds branch 2 times, most recently from 03cb53e to 0a01c3f Compare September 14, 2023 01:30
@jmcshane jmcshane marked this pull request as ready for review September 14, 2023 01:30
@jmcshane jmcshane changed the title feat(cmp): cmp parameter to enable git creds to be shared feat(cmp): cmp parameter to enable git creds to be shared (#8820) Sep 14, 2023
@jmcshane
Copy link
Contributor Author

This implementation is in line with the previous conversations in #8820 and #7995

@jmcshane
Copy link
Contributor Author

jmcshane commented Oct 5, 2023

The key difference between this implementation and what was reverted in #9105 is twofold:

  • The provideGitCreds field added in the spec of the ConfigManagementPlugin. This field value is retrieve by a new call executed by the reposerver to access metadata about the plugin.
  • The creds are appended to the environment within individual executions of the function runConfigManagementPluginSidecars rather than in the more global execution of getPluginEnvs

@thesuperzapper
Copy link

@pasha-codefresh @crenshaw-dev This is probably the closest thing we have to a resolution for #8820.

I think it's critical that ArgoCD plugins can access the ArgoCD credentials in some safe way, so I would appreciate your comments on this PRs approach.

@jmcshane jmcshane force-pushed the feat/opt-in-git-creds branch 3 times, most recently from c9d1c3a to c707616 Compare October 7, 2024 15:59
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Took a quick glance, just a few small things

docs/operator-manual/config-management-plugins.md Outdated Show resolved Hide resolved
reposerver/repository/repository.go Outdated Show resolved Hide resolved
reposerver/repository/repository.go Outdated Show resolved Hide resolved
test/e2e/testdata/cmp-gitsshcreds/plugin.yaml Show resolved Hide resolved
@jmcshane jmcshane force-pushed the feat/opt-in-git-creds branch 2 times, most recently from c01cb64 to 7335bf1 Compare October 8, 2024 09:59
@jmcshane
Copy link
Contributor Author

jmcshane commented Oct 8, 2024

@crenshaw-dev that test is passing now

@jmcshane jmcshane force-pushed the feat/opt-in-git-creds branch 5 times, most recently from 1ac42f1 to c800900 Compare October 11, 2024 13:08
@jmcshane
Copy link
Contributor Author

@crenshaw-dev would you be able to provide a pass back through this or remove the blocking review?

@jmcshane
Copy link
Contributor Author

We've had a good back and forth on this PR and I'm going to leave it at this point. I've regularly rebased the PR to the latest master to ensure that the tests are in a healthy state with recent changes and this will be the last time I do it until I get constructive feedback.

If other folks want to take up moving this forward, the PR should be in a good place to support this. I understand the constraints of managing a large open source project like this one, but I need to take my eye off this PR for the time being.

@jmcshane jmcshane force-pushed the feat/opt-in-git-creds branch 3 times, most recently from 5404e51 to 5105d61 Compare October 25, 2024 18:49
@jmcshane jmcshane force-pushed the feat/opt-in-git-creds branch 2 times, most recently from 687449d to c3cfe3b Compare October 25, 2024 20:55
@jmcshane
Copy link
Contributor Author

@crenshaw-dev that test is passing, the failed integration tests were related to flakiness on dev. Can this be merged?

@crenshaw-dev crenshaw-dev merged commit 3988861 into argoproj:master Oct 31, 2024
27 checks passed
@jmcshane jmcshane deleted the feat/opt-in-git-creds branch October 31, 2024 17:59
adriananeci pushed a commit to adriananeci/argo-cd that referenced this pull request Dec 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants