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

[RFC-007] Implement GitHub app authentication for git repositories in IAC #780

Merged
merged 1 commit into from
Feb 13, 2025
Merged

[RFC-007] Implement GitHub app authentication for git repositories in IAC #780

merged 1 commit into from
Feb 13, 2025

Conversation

dipti-pai
Copy link
Member

  • Controller change to use the GitHub authentication information specified in gitrepository.spec.secretRef to create the auth options to authenticate to git repositories when the gitrepository.spec.provider field is set to github,
  • Tests for new github provider field in IAC
  • Updated docs to use GitHub Apps for authentication in image-automation-controller.

@dipti-pai dipti-pai mentioned this pull request Oct 31, 2024
Open
15 tasks
makkes
makkes reviewed Nov 3, 2024
View reviewed changes
@stefanprodan stefanprodan mentioned this pull request Dec 6, 2024
Merged
@stefanprodan
Copy link
Member

@dipti-pai please rebase with main, it contains the latest auth and git packages with GitHub App support.

@stefanprodan stefanprodan mentioned this pull request Dec 7, 2024
Closed
@matheuscscp
Copy link
Member

matheuscscp commented Feb 11, 2025 •
edited
Loading

@dipti-pai Please rebase once again 🙏 To easily resolve the conflict in go.sum you can fetch the upstream remote, git checkout main -- go.sum, go mod tidy, git commit -as --amend and then rebase.

I have tested this PR with a private GH repo and a GH app with write access to only this repo and it works 👌

Screenshot from 2025-02-11 13-20-32

@matheuscscp
Copy link
Member

@dipti-pai I'm so sorry I asked you to rebase the other day, we could have waited until source-controller was released 😅

source-controller 1.5.0 is now released and bumped in the dependencies already, so if you rebase one last time and remove the temporary dependency on your fork we can finally merge this PR 🙏

@dipti-pai
[RFC-007] Implement GitHub app authentication for git repositories in…
f03a53d 
… IAC

- Controller change to use the GitHub authentication information specified in Git Repository's `.spec.secretRef` to create the auth options to authenticate to git repositories when the `provider` field is set to `github`,
- Tests for new `github` provider field in IAC
- Updated docs to use GitHub Apps for authentication in image-automation-controller.

Signed-off-by: Dipti Pai <[email protected]>
@dipti-pai
Copy link
Member Author

@dipti-pai I'm so sorry I asked you to rebase the other day, we could have waited until source-controller was released 😅

source-controller 1.5.0 is now released and bumped in the dependencies already, so if you rebase one last time and remove the temporary dependency on your fork we can finally merge this PR 🙏

No worries at all. Rebased again. Thanks.

matheuscscp
matheuscscp approved these changes Feb 13, 2025
View reviewed changes
Copy link
Member

@matheuscscp matheuscscp left a comment

Choose a reason for hiding this comment

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

Thanks @dipti-pai ❤️

@matheuscscp matheuscscp merged commit d5c29a3 into fluxcd:main Feb 13, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@makkes makkes makkes left review comments

@darkowlzz darkowlzz darkowlzz left review comments

@matheuscscp matheuscscp matheuscscp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dipti-pai @stefanprodan @matheuscscp @makkes @darkowlzz