[Common] Update ingress rules and tls (#94)

* Update ingress rules and tls
paritytech · Jun 20, 2022 · ef9dddf · ef9dddf
1 parent 98263b7
commit ef9dddf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 26 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: A generic helm chart for Kubernetes
 type: application
-version: 0.1.7
+version: 0.2.0
 maintainers:
   - name: Parity
     url: https://github.com/paritytech/helm-charts
diff --git a/charts/common/templates/ingress.yaml b/charts/common/templates/ingress.yaml
@@ -1,6 +1,5 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "common.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -13,30 +12,12 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- if .Values.ingress.tls }}
+  rules:
+  {{- with .Values.ingress.rules }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
   tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
+  {{- with .Values.ingress.tls }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            pathType: {{ .pathType }}
-            backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-          {{- end }}
-    {{- end }}
 {{- end }}