From 1a5714dbc1bd5d84d20afd775d52059245a69182 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Wed, 15 Apr 2020 09:30:29 +0000
Subject: [PATCH] added scraping annotation to development and production pods
---
.gitlab/development-values.yaml | 6 +++++-
.gitlab/production-values.yaml | 6 +++++-
chart/values.yaml | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gitlab/development-values.yaml b/.gitlab/development-values.yaml
index 66028e145..1a756bdf6 100644
--- a/.gitlab/development-values.yaml
+++ b/.gitlab/development-values.yaml
@@ -8,10 +8,14 @@ podDisruptionBudget:
enabled: true
minAvailable: 1
maxUnavailable:
+podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/path: /metrics
+ prometheus.io/port: "80"
ingress:
annotations:
certmanager.k8s.io/cluster-issuer: letsencrypt-prod
nginx.ingress.kubernetes.io/configuration-snippet: |
if ($host = "www.metager3.de") {
return 301 https://metager3.de$request_uri;
- }
\ No newline at end of file
+ }
diff --git a/.gitlab/production-values.yaml b/.gitlab/production-values.yaml
index 1855172fc..9d9541ad9 100644
--- a/.gitlab/production-values.yaml
+++ b/.gitlab/production-values.yaml
@@ -6,8 +6,12 @@ hpa:
maxReplicas: 25
podDisruptionBudget:
enabled: true
- minAvailable: 5
+ minAvailable: 4
maxUnavailable:
+podAnnotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/path: /metrics
+ prometheus.io/port: "80"
ingress:
annotations:
certmanager.k8s.io/cluster-issuer: letsencrypt-prod
diff --git a/chart/values.yaml b/chart/values.yaml
index f4508a0ba..0641dce2a 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -50,13 +50,13 @@ prometheus:
metrics: false
livenessProbe:
path: "/"
- initialDelaySeconds: 40
+ initialDelaySeconds: 20
timeoutSeconds: 15
scheme: "HTTP"
probeType: "httpGet"
readinessProbe:
path: "/"
- initialDelaySeconds: 30
+ initialDelaySeconds: 15
timeoutSeconds: 15
scheme: "HTTP"
probeType: "httpGet"
--
GitLab