Merge pull request #45 from j0nm1/improve-ingress

Allow specification of Ingress pathType

Author: jp-gouin

charts/ltb-passwd/templates/_helpers.tpl

@@ -49,3 +49,14 @@ Generate chart secret name
 {{- define "ltb-passwd.secretName" -}}
 {{ default (include "ltb-passwd.fullname" .) .Values.existingSecret }}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "ingress.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- else -}}
+{{- print "extensions/v1beta1" -}}
+{{- end -}}
+{{- end -}}

charts/ltb-passwd/templates/ingress.yaml

@@ -1,7 +1,8 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "ltb-passwd.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+{{- $ingressPathType := .Values.ingress.pathType -}}
+apiVersion: {{ include "ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -31,8 +32,18 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
+            {{- if eq (include "ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: {{ $ingressPathType }}
+            {{- end }}
             backend:
+              {{- if eq (include "ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
+              {{- else }}
               serviceName: {{ $fullName }}
               servicePort: http
+              {{- end }}
   {{- end }}
 {{- end }}

charts/phpldapadmin/templates/_helpers.tpl

@@ -30,3 +30,14 @@ Create chart name and version as used by the chart label.
 {{- define "phpldapadmin.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "ingress.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- else -}}
+{{- print "extensions/v1beta1" -}}
+{{- end -}}
+{{- end -}}

charts/phpldapadmin/templates/ingress.yaml

@@ -1,7 +1,8 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "phpldapadmin.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+{{- $ingressPathType := .Values.ingress.pathType -}}
+apiVersion: {{ include "ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -31,8 +32,18 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
+            {{- if eq (include "ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: {{ $ingressPathType }}
+            {{- end }}
             backend:
+              {{- if eq (include "ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
+              {{- else }}
               serviceName: {{ $fullName }}
               servicePort: http
+              {{- end }}
   {{- end }}
 {{- end }}

templates/_helpers.tpl

@@ -9,10 +9,10 @@ Expand the name of the chart.
 Return the appropriate apiVersion for statefulset.
 */}}
 {{- define "statefulset.apiVersion" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "apps/v1beta1" -}}
-{{- else -}}
+{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
 {{- print "apps/v1" -}}
+{{- else -}}
+{{- print "apps/v1beta1" -}}
 {{- end -}}
 {{- end -}}
 {{/*

values.yaml

@@ -205,6 +205,7 @@ ltb-passwd:
     enabled: true
     annotations: {}
     path: /
+    pathType: Prefix
     ## Ingress Host
     hosts:
     - "ssl-ldap2.example"
@@ -221,6 +222,7 @@ phpldapadmin:
     enabled: true
     annotations: {}
     path: /
+    pathType: Prefix
     ## Ingress Host
     hosts:
     - phpldapadmin.example