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

add support for specified proxy in source GitRepository #565

Merged
merged 2 commits into from
Aug 23, 2023

Conversation

aryan9600
Copy link
Member

@aryan9600 aryan9600 commented Jul 31, 2023

Add support for using the proxy specified in the source GitRepository using its .spec.proxySecretRef.

also closes #575

Copy link
Member

@makkes makkes left a comment

Choose a reason for hiding this comment

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

Please add tests for the new behaviour.

@aryan9600
Copy link
Member Author

@hiddeco
Copy link
Member

hiddeco commented Aug 4, 2023

@aryan9600 but that doesn't test the wiring of Secret data to actually performing the operation, which should have coverage here.

@makkes
Copy link
Member

makkes commented Aug 4, 2023

@makkes the tests for proxy exist in pkg/git/gogit: https://github.com/fluxcd/pkg/blob/f775906949d5af477edc3a295b2b2283b918dca6/git/gogit/clone_test.go#L1131

That's great but this change adds a lot of code around the functionality from pkg/git/gogit that we should test.

@aryan9600
Copy link
Member Author

@makkes @hiddeco added tests

internal/controller/update_test.go Outdated Show resolved Hide resolved
makkes
makkes previously requested changes Aug 4, 2023
Makefile Outdated Show resolved Hide resolved
Add proxy support for Git operations using the proxy configuration
specified in the source GitRepository's `.spec.proxySecretRef`.

Refactor the Git client building process to make it more testable.

Signed-off-by: Sanskar Jaiswal <jaiswalsanskar078@gmail.com>
Retry reconciliation in `TestImageUpdateAutomationReconciler_deleteBeforeFinalizer`
as sometimes it fails with a latest version conflict error.

Signed-off-by: Sanskar Jaiswal <jaiswalsanskar078@gmail.com>
Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @aryan9600 🏅

@aryan9600 aryan9600 added enhancement New feature or request area/git Git related issues and pull requests labels Aug 23, 2023
@aryan9600 aryan9600 merged commit 1e0fad1 into main Aug 23, 2023
9 checks passed
@aryan9600 aryan9600 deleted the proxy-options branch August 23, 2023 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/git Git related issues and pull requests enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flaky test TestImageUpdateAutomationReconciler_deleteBeforeFinalizer
4 participants