Merge branch 'master' into restrict-service-monitor

2018-03-20 08:47:43 -04:00
parent 3a6d38ea0e 310f471cf6
commit 3c278a202f
11 changed files with 35 additions and 29 deletions
--- a/manifests/examples/example-app/servicemonitor-frontend.yaml
+++ b/manifests/examples/example-app/servicemonitor-frontend.yaml
@@ -2,6 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
  name: frontend
+  namespace: default
  labels:
    tier: frontend
 spec: