Remove hardcoded release name from the values.yaml file

Signed-off-by: Vladica Obojevic <obojevic@gmail.com>
eclipse-ditto · Jul 26, 2023 · c031c28 · c031c28
1 parent 17e8f07
commit c031c28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/deployment/helm/ditto/templates/nginx-ingress-api.yaml b/deployment/helm/ditto/templates/nginx-ingress-api.yaml
@@ -22,6 +22,7 @@ metadata:
   {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
+    {{ tpl .Values.ingress.api.kubernetesAuthAnnotations . | nindent 4}}
   {{- with .Values.ingress.api.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
@@ -217,14 +217,12 @@ ingress:
         backendSuffix: gateway
       - path: /health
         backendSuffix: gateway
+    kubernetesAuthAnnotations: |
+      nginx.ingress.kubernetes.io/auth-type: basic
+      nginx.ingress.kubernetes.io/auth-secret: {{ .Release.Name }}-nginx-ingress-htpasswd
+      nginx.ingress.kubernetes.io/auth-realm: 'Authentication required to use HTTP API!'
     # annotations defines k8s annotations to add to the Ingress
     annotations:
-      # type of authentication
-      nginx.ingress.kubernetes.io/auth-type: basic
-      # name of the secret that contains the user/password definitions
-      nginx.ingress.kubernetes.io/auth-secret: my-ditto-nginx-ingress-htpasswd
-      # message to display with an appropriate context why the authentication is required
-      nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required to use HTTP API!'
       nginx.ingress.kubernetes.io/proxy-connect-timeout: "10"
       nginx.ingress.kubernetes.io/proxy-send-timeout: "70"
       nginx.ingress.kubernetes.io/proxy-read-timeout: "70"