update testdata with support to Prometheus Operator resources

kubernetes-sigs · Oct 12, 2019 · bec8316 · bec8316
1 parent c4294c6
commit bec8316
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 23 deletions.
diff --git a/testdata/project-v2/config/default/kustomization.yaml b/testdata/project-v2/config/default/kustomization.yaml
@@ -20,6 +20,8 @@ bases:
 #- ../webhook
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
 #- ../certmanager
+# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. 
+#- ../prometheus
 
 patchesStrategicMerge:
   # Protect the /metrics endpoint by putting it behind auth.

diff --git a/testdata/project-v2/config/default/manager_prometheus_metrics_patch.yaml b/testdata/project-v2/config/default/manager_prometheus_metrics_patch.yaml
diff --git a/testdata/project-v2/config/prometheus/kustomization.yaml b/testdata/project-v2/config/prometheus/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- monitor.yaml
diff --git a/testdata/project-v2/config/prometheus/monitor.yaml b/testdata/project-v2/config/prometheus/monitor.yaml
@@ -0,0 +1,15 @@
+
+# Prometheus Monitor Service (Metrics)
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: controller-manager-metrics-monitor
+  namespace: system
+spec:
+  endpoints:
+    - path: /metrics
+      port: https
+  selector:
+    control-plane: controller-manager
diff --git a/testdata/project-v2/config/rbac/auth_proxy_service.yaml b/testdata/project-v2/config/rbac/auth_proxy_service.yaml
@@ -1,10 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    prometheus.io/port: "8443"
-    prometheus.io/scheme: https
-    prometheus.io/scrape: "true"
   labels:
     control-plane: controller-manager
   name: controller-manager-metrics-service