From 1c7697294d19049a34840be41fdee714f813a327 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Thu, 3 Mar 2022 00:37:24 +0100
Subject: [PATCH] fix(nginx): Test proxy-protocol support for k8s01

---
 .../k8s01/nginx-system/kustomization.yaml     |  4 ++
 .../k8s01/nginx-system/release-override.yaml  | 60 +++++++++++++++++++
 infrastructure/nginx-system/release.yaml      |  6 ++
 3 files changed, 70 insertions(+)
 create mode 100644 clusters/k8s01/nginx-system/kustomization.yaml
 create mode 100644 clusters/k8s01/nginx-system/release-override.yaml

diff --git a/clusters/k8s01/nginx-system/kustomization.yaml b/clusters/k8s01/nginx-system/kustomization.yaml
new file mode 100644
index 000000000..5b4b6bcda
--- /dev/null
+++ b/clusters/k8s01/nginx-system/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- release-override.yaml
diff --git a/clusters/k8s01/nginx-system/release-override.yaml b/clusters/k8s01/nginx-system/release-override.yaml
new file mode 100644
index 000000000..8ce9c6500
--- /dev/null
+++ b/clusters/k8s01/nginx-system/release-override.yaml
@@ -0,0 +1,60 @@
+apiVersion: v1
+kind: Secret
+metadata:
+    name: ingress-nginx-override-values
+    namespace: nginx-system
+type: Opaque
+stringData:
+    values-overrides.yaml: ENC[AES256_GCM,data:FVJP/kGwFJD3wMH/bEAKzuwrlfHOsQNm0ORk0pj14278Mb/ryJLlsVsnCK4ZLGI3tgzOgFZRfVHVfvO5KBoGfTVWWUlhWFqDZvpWo5zRLYnbcCuwx2jIpZKHw9Ry7KDPvMe11/isioDM5esAdvd72M90agPS9rBp6Q==,iv:1e8Kr3PuspqOUXFTFsPrl8oEbKgsmv8I/QgGSCmQV9M=,tag:5tMLDIEXPzf8kj2mF++mCw==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2022-03-02T23:34:36Z"
+    mac: ENC[AES256_GCM,data:ymzdblMoe3hjqDSq7Djip2O6ifMcNYWbxaKm6bh4CcF3nIReGlIwuOPW3IBbJMwPzx8MsMOuzpGawPaA+3/IYB1wuHtGKvUoJmrUdKV/rs60sVOrJ11Q+YEwBqkr98eOau4VOFlVmfEheI6K9F69atTLv4bHLohaGNIYtfT1JBE=,iv:V0eKU3Yylgsx/7+vm3tizfLN6BhOJzyIgoQvMPeAgJ0=,tag:bKnd6ejEtt9t2yZoWo31jg==,type:str]
+    pgp:
+        - created_at: "2022-02-09T22:43:33Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            wcFMA7kpg2bgzVHcARAADWlCAiz3CyI6JANxoCD7FSqqxyGAW+wBxCnN2Pd9y+bf
+            M+qjxnqOBa5SEXtn/Q9TafS3Du1+AnES0T+MVtw6x/cP8jD89ZSisJLlE94bBwrV
+            JPkv6JV3nOoi80dgMNeQOd8tzfdFZO25P24Nzf4cnHJz9x4vQFndFSgS1Zz6Jlyx
+            +ErYR6C/DGEgmFehbvdZRIZwPIcQaC4TokMW9oRP+9zZghtT1lRX5p6M4GdcmzAy
+            PcrQatZ3oNYbfoaDkvXivtWoBwm4t4bGW5j9lgASjsqBcd8lDsxArFQBiR+NcJRz
+            i9an0Uz0ArB6fUn/XFfLtOWtmXMtnKhJ4gnJK3Vu5LQfzS5UHTPJDZRQLtX8kRXG
+            6E/s20HnVi1srjls3mxGUJZ9jIL4OVwSyXOu3QRferHOu/RCKK7nm+UOkMPsXoDK
+            PGIbdAZx/lbKoZS+8zld7UFih+NcgGdLMhZrE+QXU7QAtdHf4UZ4a03fn8XwrX76
+            UIvIG7YKS47c4I3QDUAQIbvH9HTyvQX9CS6jttktbIHfcUHgtaOsS9QRb1vhuhZi
+            /6vkc3uWDV9+Z1yO6DbGj5E4y8erweI5w2vAq8EYMhPdna6h2AYdsWd4gmfan+81
+            lOEnZGKzNntTNFFusDVLMKMdLRWD4/vaZe56ACeJ39tRdD+koavbLEsikHq6spnS
+            5gEioKhhxI4jHeEI5dGDtXQg8k2agqvVwK0RfvAnkN3kjZYmZ/rfVMrv0TTQqdO4
+            EPAO25j1U7BlLB92z1CUtiDkaB1wMCJ7fHFjMMf5sftfy+IktvWWAA==
+            =PpW2
+            -----END PGP MESSAGE-----
+          fp: 286791FB6648539775DB31B8FCB98C2A3EC6F601
+        - created_at: "2022-02-09T22:43:33Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA4oYbIHZIrAPAQ//SZ6MB3LR3Zlp5pvWFVBdT9+ReRK5zPpeVXEslslVmOu6
+            eYlETdYSxdeqrb1Swkq+m3snm1e9c55pp077xCY5rsex0t4yDCXD1EnlGjLDER4c
+            okNMx30Hrs4EZEkXpXq5oE6p9nBckZdwQ3n7Bm3OsecmsXxvV6xH6bV8amzDsJjI
+            5lFWIuw9AIlWosiJdnn/VH9+7PWZYIQwSBS7lyf8+IB2sHS2+ejaVRFxeta3kk0t
+            ZWk2+CA80A8kgp9RoGZNjWOwBRBMdS7oh+t/e4g0LAF1vm3cYoGRe1wMYkT0BjtH
+            j8NqdsyJK1ingSUzDDvjVlJcvdit6Ll/9beoCh7+Zcu0poQ9UNO28f+AGXpJgADS
+            i414dwdUi1ZGzsM2mIiOAPkVezXXzqk8fyA+m/VaIvHl0qGgrCQU93a1mFbfy/P/
+            rV1pHjphUu0WUsVTr9e3Y+K/44872DWOnM6Ek3yiYUlk8sNlrLcDXF6IaRhmpojH
+            VPwjOFXlTH0yrJlATmSpzZvkBduDFq6Bx6s9SgfZiKF6fMopUx11YPoOdjqQ6cua
+            YqOPEEQXVudpNOojDZSMjjwP2qFf0vU25vVyz+AYXusJZmc+MIGqvYE8rfMRxt+0
+            F1Lf3A6N39av1robgpscH1H1Q/A/jcuzwNGWZkt1+mrFkJW7FyvEXdOPx8up4oLU
+            aAEJAhBz50wHUC7M3/U9NG3/DCCC7JayMD8bMq4bLUh1MDVlgjqUxZX4wmG/6SgC
+            PDfEI1l5w/yMS1A6CVxeKtr9OL4HQH8a44+i5HmR8SNYuYquXNwRN7aS+w79Im16
+            y76455qoZQMF
+            =ho5d
+            -----END PGP MESSAGE-----
+          fp: B137EE1549DFAF960DD1E2B15147025FB9F09E07
+    encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|hosts?|tang|externalURL|.*-secret|.*-url|.*Secret|.*-domain|password|subjects|node|apiURL)$
+    version: 3.7.1
diff --git a/infrastructure/nginx-system/release.yaml b/infrastructure/nginx-system/release.yaml
index 7d426072b..6b9c8bc1c 100644
--- a/infrastructure/nginx-system/release.yaml
+++ b/infrastructure/nginx-system/release.yaml
@@ -14,6 +14,12 @@ spec:
         namespace: nginx-system
       version: 4.0.17
   interval: 5m
+  valuesFrom:
+    - kind: Secret
+      name: ingress-nginx-override-values
+      valuesKey: values-overrides.yaml
+      optional: true
+
   values:
     controller:
       ingressClassResource:
-- 
GitLab