From ecb262955b5ddf0cb8d527d22207a9bee0d3d33b Mon Sep 17 00:00:00 2001 From: Guilherme Vicentin Date: Wed, 20 Mar 2024 15:41:05 -0300 Subject: [PATCH 1/3] Statefulset annotations --- charts/buildkit/templates/statefulset.yaml | 3 +++ charts/buildkit/values.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/charts/buildkit/templates/statefulset.yaml b/charts/buildkit/templates/statefulset.yaml index 2655666..816ea5f 100644 --- a/charts/buildkit/templates/statefulset.yaml +++ b/charts/buildkit/templates/statefulset.yaml @@ -4,6 +4,9 @@ metadata: name: {{ include "buildkit.fullname" . }} labels: {{- include "buildkit.labels" . | nindent 4 }} + {{- with .Values.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} serviceName: {{ include "buildkit.fullname" . }} diff --git a/charts/buildkit/values.yaml b/charts/buildkit/values.yaml index 1ac6040..86d548c 100644 --- a/charts/buildkit/values.yaml +++ b/charts/buildkit/values.yaml @@ -22,6 +22,8 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: "" +annotations: {} + podAnnotations: {} podSecurityContext: {} From 74118202094947697c4580c209fd55c5b1f35b64 Mon Sep 17 00:00:00 2001 From: Guilherme Vicentin Date: Wed, 20 Mar 2024 15:57:31 -0300 Subject: [PATCH 2/3] Adding missing annotations --- charts/buildkit/templates/statefulset.yaml | 7 ++++--- charts/tsuru-prometheus-pool/templates/prometheus.yaml | 4 ++++ charts/tsuru-prometheus-pool/values.yaml | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/charts/buildkit/templates/statefulset.yaml b/charts/buildkit/templates/statefulset.yaml index 816ea5f..c8f4ea8 100644 --- a/charts/buildkit/templates/statefulset.yaml +++ b/charts/buildkit/templates/statefulset.yaml @@ -1,12 +1,13 @@ apiVersion: apps/v1 kind: StatefulSet metadata: +{{- if .Values.annotations }} + annotations: + {{- toYaml .Values.annotations | nindent 4 }} +{{- end }} name: {{ include "buildkit.fullname" . }} labels: {{- include "buildkit.labels" . | nindent 4 }} - {{- with .Values.annotations }} - annotations: {{- toYaml . | nindent 4 }} - {{- end }} spec: replicas: {{ .Values.replicaCount }} serviceName: {{ include "buildkit.fullname" . }} diff --git a/charts/tsuru-prometheus-pool/templates/prometheus.yaml b/charts/tsuru-prometheus-pool/templates/prometheus.yaml index a83bbbc..1c54be9 100644 --- a/charts/tsuru-prometheus-pool/templates/prometheus.yaml +++ b/charts/tsuru-prometheus-pool/templates/prometheus.yaml @@ -1,6 +1,10 @@ apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: +{{- if .Values.annotations }} + annotations: + {{- toYaml .Values.annotations | nindent 4 }} +{{- end }} name: {{ include "..fullname" . }} labels: {{- include "..labels" . | nindent 4 }} diff --git a/charts/tsuru-prometheus-pool/values.yaml b/charts/tsuru-prometheus-pool/values.yaml index a17a224..b83c426 100644 --- a/charts/tsuru-prometheus-pool/values.yaml +++ b/charts/tsuru-prometheus-pool/values.yaml @@ -30,7 +30,10 @@ serviceAccount: annotations: {} name: "tsuru-prometheus-pool" +annotations: {} + podAnnotations: {} + volumeClaimTemplate: spec: accessModes: From 412150936a28cac17b06717eaf67e85497be7dac Mon Sep 17 00:00:00 2001 From: Guilherme Vicentin Date: Wed, 20 Mar 2024 15:59:15 -0300 Subject: [PATCH 3/3] Bump chart versions --- charts/buildkit/Chart.yaml | 2 +- charts/tsuru-prometheus-pool/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/buildkit/Chart.yaml b/charts/buildkit/Chart.yaml index f28ce93..5bb8fb0 100644 --- a/charts/buildkit/Chart.yaml +++ b/charts/buildkit/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.1 +version: 0.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/tsuru-prometheus-pool/Chart.yaml b/charts/tsuru-prometheus-pool/Chart.yaml index bfb1dd3..133151a 100644 --- a/charts/tsuru-prometheus-pool/Chart.yaml +++ b/charts/tsuru-prometheus-pool/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.4 +version: 0.2.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to