-
Notifications
You must be signed in to change notification settings - Fork 134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add back in Cookie Domain support #2432
Conversation
Hey nwmac! Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you and the commit authors have already signed the CLA. |
Codecov Report
@@ Coverage Diff @@
## v2-master #2432 +/- ##
=============================================
+ Coverage 71.03% 71.04% +0.01%
=============================================
Files 585 586 +1
Lines 24536 24567 +31
Branches 5509 5520 +11
=============================================
+ Hits 17429 17454 +25
- Misses 7107 7113 +6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, minor tweaks
@@ -182,8 +182,12 @@ spec: | |||
- name: SKIP_SSL_VALIDATION | |||
value: {{default "true" .Values.uaa.skipSSLValidation | quote}} | |||
{{- end }} | |||
{{- if .Values.env.DOMAIN }} | |||
- name: X_COOKIE_DOMAIN | |||
{{- if .Values.console.cookieDomain }}{{ if ne .Values.console.cookieDomain "-" }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both if
s can be merged
{{- if and .Vales.console.cookieDomain (ne .Values.console.cookieDomain "-") }}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@irfanhabib - The logic I want is: if cookieDomain is set, use it, unless it is set to '-' in which case do not set it, otherwise default to env.DOMAIN - I don't think what you propose will do that.
- name: COOKIE_DOMAIN | ||
value: {{.Values.console.cookieDomain}} | ||
{{- end }} | ||
{{- else if .Values.env.DOMAIN }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
{{end}}
can be removed if the first edit is made
@@ -13,6 +13,7 @@ dbProvider: mysql | |||
useLb: false | |||
console: | |||
port: 443 | |||
cookieDomain: | |||
# externalIP: 127.0.0.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not set this to '-'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because setting it to -would mean we don't pick up from env.DOMAIN
Env var COOKIE_DOMAIN can restrict the domain used for the session cookie.
This PR: