From 19f09b74ef15782bc5c4da7e229d4763ef4b342b Mon Sep 17 00:00:00 2001 From: Dave Storey Date: Wed, 5 Feb 2020 09:50:16 +0000 Subject: [PATCH 1/2] fix matchLabel missing in ServiceMonitor template --- pkg/scaffold/v2/prometheus/monitor.go | 3 ++- testdata/project-v2-multigroup/config/prometheus/monitor.yaml | 3 ++- testdata/project-v2/config/prometheus/monitor.yaml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/scaffold/v2/prometheus/monitor.go b/pkg/scaffold/v2/prometheus/monitor.go index 414441e8292..0b1250308b6 100644 --- a/pkg/scaffold/v2/prometheus/monitor.go +++ b/pkg/scaffold/v2/prometheus/monitor.go @@ -52,5 +52,6 @@ spec: - path: /metrics port: https selector: - control-plane: controller-manager + matchLabels: + control-plane: controller-manager ` diff --git a/testdata/project-v2-multigroup/config/prometheus/monitor.yaml b/testdata/project-v2-multigroup/config/prometheus/monitor.yaml index e2d9b087fa5..4f6fe4030f2 100644 --- a/testdata/project-v2-multigroup/config/prometheus/monitor.yaml +++ b/testdata/project-v2-multigroup/config/prometheus/monitor.yaml @@ -12,4 +12,5 @@ spec: - path: /metrics port: https selector: - control-plane: controller-manager + matchLabels: + control-plane: controller-manager \ No newline at end of file diff --git a/testdata/project-v2/config/prometheus/monitor.yaml b/testdata/project-v2/config/prometheus/monitor.yaml index e2d9b087fa5..4f6fe4030f2 100644 --- a/testdata/project-v2/config/prometheus/monitor.yaml +++ b/testdata/project-v2/config/prometheus/monitor.yaml @@ -12,4 +12,5 @@ spec: - path: /metrics port: https selector: - control-plane: controller-manager + matchLabels: + control-plane: controller-manager \ No newline at end of file From 6e1ddabbd947eaf9a446a67d7d5185f24ab5d320 Mon Sep 17 00:00:00 2001 From: Dave Storey Date: Wed, 5 Feb 2020 11:23:53 +0000 Subject: [PATCH 2/2] adding scafold file fixes for travis --- testdata/project-v2-multigroup/config/prometheus/monitor.yaml | 2 +- testdata/project-v2/config/prometheus/monitor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testdata/project-v2-multigroup/config/prometheus/monitor.yaml b/testdata/project-v2-multigroup/config/prometheus/monitor.yaml index 4f6fe4030f2..9b8047b760f 100644 --- a/testdata/project-v2-multigroup/config/prometheus/monitor.yaml +++ b/testdata/project-v2-multigroup/config/prometheus/monitor.yaml @@ -13,4 +13,4 @@ spec: port: https selector: matchLabels: - control-plane: controller-manager \ No newline at end of file + control-plane: controller-manager diff --git a/testdata/project-v2/config/prometheus/monitor.yaml b/testdata/project-v2/config/prometheus/monitor.yaml index 4f6fe4030f2..9b8047b760f 100644 --- a/testdata/project-v2/config/prometheus/monitor.yaml +++ b/testdata/project-v2/config/prometheus/monitor.yaml @@ -13,4 +13,4 @@ spec: port: https selector: matchLabels: - control-plane: controller-manager \ No newline at end of file + control-plane: controller-manager