Skip to content

[release/1.6] Fix ambiguous tls fallback#9300

Merged
samuelkarp merged 2 commits intocontainerd:release/1.6from
dmcgowan:1.6-fix-ambiguous-tls-fallback
Oct 29, 2023
Merged

[release/1.6] Fix ambiguous tls fallback#9300
samuelkarp merged 2 commits intocontainerd:release/1.6from
dmcgowan:1.6-fix-ambiguous-tls-fallback

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Backport

The TLS fallback should only be used when the protocol is ambiguous due
to provided TLS configurations and defaulting to http. Do not add TLS
configurations when defaulting to http. When the port is 80 or will be
defaulted to 80, there is no protocol ambiguity and TLS fallback should
not be used.

Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit d48ceb6)
Signed-off-by: Derek McGowan <[email protected]>
When the HTTP fallback is used, the scheme changes from HTTPS to HTTP
which can cause a mismatch on redirect, causing the authorizer to get
stripped out. Since the redirect host must match the redirect host in
this case, credentials are only sent to the same origin host that
returned the redirect.

This fixes an issue for a push getting a 401 unauthorized on the PUT
request even though credentials are available.

Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit 466ee87)
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan changed the base branch from main to release/1.6 October 26, 2023 04:49
@dmcgowan dmcgowan closed this Oct 26, 2023
@dmcgowan dmcgowan reopened this Oct 26, 2023
@containerd containerd deleted a comment from k8s-ci-robot Oct 26, 2023
@samuelkarp
Copy link
Copy Markdown
Member

/retest

@samuelkarp
Copy link
Copy Markdown
Member

k8s-ci-robot now reruns GitHub Actions with the retest command? That's new. I just wanted the one aborted prow job to rerun...

/test pull-containerd-node-e2e

@k8s-ci-robot
Copy link
Copy Markdown

@samuelkarp: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-containerd-build
  • /test pull-containerd-node-e2e-1-6

Use /test all to run all jobs.

Details

In response to this:

k8s-ci-robot now reruns GitHub Actions with the retest command? That's new. I just wanted the one aborted prow job to rerun...

/test pull-containerd-node-e2e

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@akhilerm
Copy link
Copy Markdown
Member

akhilerm commented Oct 26, 2023

k8s-ci-robot now reruns GitHub Actions with the retest command?

@samuelkarp It was added so that the github workflows could be retriggered by the author of the PR. Otherwise, only org members/owners could retrigger a github workflow

Also, the aborted job is for the main branch. In release/1.6 we are using the pull-containerd-node-e2e-1-6 job.

Copy link
Copy Markdown
Member

@akhilerm akhilerm left a comment

Choose a reason for hiding this comment

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

/lgtm

@samuelkarp
Copy link
Copy Markdown
Member

Also, the aborted job is for the main branch. In release/1.6 we are using the pull-containerd-node-e2e-1-6 job.

Looks like it got triggered because of this?

dmcgowan changed the base branch from main to release/1.6

@AkihiroSuda
Copy link
Copy Markdown
Member

/test all

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

LGTM if green

@akhilerm
Copy link
Copy Markdown
Member

The integration test failure seems unrelated to the changes in this PR. Can the job be retriggered and checked?

@kzys
Copy link
Copy Markdown
Member

kzys commented Oct 27, 2023

/test all

@kzys
Copy link
Copy Markdown
Member

kzys commented Oct 27, 2023

pull-containerd-node-e2e is showing

Test started last Wednesday at 9:49 PM is still running after 42h38m9s. (more info)

So we may need to do something on Prow side. I don't think I can cancel the job. Can I?

@akhilerm
Copy link
Copy Markdown
Member

pull-containerd-node-e2e is showing

Test started last Wednesday at 9:49 PM is still running after 42h38m9s. (more info)

So we may need to do something on Prow side. I don't think I can cancel the job. Can I?

@kzys It can be ignored, since that test is not supposed to run on this branch(release/1.6). I am not sure if github allows to merge by overriding the failing check.

@samuelkarp samuelkarp merged commit e63636a into containerd:release/1.6 Oct 29, 2023
@samuelkarp
Copy link
Copy Markdown
Member

I am not sure if github allows to merge by overriding the failing check.

I merged it anyway. I don't think there's a way to clear pull-containerd-node-e2e and we can't rerun it (since it doesn't actually run for the release/1.6 branch).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants