Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
102 changes: 0 additions & 102 deletions helm/config/nginx/default.conf

This file was deleted.

46 changes: 0 additions & 46 deletions helm/config/nginx/log_format.conf

This file was deleted.

41 changes: 0 additions & 41 deletions helm/config/nginx/nginx.conf

This file was deleted.

18 changes: 0 additions & 18 deletions helm/templates/nginx/configmap.yaml

This file was deleted.

20 changes: 4 additions & 16 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@ resources:
memory: 128Mi

nginx:
mclabels:
partOf: extractable
owner: 3d
gisDomain: 3d
nginx:
maxAge: 1728000
enabled: true
Expand Down Expand Up @@ -175,22 +179,6 @@ nginx:
cpu: 100m
memory: 128Mi

extraVolumes:
- name: nginx-config
configMap:
name: "{{ .Release.Name }}-3d-extractable-management-nginx-configmap"

extraVolumeMounts:
- name: nginx-config
mountPath: "/etc/nginx/conf.d/default.conf"
subPath: default.conf
- name: nginx-config
mountPath: "/etc/nginx/nginx.conf"
subPath: nginx.conf
- name: nginx-config
mountPath: "/etc/nginx/log_format.conf"
subPath: log_format.conf

env:
opentelemetry:
serviceName: nginx
Expand Down
Loading