Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
6c7cdedb
Unverified
Commit
6c7cdedb
authored
2 years ago
by
mickkael
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Helm chart improved for ingress (#19826)
* ingressClassName * ingress values must be optional
parent
60c4df3d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
chart/templates/ingress.yaml
+3
-0
3 additions, 0 deletions
chart/templates/ingress.yaml
chart/values.yaml
+4
-2
4 additions, 2 deletions
chart/values.yaml
with
7 additions
and
2 deletions
chart/templates/ingress.yaml
+
3
−
0
View file @
6c7cdedb
...
...
@@ -19,6 +19,9 @@ metadata:
{{
- toYaml . | nindent 4
}}
{{
- end
}}
spec
:
{{
- if .Values.ingress.ingressClassName
}}
ingressClassName
:
{{
.Values.ingress.ingressClassName
}}
{{
- end
}}
{{
- if .Values.ingress.tls
}}
tls
:
{{
- range .Values.ingress.tls
}}
...
...
This diff is collapsed.
Click to expand it.
chart/values.yaml
+
4
−
2
View file @
6c7cdedb
...
...
@@ -104,8 +104,8 @@ mastodon:
ingress
:
enabled
:
true
annotations
:
kubernetes.io/ingress.class
:
nginx
kubernetes.io/tls-acme
:
"
true"
#
kubernetes.io/ingress.class: nginx
#
kubernetes.io/tls-acme: "true"
# cert-manager.io/cluster-issuer: "letsencrypt"
#
# ensure that NGINX's upload size matches Mastodon's
...
...
@@ -113,6 +113,8 @@ ingress:
# nginx.ingress.kubernetes.io/proxy-body-size: 40m
# for the NGINX ingress controller:
# nginx.org/client-max-body-size: 40m
# you can specify the ingressClassName if it differs from the default
ingressClassName
:
hosts
:
-
host
:
mastodon.local
paths
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment