diff --git a/charts/crane/templates/craned-deployment.yaml b/charts/crane/templates/craned-deployment.yaml index aeb3a7f..d0c2ebb 100644 --- a/charts/crane/templates/craned-deployment.yaml +++ b/charts/crane/templates/craned-deployment.yaml @@ -146,6 +146,17 @@ metadata: name: nginx-conf namespace: {{ .Release.Namespace }} data: + common_params: | + proxy_connect_timeout 180; + proxy_send_timeout 180; + proxy_read_timeout 180; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Host $http_host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; nginx.conf: | gzip_static on; @@ -200,7 +211,6 @@ data: add_header Cache-Control "must-revalidate"; add_header Cache-Control "max-age=300"; add_header ETag "1.90.0-rc.0"; - add_header Access-Control-Allow-Origin *; listen 9090; listen [::]:9090; location / { @@ -210,51 +220,15 @@ data: } location /grafana { set $upstream_grafana grafana.{{ .Release.Namespace }}.svc.cluster.local; - proxy_connect_timeout 180; - proxy_send_timeout 180; - proxy_read_timeout 180; proxy_pass http://$upstream_grafana:8082; - proxy_redirect off; rewrite /grafana/(.*) /$1 break; - proxy_http_version 1.1; - proxy_set_header Host $http_host; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - location /api/v1/cluster { - proxy_connect_timeout 180; - proxy_send_timeout 180; - proxy_read_timeout 180; - proxy_pass http://cluster; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Connection ""; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - location /api/v1/namespaces { - proxy_connect_timeout 180; - proxy_send_timeout 180; - proxy_read_timeout 180; - proxy_pass http://cluster; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Connection ""; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + include conf.d/common_params; + add_header Access-Control-Allow-Origin *; } + # /api/v1/cluster /api/v1/namespaces location /api { - proxy_connect_timeout 180; - proxy_send_timeout 180; - proxy_read_timeout 180; proxy_pass http://cluster; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Connection ""; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + include conf.d/common_params; } } {{ end }}