Improve helm chart (#1144)

* [helm] Allow to disable ingress

Signed-off-by: Wilfried Roset <[email protected]>

* [helm] Allow to define the ingress className

Signed-off-by: Wilfried Roset <[email protected]>

* [helm] Allow to define the tls block of the ingress

Signed-off-by: Wilfried Roset <[email protected]>

* [helm] Allow to pass extraEnv and extraEnvFrom to deployment

The chart relies on [external-secrets.io](https://external-secrets.io)
to pull the secrets. This might not be convenient for open source
community users. As such, let's complete the externalSecrets with `env`
and `envFrom` via respectively `.Values.extraEnv` and
`.Values.extraEnvFrom`.

Signed-off-by: Wilfried Roset <[email protected]>

---------

Signed-off-by: Wilfried Roset <[email protected]>

chart/templates/deployment.yaml

@@ -51,6 +51,10 @@ spec:
               protocol: TCP
             {{- end }}
           resources: {{ toYaml .Values.resources | nindent 12 }}
+          {{- with $.Values.extraEnv }}
+          env:
+            {{- toYaml . | nindent 14 }}
+          {{- end }}
           envFrom:
             - configMapRef:
                 name: {{ include "name" . }}
@@ -58,6 +62,9 @@ spec:
             - secretRef:
                 name: {{ $.Values.externalSecrets.secretName }}
           {{- end }}
+          {{- with $.Values.extraEnvFrom }}
+            {{- toYaml . | nindent 14 }}
+          {{- end }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
       tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
       volumes:

chart/templates/ingress.yaml

@@ -1,3 +1,4 @@
+{{- if $.Values.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -6,6 +7,17 @@ metadata:
   name: {{ include "name" . }}
   namespace: {{ .Release.Namespace }}
 spec:
+  {{ if $.Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{ end }}
+  {{- with .Values.ingress.tls }}
+  tls:
+    - hosts:
+        - {{ $.Values.domain | quote }}
+      {{- with .secretName }}
+      secretName: {{ . }}
+      {{- end }}
+  {{- end }}
   rules:
     - host: {{ .Values.domain }}
       http:
@@ -17,3 +29,4 @@ spec:
                   name: http
             path: {{ $.Values.ingress.path | default "/" }}
             pathType: Prefix
+{{- end }}

chart/values.yaml

@@ -13,8 +13,12 @@ service:
   annotations: { }
 
 ingress:
+  enabled: true
   path: "/"
   annotations: { }
+  # className: "nginx"
+  tls: { }
+    # secretName: XXX
 
 resources:
   requests:
@@ -32,6 +36,9 @@ externalSecrets:
   secretStoreName: ""
   secretName: ""
   parameters: { }
+# Allow to environment injections on top or instead of externalSecrets
+extraEnvFrom: []
+extraEnv: []
 
 autoscaling:
   enabled: false