Merge pull request #2149 from machine424/pa-http2-4.11

OCPBUGS-21423: Set the new --disable-http2 flag for prometheus-adapter to disable HTTP2
openshift · Feb 5, 2024 · e131c19 · e131c19
2 parents 07fe9fa + a54808d
commit e131c19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/assets/prometheus-adapter/deployment.yaml b/assets/prometheus-adapter/deployment.yaml
@@ -51,6 +51,7 @@ spec:
         - --prometheus-url=https://prometheus-k8s.openshift-monitoring.svc:9091
         - --secure-port=6443
         - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+        - --disable-http2
         image: directxman12/k8s-prometheus-adapter:v0.9.1
         livenessProbe:
           failureThreshold: 5

diff --git a/jsonnet/components/prometheus-adapter.libsonnet b/jsonnet/components/prometheus-adapter.libsonnet
@@ -127,6 +127,7 @@ function(params)
                           '--prometheus-url=' + cfg.prometheusURL,
                           '--secure-port=6443',
                           '--tls-cipher-suites=' + cfg.tlsCipherSuites,
+                          '--disable-http2',
                         ],
                         // OCPBUGS-10895: configure a startup probe to prevent
                         // the container from being killed by kubelet in case