Skip to content

helm: allow adding additional nginx conf #32

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.

Sign up for GitHub

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

Open
shimoncohen wants to merge 3 commits into
base: master
Choose a base branch
from
+25 −9
Open

helm: allow adding additional nginx conf #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
548b6e7
helm: allow adding additional nginx conf
shimoncohen Apr 6, 2026
eae3aff
helm: add the ability to configure nginx allowed methods header in va…
shimoncohen Apr 6, 2026
5df7bd9
update Helm documentation
github-actions[bot] Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions helm/config/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,21 @@ split_clients "$otel_trace_id" $ratio_sampler {
server {
listen 8080;
server_name localhost;
# In case you use "add_header" in the location block, this "add_header" will be ignored!

# Include external configuration file if "additionalConf" is set to true in values.yaml
{{- if .Values.nginx.additionalConf.enabled }}
include /etc/nginx/conf.d/{{ .Values.nginx.additionalConf.fileName }};
{{- end }}

# In case you use "add_header" in the location block, these "add_header" will be ignored!
add_header 'Access-Control-Max-Age' '{{ .Values.nginx.maxAge | default "7200" }}';
add_header 'Access-Control-Allow-Origin' {{ .Values.nginx.allowedOrigins | default "*" | squote }};
add_header 'Access-Control-Allow-Headers' {{ .Values.nginx.allowedHeaders | default "*" | squote }};

location / {
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' {{ .Values.nginx.allowedOrigins | default "*" | squote }};
add_header 'Access-Control-Allow-Methods' 'POST, OPTIONS';
add_header 'Access-Control-Allow-Methods' {{ .Values.nginx.allowedMethods | default "GET, OPTIONS" | squote }};
#
# Custom headers and headers various browsers *should* be OK with but aren't
#
Expand Down
6 changes: 3 additions & 3 deletions helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ spec:
mountPath: "/etc/nginx/log_format.conf"
subPath: log_format.conf
{{- end -}}
{{- if .Values.extraVolumeMounts }}
{{ toYaml .Values.extraVolumeMounts | nindent 12 }}
{{- end }}
{{- if .Values.extraVolumeMounts }}
{{ toYaml .Values.extraVolumeMounts | nindent 12 }}
{{- end }}
ports:
- name: http
containerPort: {{ .Values.targetPort }}
Expand Down
7 changes: 5 additions & 2 deletions helm/values.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ A Helm chart for nginx
| ingress.tls.secretName | string | `""` | Secret name of ingress that points to the relevant custom certificates |
| initialDelaySeconds | int | `60` | Initial delay in seconds before the readiness probe starts |
| nameOverride | string | `""` | String to partially override fullname template (will maintain the release name) |
| nginx.allowedHeaders | string | `nil` | Allowed headers (comma-seperated, for the header: Access-Control-Allow-Headers) |
| nginx.allowedOrigins | string | `nil` | Allowed origins (comma-seperated, for the header: Access-Control-Allow-Origin) |
| nginx.additionalConf.enabled | bool | `false` | Enable or disable the inclusion of an additional configuration file in the NGINX configuration |
| nginx.additionalConf.fileName | string | `"additional.conf"` | Name of the additional configuration file to be included in the NGINX configuration (should be mounted to the "config" directory) |
| nginx.allowedHeaders | string | `nil` | Allowed headers, default: * (comma-seperated, for the header: Access-Control-Allow-Headers) |
| nginx.allowedMethods | string | `nil` | Allowed methods, default: GET, OPTIONS (comma-seperated, for the header: Access-Control-Allow-Methods) |
| nginx.allowedOrigins | string | `nil` | Allowed origins, default: * (comma-seperated, for the header: Access-Control-Allow-Origin) |
| nginx.maxAge | string | `nil` | Maximum age of the cache in seconds (for the header: Access-Control-Max-Age) |
| nginx.optionsMaxAge | string | `nil` | Maximum age of the OPTIONS cache in seconds (for the header: Access-Control-Max-Age) |
| nodePort | int | `30001` | Port to expose on each node for NodePort service type |
Expand Down
11 changes: 9 additions & 2 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,19 @@ opentelemetry:

# @section -- Nginx Configuration
nginx:
additionalConf:
# -- Enable or disable the inclusion of an additional configuration file in the NGINX configuration
enabled: false
# -- Name of the additional configuration file to be included in the NGINX configuration (should be mounted to the "config" directory)
fileName: additional.conf
# -- Maximum age of the cache in seconds (for the header: Access-Control-Max-Age)
maxAge:
# -- Allowed origins (comma-seperated, for the header: Access-Control-Allow-Origin)
# -- Allowed origins, default: * (comma-seperated, for the header: Access-Control-Allow-Origin)
allowedOrigins:
# -- Allowed headers (comma-seperated, for the header: Access-Control-Allow-Headers)
# -- Allowed headers, default: * (comma-seperated, for the header: Access-Control-Allow-Headers)
allowedHeaders:
# -- Allowed methods, default: GET, OPTIONS (comma-seperated, for the header: Access-Control-Allow-Methods)
allowedMethods:
# -- Maximum age of the OPTIONS cache in seconds (for the header: Access-Control-Max-Age)
optionsMaxAge:

Expand Down