Merge pull request #2147 from machine424/pa-http2-4.14

OCPBUGS-21473: Set the new --disable-http2 flag for prometheus-adapter to disable HTTP2
openshift · Nov 14, 2023 · 94ddd62 · 94ddd62
2 parents 73745ed + e8d1265
commit 94ddd62
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
@@ -50,6 +50,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: kubernetes-sigs/prometheus-adapter:v0.10.0
         livenessProbe:
           failureThreshold: 5

diff --git a/jsonnet/components/prometheus-adapter.libsonnet b/jsonnet/components/prometheus-adapter.libsonnet
@@ -130,6 +130,7 @@ function(params)
                           '--prometheus-url=' + cfg.prometheusURL,
                           '--secure-port=6443',
                           '--tls-cipher-suites=' + cfg.tlsCipherSuites,
+                          '--disable-http2',
                         ],
                         terminationMessagePolicy: 'FallbackToLogsOnError',
                         volumeMounts: [