Merge pull request #122 from jumpstarter-dev/ingress-class-continuation2

Fix controller ingress class and equalize router ingress tls secret

Author: mangelajo

deploy/helm/jumpstarter/charts/jumpstarter-controller/templates/controller-ingress.yaml

@@ -11,6 +11,9 @@ metadata:
   name: jumpstarter-controller-ingress
   namespace: {{ default .Release.Namespace .Values.namespace }}
 spec:
+  {{ if .Values.grpc.ingress.class }}
+  ingressClassName: {{ .Values.grpc.ingress.class }}
+  {{ end }}
   rules:
   {{ if .Values.grpc.hostname }}
   - host: {{ .Values.grpc.hostname }}
@@ -36,4 +39,4 @@ spec:
     {{ if .Values.grpc.tls.controllerCertSecret }}
     secretName: {{ .Values.grpc.tls.controllerCertSecret }}
     {{ end }}
-{{ end }}
+{{ end }}

deploy/helm/jumpstarter/charts/jumpstarter-controller/templates/router-ingress.yaml

@@ -30,11 +30,13 @@ spec:
             port:
               number: 8083
   tls:
-  - secretName: {{ .Values.grpc.tls.routerCertSecret }}
-    hosts:
+  - hosts:
       {{ if .Values.grpc.routerHostname }}
       - {{ .Values.grpc.routerHostname }}
       {{ else }}
       - router.{{ .Values.global.baseDomain | required "a global.baseDomain or a grpc.routerHostname must be provided" }}
       {{ end }}
-{{ end }}
+    {{ if .Values.grpc.tls.routerCertSecret }}
+    secretName: {{ .Values.grpc.tls.routerCertSecret }}
+    {{ end }}
+{{ end }}