test: e2e withServiceMonitor

SocialGouv · Oct 20, 2020 · 6d58002 · 6d58002
1 parent 3f50b15
commit 6d58002
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap
@@ -448,6 +448,25 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 ---
+metadata:
+  labels:
+    app: www
+  name: www-monitor
+  namespace: sample-kosko
+spec:
+  endpoints:
+    - path: /path/to/metrics
+      port: http
+      interval: 30s
+  namespaceSelector:
+    matchNames:
+      - sample-kosko
+  selector:
+    matchLabels:
+      app: www
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+---
 metadata:
   annotations:
     kubernetes.io/ingress.class: nginx

diff --git a/src/components/app/index.ts b/src/components/app/index.ts
@@ -93,7 +93,8 @@ export const create = (
     addWaitForPostgres(deployment);
   }
 
-  if (envParams.withServiceMonitor) {
+  // add a service monitor in production
+  if (env.env === "prod" && envParams.withServiceMonitor) {
     const monitor = getServiceMonitor({
       namespace: envParams.namespace.name,
       appName: name,

diff --git a/templates/simple/components/www.ts b/templates/simple/components/www.ts
@@ -16,7 +16,7 @@ const manifests = create("www", {
       },
     },
     containerPort: 8080,
-    withMonitor: {
+    withServiceMonitor: {
       path: "/path/to/metrics",
       interval: "30s",
     },