From 6cbf1a77f3d95be9cc9b703ca1bea52358dc1bb4 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Wed, 15 Jan 2025 17:12:35 +0200 Subject: [PATCH] fix http debugging --- config/core/deployments/activator.yaml | 2 +- pkg/reconciler/revision/resources/queue.go | 2 +- test/conformance/runtime/readiness_probe_test.go | 2 +- vendor/knative.dev/pkg/network/transports.go | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/core/deployments/activator.yaml b/config/core/deployments/activator.yaml index 0f00047b9420..d153b98d1093 100644 --- a/config/core/deployments/activator.yaml +++ b/config/core/deployments/activator.yaml @@ -87,7 +87,7 @@ spec: - name: METRICS_DOMAIN value: knative.dev/internal/serving - name: GODEBUG - value: "http1debug=2" + value: "http2debug=2" securityContext: allowPrivilegeEscalation: false diff --git a/pkg/reconciler/revision/resources/queue.go b/pkg/reconciler/revision/resources/queue.go index 5ac3332f7c86..ea5747784af5 100644 --- a/pkg/reconciler/revision/resources/queue.go +++ b/pkg/reconciler/revision/resources/queue.go @@ -462,7 +462,7 @@ func makeQueueContainer(rev *v1.Revision, cfg *config.Config) (*corev1.Container Value: cfg.Deployment.QueueSidecarRootCA, }, { Name: "GODEBUG", - Value: "http1debug=2", // Enable HTTP/1.1 debugging + Value: "http2debug=2", // Enable HTTP2 debugging }, { Name: "ENABLE_MULTI_CONTAINER_PROBES", diff --git a/test/conformance/runtime/readiness_probe_test.go b/test/conformance/runtime/readiness_probe_test.go index d929dd78a5b5..5bc5e7ce289f 100644 --- a/test/conformance/runtime/readiness_probe_test.go +++ b/test/conformance/runtime/readiness_probe_test.go @@ -127,7 +127,7 @@ func TestProbeRuntime(t *testing.T) { t.Log("Creating a new Service") envs := tc.env - envs = append(tc.env, corev1.EnvVar{Name: "GODEBUG", Value: "http1debug=2"}) + envs = append(tc.env, corev1.EnvVar{Name: "GODEBUG", Value: "http2debug=2"}) resources, err := v1test.CreateServiceReady(t, clients, &names, v1opts.WithEnv(envs...), v1opts.WithReadinessProbe( diff --git a/vendor/knative.dev/pkg/network/transports.go b/vendor/knative.dev/pkg/network/transports.go index 1e9c6c219865..dc949409aa90 100644 --- a/vendor/knative.dev/pkg/network/transports.go +++ b/vendor/knative.dev/pkg/network/transports.go @@ -152,7 +152,8 @@ func NewProberTransport() http.RoundTripper { // NewProxyAutoTLSTransport is same with NewProxyAutoTransport but it has DialTLSContextFunc to create HTTPS request. func NewProxyAutoTLSTransport(maxIdle, maxIdlePerHost int, tlsContext DialTLSContextFunc) http.RoundTripper { return newAutoTransport( - newHTTPSTransport(false /*disable keep-alives*/, true /*disable auto-compression*/, maxIdle, maxIdlePerHost, tlsContext), + //newHTTPSTransport(false /*disable keep-alives*/, true /*disable auto-compression*/, maxIdle, maxIdlePerHost, tlsContext), + newH2Transport(true /*disable auto-compression*/, tlsContext), newH2Transport(true /*disable auto-compression*/, tlsContext)) }