Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
54505976
Unverified
Commit
54505976
authored
Sep 15, 2021
by
ABI CHAHINE
Committed by
GitHub
Sep 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
docs: upgrade helm chart to take in consideration K8S v1.19+ for ingress (#4437)
Co-authored-by:
Rachad
<
rachad.abi-chahine@decathlon.com
>
***NO_CI***
parent
94aab69b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
14 deletions
+34
-14
ingress.yaml
dev/helm/templates/ingress.yaml
+26
-9
values.yaml
dev/helm/values.yaml
+8
-5
No files found.
dev/helm/templates/ingress.yaml
View file @
54505976
{{
- 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
}}
dev/helm/values.yaml
View file @
54505976
...
...
@@ -52,13 +52,16 @@ service:
# annotations: {}
ingress
:
enabled
:
fals
e
enabled
:
tru
e
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment