liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs: upgrade helm chart to take in consideration K8S v1.19+ for ingress (#4437)

Browse Source 
Co-authored-by: Rachad <rachad.abi-chahine@decathlon.com>

***NO_CI***
This commit is contained in:
ABI CHAHINE 2021-09-15 02:13:04 +02:00 committed by GitHub
parent 94aab69ba8
commit 5450597654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dev/helm/templates/ingress.yaml
View File

@ -1,11 +1,18 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "wiki.fullname" . -}} {{- $fullName := include "wiki.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- 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 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{- else -}}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
{{- end }} {{- end }}
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
@ -31,11 +38,21 @@ spec:
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
paths: paths:
{{- range .paths }} {{- range .paths }}
- path: {{ . }} - path: {{ .path }}
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: {{ .pathType }}
{{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $svcPort }} servicePort: {{ $svcPort }}
{{- end }} {{- end }}
{{- end }}
{{- end }}
{{- end }} {{- end }}
{{- end }}

13
dev/helm/values.yaml
View File

@ -52,13 +52,16 @@ service:
# annotations: {} # annotations: {}
ingress: ingress:
enabled: false enabled: true
annotations: {} annotations: {}
# kubernetes.io/ingress.class: nginx # kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true" # kubernetes.io/tls-acme: "true"
hosts: hosts:
- host: wiki.local - host: wiki.minikube.local
paths: ["/"] paths:
- path: "/"
pathType: Prefix
tls: [] tls: []
# - secretName: chart-example-tls # - secretName: chart-example-tls
# hosts: # hosts:
@ -92,7 +95,7 @@ postgresql:
enabled: true enabled: true
## ssl enforce SSL communication with PostgresSQL ## ssl enforce SSL communication with PostgresSQL
## Default to false ## Default to false
## ##
# ssl: false # ssl: false
## ca Certificate of Authority ## ca Certificate of Authority
## Default to empty, point to location of CA ## Default to empty, point to location of CA
@ -102,7 +105,7 @@ postgresql:
## Default to postgres ## Default to postgres
## ##
# postgresqlHost: postgres # postgresqlHost: postgres
## postgresqlPort port for postgres ## postgresqlPort port for postgres
## Default to 5432 ## Default to 5432
## ##
# postgresqlPort: 5432 # postgresqlPort: 5432