ingree adjustments

charts/rollup/templates/ingress.yaml

@@ -8,8 +8,9 @@
 {{- $serviceName := $ingress.service.name -}}
 {{- $ingressPath := $ingress.path -}}
 {{- $ingressPathType := $ingress.pathType -}}
-{{- $extraPaths := $ingress.extraPaths  -}}
-apiVersion: networking.k8s.io/v1
+{{- $extraPaths := $ingress.extraPaths }}
+---
+apiVersion: {{ include "rollup.ingress.apiVersion" $ }}
 kind: Ingress
 metadata:
   name: {{ $.Values.config.rollup.name }}-{{ $service }}-ingress
@@ -61,6 +62,5 @@ spec:
   tls:
     {{- tpl (toYaml $ingress.tls) $ | nindent 4 }}
   {{- end }}
----
 {{- end }}
 {{- end }}

charts/sequencer-faucet/templates/ingress.yaml

@@ -6,8 +6,8 @@
 {{- $serviceName := tpl .Values.ingress.service.name . -}}
 {{- $ingressPath := .Values.ingress.path -}}
 {{- $ingressPathType := .Values.ingress.pathType -}}
-{{- $extraPaths := tpl .Values.ingress.extraPaths . -}}
-apiVersion: networking.k8s.io/v1
+{{- $extraPaths := .Values.ingress.extraPaths -}}
+apiVersion: {{ include "sequencer.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: sequencer-faucet-ingress
@@ -24,12 +24,13 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
-  {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }}
+  {{- if and $ingressSupportsIngressClassName .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className }}
   {{- end -}}
   {{- with .Values.ingress.service }}
   defaultBackend:
-    {{- tpl (toYaml .) $ | nindent 4 }}
+    service:
+      {{- tpl (toYaml .) $ | nindent 6 }}
   {{- end }}
   rules:
     {{- if .Values.ingress.hosts  }}
@@ -57,16 +58,5 @@ spec:
   tls:
     {{- tpl (toYaml .) $ | nindent 4 }}
   {{- end }}
-  {{- else }}
-    - host: sequencer-faucet.localdev.me
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              service:
-                name: sequencer-faucet-service
-                port:
-                  name: seq-faucet-svc
   {{- end -}}
 {{- end }}

charts/sequencer-faucet/values.yaml

@@ -43,14 +43,13 @@ ingress:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   labels: {}
-  path: {}
-  # pathType is only for k8s >= 1.1=
+  path: /
   pathType: Prefix
-  hosts: {}
-  # - chart-example.local
+  hosts:
+    - sequencer-faucet.localdev.me
   service:
     name: sequencer-faucet-service
-    port: 
+    port:
       name: seq-faucet-svc
   ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
   extraPaths: {}

justfile

@@ -25,7 +25,7 @@ load-image image:
   kind load docker-image {{image}} --name astria-dev-cluster
 
 deploy-chart chart:
-  helm install --debug {{chart}}-chart ./charts/{{chart}} 
+  helm install --debug --dry-run {{chart}}-chart ./charts/{{chart}} 
 
 delete-chart chart:
   helm uninstall {{chart}}-chart