From 4d50ed605fa6bbf73b4b36c41a532820b9828ea2 Mon Sep 17 00:00:00 2001 From: D074096 Date: Mon, 27 May 2024 11:25:15 +0200 Subject: [PATCH] Add maintenance-controller deployment labels + annotations to values.yaml --- system/maintenance-controller/Chart.yaml | 4 ++-- system/maintenance-controller/ci/test-values.yaml | 7 +++++++ system/maintenance-controller/templates/manager.yaml | 2 ++ system/maintenance-controller/values.yaml | 5 ++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/system/maintenance-controller/Chart.yaml b/system/maintenance-controller/Chart.yaml index e9d7faab0a..8ac63e84bf 100644 --- a/system/maintenance-controller/Chart.yaml +++ b/system/maintenance-controller/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: maintenance-controller description: A controller to manage node maintenance type: application -version: 1.0.3 -appVersion: "1.5.1" +version: 1.0.4 +appVersion: "1.5.3" home: https://github.com/sapcc/maintenance-controller dependencies: - name: flatcar-linux-update-agent diff --git a/system/maintenance-controller/ci/test-values.yaml b/system/maintenance-controller/ci/test-values.yaml index 25c11eed0b..5bd4130618 100644 --- a/system/maintenance-controller/ci/test-values.yaml +++ b/system/maintenance-controller/ci/test-values.yaml @@ -11,5 +11,12 @@ kubernikus: enabled: true config: some_config cloud-config: cloud-config +deployment: + extraLabels: + a: b + c: d + extraAnnotations: + e: f + g: h ingress: enabled: true diff --git a/system/maintenance-controller/templates/manager.yaml b/system/maintenance-controller/templates/manager.yaml index 36f163f0d1..c5b13dcd49 100644 --- a/system/maintenance-controller/templates/manager.yaml +++ b/system/maintenance-controller/templates/manager.yaml @@ -14,12 +14,14 @@ spec: metadata: labels: app: maintenance-controller + {{- .Values.deployment.extraLabels | toYaml | nindent 8 }} annotations: prometheus.io/scrape: "true" prometheus.io/targets: kubernetes {{- if and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested }} linkerd.io/inject: enabled {{- end }} + {{- .Values.deployment.extraAnnotations | toYaml | nindent 8 }} spec: affinity: podAntiAffinity: diff --git a/system/maintenance-controller/values.yaml b/system/maintenance-controller/values.yaml index 1feea0a4ce..a02976ec8f 100644 --- a/system/maintenance-controller/values.yaml +++ b/system/maintenance-controller/values.yaml @@ -1,7 +1,7 @@ replicaCount: 2 image: repository: sapcc/maintenance-controller - tag: "1.5.1" + tag: "1.5.3" pullPolicy: IfNotPresent rbac: create: false @@ -23,6 +23,9 @@ ingress: enabled: false ca: true oauthProxy: true +deployment: + extraLabels: {} + extraAnnotations: {} tolerations: null # key value pairs, that are injected as env vars secrets: {}