feat: update Ingress Template (#28)

* add parameter to disable second ingress path

* update ingress apiversion

* add paths to be more idiomatic

* add paths separate from hosts

* add default paths list to include base path

* rename extension api value to descriptive of the change in ingress template

Co-authored-by: Tod Hansmann <[email protected]>

Author: todpunk

charts/verdaccio/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A lightweight private npm proxy registry (sinopia fork)
 name: verdaccio
-version: 0.13.0
+version: 0.14.0
 appVersion: 4.6.2
 home: https://verdaccio.org
 icon: https://cdn.verdaccio.dev/logos/default.png

charts/verdaccio/templates/ingress.yaml

@@ -1,7 +1,12 @@
 {{- if .Values.ingress.enabled }}
 {{- $serviceName := include "verdaccio.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
+{{- $paths := .Values.ingress.paths -}}
+{{- if .Values.ingress.useExtensionsApi }}
 apiVersion: extensions/v1beta1
+{{- else }}
+apiVersion: networking.k8s.io/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ template "verdaccio.fullname" . }}
@@ -16,19 +21,28 @@ metadata:
     {{- end }}
 spec:
   rules:
+    {{- if .Values.ingress.hosts }}
     {{- range $host := .Values.ingress.hosts }}
     - host: {{ $host }}
       http:
         paths:
-          - path: /
+          {{- range $p := $paths }}
+          - path: {{ $p }}
             backend:
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
-          - path: /*
+          {{- end -}}
+    {{- end -}}
+    {{- else }}
+    - http:
+        paths:
+    {{- range $p := $paths }}
+          - path: {{ $p }}
             backend:
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
     {{- end -}}
+    {{- end -}}
   {{- if .Values.ingress.tls }}
   tls:
 {{ toYaml .Values.ingress.tls | indent 4 }}

charts/verdaccio/values.yaml

@@ -39,6 +39,10 @@ resources: {}
 
 ingress:
   enabled: false
+  # Set to true if you are on an old cluster where apiVersion extensions/v1beta1 is required
+  useExtensionsApi: false
+  paths:
+    - /
 # hosts:
 #   - npm.blah.com
 # annotations: