fix: support ALPN and H2C with gRPC. Fixes #14627 (#14567) (cherry-pick release-3.6) #14742
Conversation
This file contains hidden or 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
Joibel
force-pushed
the
cherry-pick-14567-36
branch
from
0629bce to
d357886
Compare
MasonM
added a commit
to MasonM/argo-workflows
that referenced
this pull request
Aug 9, 2025
On `release-3.6`, the `TestArgoServerSuite/TestReadinessProbe` test is failing with `invalid "Content-Type" response header`. Example: https://github.com/argoproj/argo-workflows/actions/runs/16828111449/job/47669457916 That test was backported in argoproj#14742, but it's conflicting with the changes in argoproj#11707, which haven't been backported to `release-3.6`. The latter PR changed the behavior of the server when `STATIC_FILES` is disabled. Before that change, the response for the root path won't have `Content-Type: text/html`, but aftewards it does, even though the response body is empty (since `index.html` will be an empty file when `STATIC_FILES=false`). Before: ``` $ curl http://localhost:2746 -v * Host localhost:2746 was resolved. * IPv6: ::1 * IPv4: 127.0.0.1 * Trying [::1]:2746... * Connected to localhost (::1) port 2746 > GET / HTTP/1.1 > Host: localhost:2746 > User-Agent: curl/8.5.0 > Accept: */* > < HTTP/1.1 200 OK < Content-Security-Policy: default-src 'self' 'unsafe-inline'; img-src 'self' data: < X-Frame-Options: SAMEORIGIN < X-Ratelimit-Limit: 1000 < X-Ratelimit-Remaining: 999 < X-Ratelimit-Reset: Sat, 09 Aug 2025 02:19:43 UTC < Date: Sat, 09 Aug 2025 02:19:43 GMT < Content-Length: 0 < * Connection #0 to host localhost left intact ``` After: ``` $ curl http://localhost:2746 -v * Host localhost:2746 was resolved. * IPv6: ::1 * IPv4: 127.0.0.1 * Trying [::1]:2746... * Connected to localhost (::1) port 2746 > GET / HTTP/1.1 > Host: localhost:2746 > User-Agent: curl/8.5.0 > Accept: */* > < HTTP/1.1 200 OK < Accept-Ranges: bytes < Content-Length: 0 < Content-Security-Policy: default-src 'self' 'unsafe-inline'; img-src 'self' data: < Content-Type: text/html; charset=utf-8 < Last-Modified: Sat, 09 Aug 2025 02:33:08 GMT < X-Frame-Options: SAMEORIGIN < X-Ratelimit-Limit: 1000 < X-Ratelimit-Remaining: 999 < X-Ratelimit-Reset: Sat, 09 Aug 2025 02:33:08 UTC < Date: Sat, 09 Aug 2025 02:33:08 GMT ``` The fix is simply removing the `HasContentType()` assertion, though alternatively we could backport argoproj#11707. Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
(cherry picked from commit 9ed9ed9) (cherry picked from commit 44754be)