add additional logic for es restriction from airflow #2159
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
34
to
48
| # The following "location" rules limit airflow interactions to only their indices. Any further | ||
| # additions should follow this pattern. | ||
| location ~* /_count$ { | ||
| rewrite /_count(.*) /{{ include "logging.indexNamePrefix" . }}.$remote_user.*/_count$1 break; | ||
| {{- if or .Values.global.customLogging.awsSecretName .Values.global.customLogging.awsServiceAccountAnnotation .Values.global.customLogging.awsIAMRole }} | ||
| proxy_pass http://localhost:{{ .Values.service.awsproxy }}; | ||
| {{- else }} | ||
| access_by_lua_file /usr/local/openresty/nginx/conf/setenv.lua; | ||
| proxy_pass {{.Values.global.customLogging.scheme}}://{{.Values.global.customLogging.host}}:{{.Values.global.customLogging.port}}; | ||
| {{- include "external-es-proxy-trustcerts" . | indent 8 }} | ||
| {{- end }} | ||
| } | ||
|
|
||
| location ~* /_bulk$ { | ||
| rewrite /_bulk(.*) /{{ include "logging.indexNamePrefix" . }}.$remote_user.*/_bulk$1 break; |
There was a problem hiding this comment.
if this is just copied code, can we put this whole 'nginx.conforhttp` block into a template and include it in both external and non-external es configmaps ? that would be DRY, and as long as they're going to be the same then that would be helpful.
There was a problem hiding this comment.
only parts of the changes are copied like rewrite parts
There was a problem hiding this comment.
then we need to move the the common changes to global helpers.tpl to share the common code
Co-authored-by: Daniel Hoherd <daniel.hoherd@gmail.com>
danielhoherd
requested changes
Mar 27, 2024
|
Does this PR have a gh issue? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Updates to external es nginx config with restricted location block.
Related Issues
https://github.com/astronomer/issues/issues/6241
Testing
Requires external elastic search to test this change
Merging
Yet to update