Skip to content
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 the possibility to configure the upstream protocol in the nginx configuration for the cortex upstream #506

Merged
merged 2 commits into from
Aug 26, 2024

Conversation

finn-evers
Copy link
Contributor

@finn-evers finn-evers commented Aug 26, 2024

What this PR does:
Add the possibility to configure the protocol for the upstream URLs in the nginx configuration.

Which issue(s) this PR fixes:
When preparing to upgrade to TLS communication we ran into the problem that the nginx upstream URLs are hard-coded to http.

Checklist

  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@finn-evers finn-evers force-pushed the feature/tls-upstream branch from fa5329b to cab3e75 Compare August 26, 2024 13:54
…or the cortex upstream

Signed-off-by: Finn Evers <finn.evers@monday-consulting.com>
Signed-off-by: Finn Evers <finn.evers@monday-consulting.com>
@finn-evers finn-evers force-pushed the feature/tls-upstream branch from cab3e75 to 5597ec4 Compare August 26, 2024 13:59
@finn-evers finn-evers marked this pull request as ready for review August 26, 2024 13:59
@nschad nschad requested a review from kd7lxl August 26, 2024 14:05
@@ -1196,6 +1196,8 @@ nginx:
mainSnippet: ""
# -- arbitrary snippet to inject in the server { } section of the nginx config
serverSnippet: ""
# -- protocol for the communication with the upstream
upstream_protocol: http
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to suggest to make it camelCase to match the others, but then I noticed there is already a mix of camelCase and snake_case 🤦‍♂️

@kd7lxl kd7lxl enabled auto-merge (squash) August 26, 2024 19:30
@kd7lxl kd7lxl merged commit a992e1d into cortexproject:master Aug 26, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants