From 21b4cf591f7aa08ce056513d06648bacc2af299c Mon Sep 17 00:00:00 2001 From: Basilio Vera Date: Thu, 22 Oct 2020 15:04:43 +0200 Subject: [PATCH 1/3] Fix namespace defined in service-level-operator ClusterRoleBinding chart Signed-off-by: Basilio Vera --- incubator/service-level-operator/Chart.yaml | 2 +- .../service-level-operator/templates/clusterrolebinding.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incubator/service-level-operator/Chart.yaml b/incubator/service-level-operator/Chart.yaml index 4b8a46ce..ed9b50c8 100644 --- a/incubator/service-level-operator/Chart.yaml +++ b/incubator/service-level-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Service level operator abstracts and automates the service level of Kubernetes applications by generation SLI & SLOs to be consumed easily by dashboards and alerts and allow that the SLI/SLO's live with the application flow. name: service-level-operator -version: 0.1.0 +version: 0.1.1 appVersion: "v0.2.0" home: https://github.com/spotahome/service-level-operator sources: diff --git a/incubator/service-level-operator/templates/clusterrolebinding.yaml b/incubator/service-level-operator/templates/clusterrolebinding.yaml index 8e914fd0..fc780d55 100644 --- a/incubator/service-level-operator/templates/clusterrolebinding.yaml +++ b/incubator/service-level-operator/templates/clusterrolebinding.yaml @@ -5,7 +5,7 @@ metadata: subjects: - kind: ServiceAccount name: {{ include "service-operator.name" . }} - namespace: monitoring + namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole From 7c8049a7d1d18850dfad7437faf9cfda8469806f Mon Sep 17 00:00:00 2001 From: Basilio Vera Date: Thu, 22 Oct 2020 15:05:40 +0200 Subject: [PATCH 2/3] Update service-level-operator chart image version to v0.3.0 Signed-off-by: Basilio Vera --- incubator/service-level-operator/Chart.yaml | 2 +- incubator/service-level-operator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incubator/service-level-operator/Chart.yaml b/incubator/service-level-operator/Chart.yaml index ed9b50c8..35ed124a 100644 --- a/incubator/service-level-operator/Chart.yaml +++ b/incubator/service-level-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: Service level operator abstracts and automates the service level of Kubernetes applications by generation SLI & SLOs to be consumed easily by dashboards and alerts and allow that the SLI/SLO's live with the application flow. name: service-level-operator version: 0.1.1 -appVersion: "v0.2.0" +appVersion: "v0.3.0" home: https://github.com/spotahome/service-level-operator sources: - https://github.com/spotahome/service-level-operator diff --git a/incubator/service-level-operator/values.yaml b/incubator/service-level-operator/values.yaml index ea38e221..0293142f 100644 --- a/incubator/service-level-operator/values.yaml +++ b/incubator/service-level-operator/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 ## Set default image, imageTag, and imagePullPolicy. image: repository: quay.io/spotahome/service-level-operator - tag: "v0.2.0" + tag: "v0.3.0" pullPolicy: "IfNotPresent" readinessProbe: httpGet: From 600b64041d3e1ac9287ad4b7b234d5a2fcb12991 Mon Sep 17 00:00:00 2001 From: Basilio Vera Date: Thu, 22 Oct 2020 16:47:27 +0200 Subject: [PATCH 3/3] [service-level-operator] Fix namespace defined in ServiceMonitor Signed-off-by: Basilio Vera --- .../service-level-operator/templates/servicemonitor.yaml | 4 ++-- incubator/service-level-operator/values.yaml | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/incubator/service-level-operator/templates/servicemonitor.yaml b/incubator/service-level-operator/templates/servicemonitor.yaml index 623147fe..0341b857 100644 --- a/incubator/service-level-operator/templates/servicemonitor.yaml +++ b/incubator/service-level-operator/templates/servicemonitor.yaml @@ -13,7 +13,7 @@ spec: component: app namespaceSelector: matchNames: - - monitoring + - {{ .Release.Namespace }} endpoints: - port: http - interval: 10s + interval: {{ .Values.serviceMonitor.interval }} diff --git a/incubator/service-level-operator/values.yaml b/incubator/service-level-operator/values.yaml index 0293142f..06df0175 100644 --- a/incubator/service-level-operator/values.yaml +++ b/incubator/service-level-operator/values.yaml @@ -24,4 +24,6 @@ resources: requests: cpu: 120m memory: 128Mi -prometheus: prometheus-operator-prometheus \ No newline at end of file +prometheus: prometheus-operator-prometheus +serviceMonitor: + interval: 10s