feat(mongo-express): allow deployment annotations and remove basic au…

…thentication from probes (#634)
cowboysysop · Apr 9, 2024 · 1da6d9e · 1da6d9e
1 parent 23d4c32
commit 1da6d9e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 41 deletions.
diff --git a/charts/mongo-express/Chart.yaml b/charts/mongo-express/Chart.yaml
@@ -10,10 +10,10 @@ name: mongo-express
 sources:
   - https://github.com/mongo-express/mongo-express
   - https://github.com/cowboysysop/charts/tree/master/charts/mongo-express
-version: 6.4.2
+version: 6.5.0
 dependencies:
   - name: common
-    version: 2.19.0
+    version: 2.19.1
     repository: https://charts.bitnami.com/bitnami/
   - name: mongodb
     version: 15.1.3

diff --git a/charts/mongo-express/README.md b/charts/mongo-express/README.md
@@ -117,6 +117,7 @@ The command deletes the release named `my-release` and frees all the kubernetes
 | `serviceAccount.create`              | Specifies whether a service account should be created                                                     | `true`                   |
 | `serviceAccount.annotations`         | Service account annotations                                                                               | `{}`                     |
 | `serviceAccount.name`                | The name of the service account to use (Generated using the `mongo-express.fullname` template if not set) | `nil`                    |
+| `deploymentAnnotations`              | Additional deployment annotations                                                                         | `{}`                     |
 | `podAnnotations`                     | Additional pod annotations                                                                                | `{}`                     |
 | `podLabels`                          | Additional pod labels                                                                                     | `{}`                     |
 | `podSecurityContext`                 | Pod security context                                                                                      | `{}`                     |

diff --git a/charts/mongo-express/templates/deployment.yaml b/charts/mongo-express/templates/deployment.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations:
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- if or .Values.deploymentAnnotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.deploymentAnnotations .Values.commonAnnotations ) "context" . ) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -153,11 +153,6 @@ spec:
             httpGet:
               path: {{ .Values.siteBaseUrl | trimSuffix "/" }}/status
               port: http
-              {{- if and .Values.basicAuthUsername .Values.basicAuthPassword }}
-              httpHeaders:
-                - name: Authorization
-                  value: {{ include "mongo-express.basicAuthHttpHeader" . }}
-              {{- end }}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
@@ -169,11 +164,6 @@ spec:
             httpGet:
               path: {{ .Values.siteBaseUrl | trimSuffix "/" }}/status
               port: http
-              {{- if and .Values.basicAuthUsername .Values.basicAuthPassword }}
-              httpHeaders:
-                - name: Authorization
-                  value: {{ include "mongo-express.basicAuthHttpHeader" . }}
-              {{- end }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
@@ -185,11 +175,6 @@ spec:
             httpGet:
               path: {{ .Values.siteBaseUrl | trimSuffix "/" }}/status
               port: http
-              {{- if and .Values.basicAuthUsername .Values.basicAuthPassword }}
-              httpHeaders:
-                - name: Authorization
-                  value: {{ include "mongo-express.basicAuthHttpHeader" . }}
-              {{- end }}
             initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.startupProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}

diff --git a/charts/mongo-express/templates/ingress.yaml b/charts/mongo-express/templates/ingress.yaml
@@ -9,13 +9,8 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
   {{- if or .Values.ingress.annotations .Values.commonAnnotations }}
-  annotations:
-    {{- if .Values.ingress.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.ingress.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.commonAnnotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-    {{- end }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}

diff --git a/charts/mongo-express/templates/service.yaml b/charts/mongo-express/templates/service.yaml
@@ -8,13 +8,8 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
   {{- if or .Values.service.annotations .Values.commonAnnotations }}
-  annotations:
-    {{- if .Values.service.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.commonAnnotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-    {{- end }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.service.annotations .Values.commonAnnotations ) "context" . ) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.service.type }}

diff --git a/charts/mongo-express/templates/serviceaccount.yaml b/charts/mongo-express/templates/serviceaccount.yaml
@@ -9,12 +9,7 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
   {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }}
-  annotations:
-    {{- if .Values.serviceAccount.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.commonAnnotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-    {{- end }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
   {{- end }}
 {{- end -}}
diff --git a/charts/mongo-express/values.yaml b/charts/mongo-express/values.yaml
@@ -73,6 +73,9 @@ serviceAccount:
   ## @param serviceAccount.name The name of the service account to use (Generated using the `mongo-express.fullname` template if not set)
   name:
 
+## @param deploymentAnnotations Additional deployment annotations
+deploymentAnnotations: {}
+
 ## @param podAnnotations Additional pod annotations
 podAnnotations: {}