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

Enable Managed Transport by default #369

Merged
merged 3 commits into from
Jun 2, 2022

Conversation

pjbgf
Copy link
Member

@pjbgf pjbgf commented May 27, 2022

  • Enable Managed Transport by default
  • Update to latest source-controller to benefit from Managed Transport improvements:
    • Panic recovery for Git operations.
    • Improved SSH connection management without use of caching.
    • Enforce context timeout for managed SSH.
    • Remove dependency to callback functions.
    • Add support for hashed known_hosts.
  • Fixes regression introduced by Fix bug when pushing into different branch #330 by which IAC will fail to update a push branch when the push branch already exists and the checkout branch is ahead.

Test image: ghcr.io/fluxcd/image-automation-controller:rc-48bcca59

@pjbgf pjbgf added this to the GA milestone May 27, 2022
@pjbgf pjbgf changed the base branch from libgit2-cacheless-conns to main May 27, 2022 13:26
@pjbgf pjbgf added the hold Issues and pull requests put on hold label May 27, 2022
@pjbgf pjbgf force-pushed the libgit2-cacheless-conns branch 3 times, most recently from e6fe7c0 to 7444a05 Compare May 27, 2022 19:55
@pjbgf pjbgf removed the hold Issues and pull requests put on hold label May 27, 2022
@pjbgf pjbgf force-pushed the libgit2-cacheless-conns branch 2 times, most recently from 2afe95d to 48bcca5 Compare May 27, 2022 21:14
@pjbgf
Copy link
Member Author

pjbgf commented May 27, 2022

Encountered a few issues whilst updating source-controller which resulted in fixing a regression and creating a new issue for the follow-up task of enabling the tests to run against the Managed Transport version of the controller.

@pjbgf
Copy link
Member Author

pjbgf commented May 27, 2022

Manually tested on both GitHub and DevOps.

image
image

Paulo Gomes added 2 commits June 1, 2022 21:03
GitManagedTransport enables the use of Managed Transport. This replaces
the previous 'EXPERIMENTAL_GIT_TRANSPORT' environment variable that was
used for the same result. This commit also enables it by default.

This is an opt-out feature, which can be disabled by starting the
controller with the argument '--feature-gates=GitManagedTransport=false'.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
- Panic recovery for Git operations.
- Improved SSH connection management without use of caching.
- Enforce context timeout for managed SSH.
- Remove dependency to callback functions.
- Add support for hashed known_hosts.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
@stefanprodan stefanprodan force-pushed the libgit2-cacheless-conns branch 2 times, most recently from 1a129d4 to e07a9ec Compare June 1, 2022 18:08
Fixes regression in which IAC will fail to update push branch
when the push branch already exists and checkout branch is
ahead.

The reconciliation errors with: 'cannot push because a reference
that you are trying to update on the remote contains commits
that are not present locally.'

Regression introduced on fluxcd#330.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
@hiddeco hiddeco merged commit dac3c33 into fluxcd:main Jun 2, 2022
aryan9600 pushed a commit to aryan9600/image-automation-controller that referenced this pull request Jun 2, 2022
Fixes regression in which we fail to push to a branch after switching to
a branch, if origin is ahead of local. Fixed by setting the upstream
commit as the local branch target.

Regression introduced in fluxcd#330, and partially addressed in fluxcd#369.

Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
aryan9600 pushed a commit to aryan9600/image-automation-controller that referenced this pull request Jun 2, 2022
Fixes regression in which we fail to push to a branch after switching to
a branch, if origin is ahead of local. Fixed by setting the upstream
commit as the local branch target.

Regression introduced in fluxcd#330, and partially addressed in fluxcd#369.

Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
aryan9600 pushed a commit to aryan9600/image-automation-controller that referenced this pull request Jun 2, 2022
Fixes regression in which we fail to push to a branch after switching to
a branch, if origin is ahead of local. Fixed by setting the upstream
commit as the local branch target.

Regression introduced in fluxcd#330, and partially addressed in fluxcd#369.

Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
aryan9600 pushed a commit to aryan9600/image-automation-controller that referenced this pull request Jun 2, 2022
Fixes regression in which we fail to push to a branch after switching to
a branch, if origin is ahead of local. Fixed by setting the upstream
commit as the local branch target.

Regression introduced in fluxcd#330, and partially addressed in fluxcd#369.

Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
aryan9600 pushed a commit to aryan9600/image-automation-controller that referenced this pull request Jun 2, 2022
Fixes regression in which we fail to push to a branch after switching to
a branch, if origin is ahead of local. Fixed by setting the upstream
commit as the local branch target.

Regression introduced in fluxcd#330, and partially addressed in fluxcd#369.

Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
@pjbgf pjbgf deleted the libgit2-cacheless-conns branch June 7, 2022 11:17
souleb pushed a commit to souleb/image-automation-controller that referenced this pull request Mar 12, 2024
Fixes regression in which we fail to push to a branch after switching to
a branch, if origin is ahead of local. Fixed by setting the upstream
commit as the local branch target.

Regression introduced in fluxcd#330, and partially addressed in fluxcd#369.

Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants