From dceb4205f6d2bea6432f51e65de92f26751503de Mon Sep 17 00:00:00 2001 From: Brad McCoy Date: Tue, 2 May 2023 19:45:25 +1000 Subject: [PATCH 1/2] feat: add additionalLabels to serviceMonitor Signed-off-by: Brad McCoy --- .../operator/templates/controller-manager-metrics-monitor.yaml | 3 +++ chart/operator/values.yaml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chart/operator/templates/controller-manager-metrics-monitor.yaml b/chart/operator/templates/controller-manager-metrics-monitor.yaml index f08749d2..b68cfdf5 100644 --- a/chart/operator/templates/controller-manager-metrics-monitor.yaml +++ b/chart/operator/templates/controller-manager-metrics-monitor.yaml @@ -9,6 +9,9 @@ metadata: app.kubernetes.io/part-of: k8sgpt-operator control-plane: controller-manager {{- include "chart.labels" . | nindent 4 }} + {{- if .Values.serviceMonitor.additionalLabels }} + {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }} + {{- end }} spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/chart/operator/values.yaml b/chart/operator/values.yaml index 9c3e3c2e..2446d796 100644 --- a/chart/operator/values.yaml +++ b/chart/operator/values.yaml @@ -1,5 +1,6 @@ serviceMonitor: - enabled: false + enabled: true + additionalLabels: {} controllerManager: kubeRbacProxy: containerSecurityContext: From 76c41b03739118beb22cd8b03eb402fd9e4c149f Mon Sep 17 00:00:00 2001 From: Brad McCoy Date: Tue, 2 May 2023 19:58:45 +1000 Subject: [PATCH 2/2] feat: set serviceMonitor enabled to false Signed-off-by: Brad McCoy --- .../operator/templates/controller-manager-metrics-monitor.yaml | 2 +- chart/operator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/operator/templates/controller-manager-metrics-monitor.yaml b/chart/operator/templates/controller-manager-metrics-monitor.yaml index b68cfdf5..c9a93bb1 100644 --- a/chart/operator/templates/controller-manager-metrics-monitor.yaml +++ b/chart/operator/templates/controller-manager-metrics-monitor.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/created-by: k8sgpt-operator app.kubernetes.io/part-of: k8sgpt-operator control-plane: controller-manager - {{- include "chart.labels" . | nindent 4 }} + {{- include "chart.labels" . | nindent 4 }} {{- if .Values.serviceMonitor.additionalLabels }} {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }} {{- end }} diff --git a/chart/operator/values.yaml b/chart/operator/values.yaml index 2446d796..7ade4282 100644 --- a/chart/operator/values.yaml +++ b/chart/operator/values.yaml @@ -1,5 +1,5 @@ serviceMonitor: - enabled: true + enabled: false additionalLabels: {} controllerManager: kubeRbacProxy: