docs: upgrade helm chart to take in consideration K8S v1.19+ for ingr…

…ess (requarks#4437) Co-authored-by: Rachad <[email protected]> ***NO_CI***
jionggyu · Sep 15, 2021 · 59d27f4 · 59d27f4
1 parent af8204a
commit 59d27f4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/dev/helm/templates/ingress.yaml b/dev/helm/templates/ingress.yaml
@@ -1,11 +1,18 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "wiki.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+  {{- $fullName := include "wiki.fullname" . -}}
+  {{- $svcPort := .Values.service.port -}}
+  {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+  {{- end }}
+  {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+  {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+  {{- else -}}
 apiVersion: extensions/v1beta1
-{{- end }}
+  {{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -31,11 +38,21 @@ spec:
     - host: {{ .host | quote }}
       http:
         paths:
-        {{- range .paths }}
-          - path: {{ . }}
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
             backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
-        {{- end }}
+              {{- end }}
+          {{- end }}
+  {{- end }}
   {{- end }}
-{{- end }}
diff --git a/dev/helm/values.yaml b/dev/helm/values.yaml
@@ -52,13 +52,16 @@ service:
   # annotations: {}
 
 ingress:
-  enabled: false
+  enabled: true
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
-    - host: wiki.local
-      paths: ["/"]
+    - host: wiki.minikube.local
+      paths:
+        - path: "/"
+          pathType: Prefix
+
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:
@@ -92,7 +95,7 @@ postgresql:
   enabled: true
   ## ssl enforce SSL communication with PostgresSQL
   ## Default to false
-  ##  
+  ##
   # ssl: false
   ## ca Certificate of Authority
   ## Default to empty, point to location of CA
@@ -102,7 +105,7 @@ postgresql:
   ## Default to postgres
   ##
   # postgresqlHost: postgres
-  ## postgresqlPort port for postgres 
+  ## postgresqlPort port for postgres
   ## Default to 5432
   ##
   # postgresqlPort: 5432