Merge branch 'main' into fix/trivy

NethermindEth · Jan 30, 2025 · 5b1e6bf · 5b1e6bf
2 parents 6324c43 + 0ec203e
commit 5b1e6bf
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/charts/generic-app/Chart.yaml b/charts/generic-app/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: generic-app
 description: A Helm chart for Kubernetes generic app
 type: application
-version: 1.1.1
+version: 1.1.2
 maintainers:
   - name: 0xDones
diff --git a/charts/generic-app/README.md b/charts/generic-app/README.md
@@ -1,6 +1,6 @@
 # generic-app
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for Kubernetes generic app
 

diff --git a/charts/generic-app/templates/_helpers.tpl b/charts/generic-app/templates/_helpers.tpl
@@ -60,3 +60,7 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "configmap.hash" -}}
+{{- .Values.config | toJson | sha256sum }}
+{{- end }}
diff --git a/charts/generic-app/templates/deployment.yaml b/charts/generic-app/templates/deployment.yaml
@@ -16,10 +16,11 @@ spec:
       {{- include "generic-app.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
+        configmap-hash: {{ include "configmap.hash" . }}
+        {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- end }}
       labels:
         {{- include "generic-app.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}

diff --git a/charts/generic-app/templates/statefulset.yaml b/charts/generic-app/templates/statefulset.yaml
@@ -14,10 +14,11 @@ spec:
   serviceName: {{ include "generic-app.fullname" . }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
+        configmap-hash: {{ include "configmap.hash" . }}
+        {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- end }}
       labels:
         {{- include "generic-app.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}

diff --git a/charts/prometheus-rules/Chart.yaml b/charts/prometheus-rules/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: prometheus-rules
 description: A Helm chart for Prometheus Operator PrometheusRule custom resources
 type: application
-version: 0.0.1
+version: 0.0.3
 maintainers:
   - name: 0xDones
diff --git a/charts/prometheus-rules/README.md b/charts/prometheus-rules/README.md
@@ -1,6 +1,7 @@
+
 # prometheus-rules
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for Prometheus Operator PrometheusRule custom resources
 

diff --git a/charts/prometheus-rules/templates/prometheus-rules.yaml b/charts/prometheus-rules/templates/prometheus-rules.yaml
@@ -21,7 +21,10 @@ spec:
       {{- with .record }}
       record: {{ . }}
       {{- end }}
-      annotations: {{- .annotations | toYaml | nindent 8 }}
+      {{- with .annotations }}
+      annotations:
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
       labels:
         {{- $defaultLabels := $.Values.defaultAlertLabels | default (dict) }}
         {{- $customLabels := .labels | default (dict) }}