From d710865f28a9d102b2c762e38febf15ea831ebeb Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 16 Jun 2020 20:46:50 -0700 Subject: [PATCH 1/2] test/extended/prometheus: During transition, allow HTTP(S) for CVO Currently the master CVO serves only HTTP. There is a pull request in flight (linked from the Go comment) to declare an HTTPS target in the ServiceMonitor. Allowing both, as I'm doing in this commit, will allow us to land this test-suite change now. Then we can land the CVO pull request. And then we can drop the '?' to require HTTPS going forward. --- test/extended/prometheus/prometheus.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go index 4867b063ac22..6a7a4bbf3a6d 100644 --- a/test/extended/prometheus/prometheus.go +++ b/test/extended/prometheus/prometheus.go @@ -232,8 +232,8 @@ var _ = g.Describe("[sig-instrumentation] Prometheus", func() { targets.Expect(labels{"job": "kube-state-metrics"}, "up", "^https://.*/metrics$"), // Cluster version operator - // TODO: should probably be https - targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^http://.*/metrics$"), + // TODO: require HTTPS once https://github.com/openshift/cluster-version-operator/pull/385 lands + targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^https?://.*/metrics$"), ) } From 18dd62ca3b74c14d3c9b3aafe8ce9571da3bbc64 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 16 Jun 2020 20:51:13 -0700 Subject: [PATCH 2/2] test/extended/prometheus: Require HTTPS for the CVO Now that the CVO pull request has landed, require HTTPS going forward. --- test/extended/prometheus/prometheus.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go index 6a7a4bbf3a6d..ed6a2c3b0184 100644 --- a/test/extended/prometheus/prometheus.go +++ b/test/extended/prometheus/prometheus.go @@ -232,8 +232,7 @@ var _ = g.Describe("[sig-instrumentation] Prometheus", func() { targets.Expect(labels{"job": "kube-state-metrics"}, "up", "^https://.*/metrics$"), // Cluster version operator - // TODO: require HTTPS once https://github.com/openshift/cluster-version-operator/pull/385 lands - targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^https?://.*/metrics$"), + targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^https://.*/metrics$"), ) }