Add podAnnotations and secretAnnotations

Signed-off-by: Eugeniy Medvedev <[email protected]>
WeblateOrg · Jul 13, 2023 · 3ee5fd0 · 3ee5fd0
1 parent f49e714
commit 3ee5fd0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/charts/weblate/Chart.yaml b/charts/weblate/Chart.yaml
@@ -4,7 +4,7 @@ appVersion: 4.18.2.1
 description: Weblate is a free web-based translation management system.
 name: weblate
 type: application
-version: 0.4.30
+version: 0.4.31
 home: https://weblate.org/
 icon: https://s.weblate.org/cdn/weblate.svg
 maintainers:

diff --git a/charts/weblate/README.md b/charts/weblate/README.md
@@ -1,6 +1,6 @@
 # weblate
 
-![Version: 0.4.30](https://img.shields.io/badge/Version-0.4.30-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.18.2.1](https://img.shields.io/badge/AppVersion-4.18.2.1-informational?style=flat-square)
+![Version: 0.4.31](https://img.shields.io/badge/Version-0.4.31-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.18.2.1](https://img.shields.io/badge/AppVersion-4.18.2.1-informational?style=flat-square)
 
 Weblate is a free web-based translation management system.
 
@@ -78,6 +78,7 @@ $ helm install my-release weblate/weblate
 | persistence.existingClaim | string | `""` | Use an existing volume claim |
 | persistence.filestore_dir | string | `"/app/data"` |  |
 | persistence.size | string | `"10Gi"` |  |
+| podAnnotations | object | `{}` |  |
 | podSecurityContext.enabled | bool | `true` |  |
 | podSecurityContext.fsGroup | int | `1000` |  |
 | postgresql.auth.database | string | `"weblate"` |  |
@@ -102,6 +103,7 @@ $ helm install my-release weblate/weblate
 | redis.redisHost | string | `None` | External redis database endpoint, to be used if `redis.enabled == false` |
 | replicaCount | int | `1` |  |
 | resources | object | `{}` |  |
+| secretAnnotations | object | `{}` |  |
 | serverEmail | string | `""` | Sender for outgoing emails |
 | service.annotations | string | `nil` |  |
 | service.port | int | `80` |  |

diff --git a/charts/weblate/templates/deployment.yaml b/charts/weblate/templates/deployment.yaml
@@ -19,6 +19,9 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         checksum/secret-env: {{ .Values.extraSecretConfig | toYaml | sha256sum }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       labels:
         app.kubernetes.io/name: {{ include "weblate.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/weblate/templates/secret-env.yaml b/charts/weblate/templates/secret-env.yaml
@@ -6,6 +6,10 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "weblate.labels" . | indent 4 }}
+  {{- with .Values.secretAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 type: Opaque
 data:
   {{- range $key, $value := .Values.extraSecretConfig }}

diff --git a/charts/weblate/templates/secret.yaml b/charts/weblate/templates/secret.yaml
@@ -6,6 +6,10 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "weblate.labels" . | indent 4 }}
+  {{- with .Values.secretAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 type: Opaque
 data:
   postgresql-user: {{ .Values.postgresql.auth.userName | default "postgres" | b64enc | quote }}

diff --git a/charts/weblate/values.yaml b/charts/weblate/values.yaml
@@ -97,6 +97,12 @@ podSecurityContext:
   enabled: true
   fsGroup: 1000
 
+podAnnotations: {}
+  # vault.security.banzaicloud.io/vault-role: "vault"
+  # vault.security.banzaicloud.io/vault-addr: "https://vault.vault.svc.cluster.local:8200"
+  # vault.security.banzaicloud.io/vault-skip-verify: "true"
+  # vault.security.banzaicloud.io/vault-path: "kubernetes"
+
 containerSecurityContext:
   enabled: false
   # capabilities:
@@ -106,6 +112,12 @@ containerSecurityContext:
   # runAsNonRoot: true
   # runAsUser: 1000
 
+secretAnnotations: {}
+  # vault.security.banzaicloud.io/vault-role: "vault"
+  # vault.security.banzaicloud.io/vault-addr: "https://vault.vault.svc.cluster.local:8200"
+  # vault.security.banzaicloud.io/vault-skip-verify: "true"
+  # vault.security.banzaicloud.io/vault-path: "kubernetes"
+
 service:
   type: ClusterIP
   port: 80