Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
barry cho
Rancher
Commits
db0eddd6
Commit
db0eddd6
authored
6 years ago
by
Jason Greathouse
Committed by
Alena Prokharchyk
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
ingress config snippet
parent
03c40d64
master
2.4
2.4-head
2.5-head
Tejeev-patch-1
aecdb0589
alpha
ansilh-cs-status-logging
bump_machine_version
cert-manager-caps
cfbd0d3
cloudnautique-patch-1
clusterapi-controller
cwarren/automate_private_registry_1
dev
dnoland1-cores-metric-patch
dnoland1-patch-1
dnoland1-patch-2
dnoland1-patch-3
dnoland1-patch-4
fixmonitoringtime
kinarashah-patch-1
mrajashree-patch-1
not-release/v2.5.11
paynejacob-patch-1
paynejacob-patch-1-1
rc-19
release/v1.1
release/v2.3
release/v2.4
release/v2.4.12
release/v2.4.15
release/v2.4.4
release/v2.5
release/v2.5.11
release/v2.5.11-alt
release/v2.5.11-patch1
release/v2.5.3
release/v2.5.5
release/v2.5.7
release/v2.5.7-patch1
release/v2.5.8
release/v2.5.8-patch1
release/v2.5.8-patch2
release/v2.5.8-patch3
release/v2.5.8-rc1
release/v2.5.9
release/v2.5.9-debug1
release/v2.6
release/v2.6.2
revert-26455-dev-system-charts-v2.3
revert-26644-lasso
revert-26947-skiep-tests-2.3
revert-26948-skip-tests-2.4
revert-27219-bp_uiissues
revert-27223-bp_ghEmail
revert-28602-back-to-dev
revert-28691-revert-28602-back-to-dev
revert-29888-revert-ingress-version-fwd
revert-29936-fleet-gitjob-proxy-support
revert-30122-moveauth2.4
revert-30671-release/v2.5
revert-30698-revert-30671-release/v2.5
revert-31102-restrictedadminrancher
revert-31118-fwd_restrictedadmin
revert-31446-add-gke-transport-proxy-2.4
revert-35793-temporarily-disable-fossa
snyk-fix-0564176c790784e319dbf499a8a4b2b8
update-issue-templates
v2.1.6
Tags unavailable
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
chart/templates/_helpers.tpl
+5
-0
chart/templates/_helpers.tpl
chart/templates/ingress.yaml
+4
-0
chart/templates/ingress.yaml
chart/tests/ingress_test.yaml
+16
-0
chart/tests/ingress_test.yaml
chart/values.yaml
+5
-0
chart/values.yaml
with
30 additions
and
0 deletions
+30
-0
chart/templates/_helpers.tpl
+
5
-
0
View file @
db0eddd6
...
...
@@ -18,3 +18,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
# Render Values in configurationSnippet
{{- define "configurationSnippet" -}}
{{- tpl (.Values.ingress.configurationSnippet) . -}}
{{- end -}}
This diff is collapsed.
Click to expand it.
chart/templates/ingress.yaml
+
4
-
0
View file @
db0eddd6
...
...
@@ -8,6 +8,10 @@ metadata:
heritage
:
{{
.Release.Service
}}
release
:
{{
.Release.Name
}}
annotations
:
{{
- if .Values.ingress.configurationSnippet
}}
nginx.ingress.kubernetes.io/configuration-snippet
:
|
{{ template "configurationSnippet" . }}
{{
- end
}}
{{
- if eq .Values.tls "external"
}}
nginx.ingress.kubernetes.io/ssl-redirect
:
"
false"
# turn off ssl redirect for external.
{{
- else
}}
...
...
This diff is collapsed.
Click to expand it.
chart/tests/ingress_test.yaml
+
16
-
0
View file @
db0eddd6
...
...
@@ -47,3 +47,19 @@ tests:
hosts
:
-
test
secretName
:
tls-rancher-ingress
-
it
:
should set static X-Forwarded-Host header
set
:
hostname
:
host.example.com
ingress
:
configurationSnippet
:
|
more_set_input_headers X-Forwarded-Host {{ .Values.hostname }};
asserts
:
-
equal
:
path
:
metadata.annotations
value
:
certmanager.k8s.io/issuer
:
RELEASE-NAME-rancher
nginx.ingress.kubernetes.io/proxy-connect-timeout
:
"
30"
nginx.ingress.kubernetes.io/proxy-read-timeout
:
"
1800"
nginx.ingress.kubernetes.io/proxy-send-timeout
:
"
1800"
nginx.ingress.kubernetes.io/configuration-snippet
:
|
more_set_input_headers X-Forwarded-Host host.example.com;
This diff is collapsed.
Click to expand it.
chart/values.yaml
+
5
-
0
View file @
db0eddd6
...
...
@@ -49,6 +49,11 @@ ingress:
nginx.ingress.kubernetes.io/proxy-connect-timeout
:
"
30"
nginx.ingress.kubernetes.io/proxy-read-timeout
:
"
1800"
nginx.ingress.kubernetes.io/proxy-send-timeout
:
"
1800"
# configurationSnippet - Add additional Nginx configuration. This example statically sets a header on the ingress.
# configurationSnippet: |
# more_set_input_headers X-Forwarded-Host {{ .Values.hostname }};
tls
:
# options: rancher, letsEncrypt, secret
source
:
rancher
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help