Merge pull request #16030 from zgalor/http-oauth

Automatic merge from submit-queue Prevent oauth-proxy from listening on http port in prometheus deployment Resolving issue openshift/oauth-proxy#7 cc @smarterclayton
openshift · Sep 2, 2017 · 631de37 · 631de37
2 parents eca1051 + 3bb1714
commit 631de37
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/examples/prometheus/prometheus.yaml b/examples/prometheus/prometheus.yaml
@@ -118,6 +118,7 @@ objects:
           args:
           - -provider=openshift
           - -https-address=:8443
+          - -http-address=
           - -email-domain=*
           - -upstream=http://localhost:9090
           - -client-id=system:serviceaccount:${NAMESPACE}:prometheus
@@ -160,7 +161,7 @@ objects:
           args:
           - -provider=openshift
           - -https-address=:9443
-          - -http-address=:4190
+          - -http-address=
           - -email-domain=*
           - -upstream=http://localhost:9099
           - -client-id=system:serviceaccount:${NAMESPACE}:prometheus

diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go
diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go