Maintain original scheme when using --token-auth #3117
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stefanprodan
added
bug
hiddeco
reviewed
Sep 19, 2022
|
Thanks, @hiddeco! Good suggestion. |
|
@carlosonunez-vmw please squash the two commits |
hiddeco
approved these changes
Sep 22, 2022
carlosonunez-vmw
force-pushed
the
main
branch
2 times, most recently
from
34bf153
to
fcb09a2
Compare
If you're using an HTTP-based Git server with Flux, you need to provide `--token-auth` to avoid triggering an SSH host key check (see [here](fluxcd#2825 (comment))). Unfortunately, doing this forces the URL in the `GitRepository` resource created during bootstrapping to always use `https`. This will cause Kustomization reconcile errors for servers that do not have HTTPS enabled or do not have the appropriate certs installed or available. This pull request fixes this by keeping the repository URL scheme intact when using `--token-auth`. Signed-off-by: Carlos Nunez <75340335+carlosonunez-vmw@users.noreply.github.com>
carlosonunez-vmw
force-pushed
the
main
branch
from
fcb09a2
to
45a00a0
Compare
|
done; @stefanprodan PTAL |
stefanprodan
approved these changes
Sep 28, 2022
|
you're welcome!-- CarlosOn Sep 28, 2022, at 00:36, Stefan Prodan ***@***.***> wrote:
@stefanprodan approved this pull request.
LGTM
Thanks @carlosonunez-vmw 🥇
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3116.
If you're using an HTTP-based Git server with Flux, you need to provide
--token-authto avoid triggering an SSH host key check (see #2825). Unfortunately, doing this forces the URL in theGitRepositoryresource created during bootstrapping to always usehttps. This will cause Kustomization reconcile errors for servers that do not have HTTPS enabled or do not have the appropriate certs installed or available.This pull request fixes this by keeping the repository URL scheme intact when using
--token-auth.Signed-off-by: Carlos Nunez 75340335+carlosonunez-vmw@users.noreply.github.com