feat(helm): add support for Kubernetes Ingress v1 (#786)

tchiotludo · Aug 9, 2021 · ff07a3d · ff07a3d
1 parent 79d0f96
commit ff07a3d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/helm/akhq/Chart.yaml b/helm/akhq/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.18.0"
 description: Kafka GUI for Apache Kafka to manage topics, topics data, consumers group, schema registry, connect and more...
 name: akhq
-version: 0.2.3
+version: 0.2.4
 keywords:
   - kafka
   - confluent

diff --git a/helm/akhq/templates/_helpers.tpl b/helm/akhq/templates/_helpers.tpl
@@ -30,3 +30,16 @@ Create chart name and version as used by the chart label.
 {{- define "akhq.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for Ingress
+*/}}
+{{- define "akhq.ingress.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.Version -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/helm/akhq/templates/ingress.yaml b/helm/akhq/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "akhq.fullname" . -}}
 {{- $ingressPaths := .Values.ingress.paths -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: {{ include "akhq.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -32,9 +32,19 @@ spec:
         paths:
 	{{- range $ingressPaths }}
           - path: {{ . }}
+            {{- if eq (include "akhq.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: "ImplementationSpecific"
+            {{- end }}
             backend:
+              {{- if eq (include "akhq.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
+              {{ else }}
               serviceName: {{ $fullName }}
               servicePort: http
+              {{- end }}
 	{{- end }}
   {{- end }}
 {{- end }}