feat(nginx): Update config

doonga · Jun 6, 2024 · 002e889 · 002e889
1 parent dd6ddbd
commit 002e889
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/kubernetes/main/apps/network/ingress-nginx/external/helmrelease.yaml b/kubernetes/main/apps/network/ingress-nginx/external/helmrelease.yaml
@@ -19,7 +19,7 @@ spec:
     fullnameOverride: nginx-external
 
     controller:
-      replicaCount: 3
+      replicaCount: 2
 
       updateStrategy:
         type: RollingUpdate
@@ -33,7 +33,6 @@ spec:
         annotations:
           external-dns.alpha.kubernetes.io/hostname: "ingress-ext.greyrock.casa"
           io.cilium/lb-ipam-ips: "10.1.1.132"
-        externalTrafficPolicy: Cluster
 
       publishService:
         enabled: true
@@ -53,15 +52,15 @@ spec:
 
       config:
         block-user-agents: "GPTBot,~*GPTBot*,ChatGPT-User,~*ChatGPT-User*,Google-Extended,~*Google-Extended*,CCBot,~*CCBot*,Omgilibot,~*Omgilibot*,FacebookBot,~*FacebookBot*" # taken from https://github.com/superseriousbusiness/gotosocial/blob/main/internal/web/robots.go
-        client-header-timeout: 120
-        client-body-buffer-size: "100M"
+        client-body-buffer-size: 100M
         client-body-timeout: 120
+        client-header-timeout: 120
         enable-brotli: "true"
         enable-ocsp: "true"
         enable-real-ip: "true"
         force-ssl-redirect: "true"
         hide-headers: Server,X-Powered-By
-        hsts-max-age: "31449600"
+        hsts-max-age: 31449600
         keep-alive: 120
         keep-alive-requests: 10000
         log-format-escape-json: "true"
@@ -90,7 +89,7 @@ spec:
         default-ssl-certificate: "network/greyrock-casa-tls"
 
       topologySpreadConstraints:
-        - maxSkew: 2
+        - maxSkew: 1
           topologyKey: kubernetes.io/hostname
           whenUnsatisfiable: DoNotSchedule
           labelSelector:

diff --git a/kubernetes/main/apps/network/ingress-nginx/internal/helmrelease.yaml b/kubernetes/main/apps/network/ingress-nginx/internal/helmrelease.yaml
@@ -19,7 +19,7 @@ spec:
     fullnameOverride: nginx-internal
 
     controller:
-      replicaCount: 3
+      replicaCount: 2
 
       updateStrategy:
         type: RollingUpdate
@@ -33,7 +33,6 @@ spec:
         annotations:
           external-dns.alpha.kubernetes.io/hostname: "ingress-int.greyrock.casa"
           io.cilium/lb-ipam-ips: "10.1.1.131"
-        externalTrafficPolicy: Cluster
 
       publishService:
         enabled: true
@@ -53,15 +52,15 @@ spec:
 
       config:
         block-user-agents: "GPTBot,~*GPTBot*,ChatGPT-User,~*ChatGPT-User*,Google-Extended,~*Google-Extended*,CCBot,~*CCBot*,Omgilibot,~*Omgilibot*,FacebookBot,~*FacebookBot*" # taken from https://github.com/superseriousbusiness/gotosocial/blob/main/internal/web/robots.go
-        client-header-timeout: 120
-        client-body-buffer-size: "100M"
+        client-body-buffer-size: 100M
         client-body-timeout: 120
+        client-header-timeout: 120
         enable-brotli: "true"
         enable-ocsp: "true"
         enable-real-ip: "true"
         force-ssl-redirect: "true"
         hide-headers: Server,X-Powered-By
-        hsts-max-age: "31449600"
+        hsts-max-age: 31449600
         keep-alive: 120
         keep-alive-requests: 10000
         log-format-escape-json: "true"
@@ -90,7 +89,7 @@ spec:
         default-ssl-certificate: "network/greyrock-casa-tls"
 
       topologySpreadConstraints:
-        - maxSkew: 2
+        - maxSkew: 1
           topologyKey: kubernetes.io/hostname
           whenUnsatisfiable: DoNotSchedule
           labelSelector: