Merge pull request #834 from 3dwardch3ng/infra/metallb

update ingress-nginx

infrastructures/ingress-nginx/base/values.yaml

@@ -3,3 +3,71 @@ rbac:
 
 controller:
   priorityClassName: system-cluster-critical
+
+  extraArgs:
+    update-status-on-shutdown: "false"
+
+  allowSnippetAnnotations: true
+
+  config:
+    proxy-buffer-size: 16k
+    use-gzip: true
+    enable-brotli: true
+    hsts-max-age: 31536000
+    hsts-preload: true
+    disable-ipv6: true
+    disable-ipv6-dns: true
+    keep-alive-requests: 1000
+    use-geoip2: false
+    custom-http-errors: 401,403,404,500,501,502,503,504
+
+  extraEnvs:
+    - name: TZ
+      value: Australia/Sydney
+
+  addHeaders:
+    Referrer-Policy: same-origin, strict-origin-when-cross-origin
+    X-Content-Type-Options: nosniff
+    X-Frame-Options: SAMEORIGIN
+    X-XSS-Protection: 1; mode=block
+
+  ingressClassResource:
+    default: true
+
+  service:
+    externalTrafficPolicy: Cluster
+    ipFamilyPolicy: SingleStack
+
+  metrics:
+    enabled: ${metrics_enabled:=false}
+  #        serviceMonitor:
+  #          enabled: ${metrics_enabled:=false}
+  #          scrapeInterval: 1m
+
+  spec:
+    template:
+      spec:
+        containers:
+          volumeMounts:
+            - mountPath: /etc/nginx/template
+              name: nginx-template-volume
+              readOnly: true
+        volumes:
+          - name: nginx-template-volume
+            hostPath:
+              path: /mnt/nfs/AppData/ingress-nginx/etc/nginx/template
+              type: Directory
+
+defaultBackend:
+  enabled: true
+  image:
+    repository: ghcr.io/tarampampam/error-pages
+    tag: 3.3.0@sha256:43c9917e99ac1bb4df3c4e037327637e502e2ab4c3d84803b223d5b7db6d4cd7
+    pullPolicy: IfNotPresent
+  extraEnvs:
+    - name: TEMPLATE_NAME
+      value: connection
+    - name: SHOW_DETAILS
+      value: "true"
+    - name: READ_BUFFER_SIZE
+      value: "8192"

infrastructures/ingress-nginx/env/k3s-cluster/kustomization.yaml

@@ -1,8 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-helmCharts:
-  - name: ingress-nginx
-    repo: https://kubernetes.github.io/ingress-nginx
-    version: 4.11.2
-    releaseName: ingress-nginx
-    valuesFile: values.yaml
+resources:
+  - ../../base

infrastructures/ingress-nginx/env/k3s-cluster/values.yaml

@@ -1,75 +0,0 @@
-rbac:
-  create: true
-
-controller:
-  priorityClassName: system-cluster-critical
-
-  extraArgs:
-    update-status-on-shutdown: "false"
-    tcp-services-configmap: "ingress-nginx/tcp-services"
-    udp-services-configmap: "ingress-nginx/udp-services"
-
-  allowSnippetAnnotations: true
-
-  config:
-    proxy-buffer-size: 16k
-    use-gzip: true
-    enable-brotli: true
-    hsts-max-age: 31536000
-    hsts-preload: true
-    disable-ipv6: true
-    disable-ipv6-dns: true
-    keep-alive-requests: 1000
-    use-geoip2: false
-    custom-http-errors: 401,403,404,500,501,502,503,504
-
-  extraEnvs:
-    - name: TZ
-      value: Australia/Sydney
-
-  addHeaders:
-    Referrer-Policy: same-origin, strict-origin-when-cross-origin
-    X-Content-Type-Options: nosniff
-    X-Frame-Options: SAMEORIGIN
-    X-XSS-Protection: 1; mode=block
-
-  ingressClassResource:
-    default: true
-
-  service:
-    externalTrafficPolicy: Cluster
-    ipFamilyPolicy: SingleStack
-
-  metrics:
-    enabled: ${metrics_enabled:=false}
-  #        serviceMonitor:
-  #          enabled: ${metrics_enabled:=false}
-  #          scrapeInterval: 1m
-
-  spec:
-    template:
-      spec:
-        containers:
-          volumeMounts:
-            - mountPath: /etc/nginx/template
-              name: nginx-template-volume
-              readOnly: true
-        volumes:
-          - name: nginx-template-volume
-            hostPath:
-              path: /mnt/nfs/AppData/ingress-nginx/etc/nginx/template
-              type: Directory
-
-defaultBackend:
-  enabled: true
-  image:
-    repository: ghcr.io/tarampampam/error-pages
-    tag: 3.3.0@sha256:43c9917e99ac1bb4df3c4e037327637e502e2ab4c3d84803b223d5b7db6d4cd7
-    pullPolicy: IfNotPresent
-  extraEnvs:
-    - name: TEMPLATE_NAME
-      value: connection
-    - name: SHOW_DETAILS
-      value: "true"
-    - name: READ_BUFFER_SIZE
-      value: "8192"