Merge pull request #548 from lbbniu/nginx_conf

pref: optimized nginx configuration
gocrane · Sep 12, 2022 · 783399f · 783399f
2 parents ed18a2f + 72b5207
commit 783399f
Showing 1 changed file with 14 additions and 40 deletions.
diff --git a/deploy/craned/deployment.yaml b/deploy/craned/deployment.yaml
@@ -150,6 +150,17 @@ metadata:
   name: nginx-conf
   namespace: crane-system
 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;
 
@@ -214,50 +225,13 @@ data:
         }
         location /grafana {
             set $upstream_grafana grafana.crane-system.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;
         }
+        # merge /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;
         }
     }