Merge pull request #1353 from storey247/ds/1352-fix-servicemonitor-template

k8s-ci-robot · web-flow · commit f2ebe369917a · 2020-02-05T12:01:55.000-08:00
fix matchLabel missing in ServiceMonitor template
diff --git 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
@@ -12,4 +12,5 @@ spec:
     - path: /metrics
       port: https
   selector:
-    control-plane: controller-manager
+    matchLabels:
+      control-plane: controller-manager
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,6 @@ spec:`
`52`	`52`	`- path: /metrics`
`53`	`53`	`port: https`
`54`	`54`	`selector:`
`55`		`- control-plane: controller-manager`
	`55`	`+ matchLabels:`
	`56`	`+ control-plane: controller-manager`
`56`	`57`	`