diff --git a/infra/project.yaml b/infra/project.yaml index 0de9806..2e6eac2 100644 --- a/infra/project.yaml +++ b/infra/project.yaml @@ -34,6 +34,8 @@ spec: server: '*' - namespace: 'traefik-system' server: '*' + - namespace: 'traefik' + server: '*' - namespace: 'kube-system' server: '*' clusterResourceWhitelist: diff --git a/infra/traefik/cloudflare-cert.yaml b/infra/traefik/cloudflare-cert.yaml index a200a99..273dfeb 100644 --- a/infra/traefik/cloudflare-cert.yaml +++ b/infra/traefik/cloudflare-cert.yaml @@ -2,7 +2,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: wildcard-stonegarden-dev - namespace: traefik-system + namespace: traefik spec: secretName: wildcard-stonegarden-dev-tls dnsNames: diff --git a/infra/traefik/cloudflare-issuer.yaml b/infra/traefik/cloudflare-issuer.yaml index b5341d0..15b83ce 100644 --- a/infra/traefik/cloudflare-issuer.yaml +++ b/infra/traefik/cloudflare-issuer.yaml @@ -2,7 +2,7 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: cloudflare-issuer - namespace: traefik-system + namespace: traefik spec: acme: server: https://acme-v02.api.letsencrypt.org/directory diff --git a/infra/traefik/cloudflare-token-cert-manager.yaml b/infra/traefik/cloudflare-token-cert-manager.yaml index cd08e15..93e94b8 100644 --- a/infra/traefik/cloudflare-token-cert-manager.yaml +++ b/infra/traefik/cloudflare-token-cert-manager.yaml @@ -2,13 +2,12 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: name: cloudflare-token-cert-manager - namespace: traefik-system + namespace: traefik spec: encryptedData: - api-token: AgAJwhExpbTIdzVFXRdBw4tuKHtVMsUuee8Gewjr4Kft+O/RWJ3Gfe9VHmpHNsBFM0oOsCZ5d69JTVfNrLQ531ig+Ed3KcAaxVfUx/ksvLwNnzKEaKWSLmOLDQdqs9yLPJ01K/rhCGDkO7nciXgo+KOJLWUbOwlS/p0E+IMYuS1lFxURb/mARwBvYUvvLlRRmCy9l56LrqEBCpcoC+8Gh+1rrwh/ccrxDYi6cpTmGcPhSJrfHQiQFcjEIPVcwsane3LBwnytJhFCOf25KIp3GGHsikkSpyOugXxqwl37d1nSRDUA8wVas1oTdqts+ipdWkDxAvkCSRW/VdufnipJSmXNgO5CYqQ+PBW1WBtYoXjGaWCt1g+5o5SHdmogu4zr//UQUZ/by03LDitfNNkONWQ4CnrBDxHb8sS8PZI3yMIEfayAhFeGbmka9w0PcwojlWXDwqK3KdfN+heIDT5xh40uNmE/vPmHs1eAxSxrtbfVpag51gZ32cnJKSizEy8HyV6m8D7SLRCJrM2hcOooQG/74ZukB/BflTyASfcTJZ1bJ4DL8Sv5bMYWQHtrTVvQhtfO7UKcOrc6L3Tp082npngyNRDPBMhDxFdfzxa3VXICxfwBp/CL7XMMNuFlFkhbx7xCrx9SiuUyfemOSLeVlKf+zVZ+ASD6A+TUNVHa6YaTj05WDmkrSArrfvmZQ2l3rd4EZ4uaN44g9zrxW/67ThtlhS4A0HH9cK28vMxaFouBzXz6K2y3dTb2 + api-token: AgBii9JCoYnfveWrLHr6vmQGDh1OH4ySh9KLCR+o/fJyexaboHk0Zbq5n8OhPMrCwCBftWalj0hNBgtzjq0AD9AWYGAtO354cbnoXFqJ3AaDkNoEDRiLhxuefky0o2tqw1jUvyc8SSzmVMT4SyXXX+okcr+a9i+gTIft9SCgPSR4wLew1XJJBvmxRn8+VLcsES5ArfKF3R+EFakbHm0H6swnuYZ8upSOTQatbJD3PrCd7aFSJzYbyrKYkRniXlTrbYvokS9Z9YYBBGWGQgHFZZqJxSdkIqpayIBzDomRdWdKazn9y4GhtKsotXQfzK/xXZ/QHTxR6HeUf87qLJPpj5c5+TYlpFfW3QoVV6roKWtkm/qToTkGHOqtKj7YddwohqEfAKsCIGWpiDoEnZaPG7btC62JxdQeP/mlPixwdkqF6wyJ3UCTb7DrWqcu7x2YTTM+8scM5Z9YQ1Xpn4lZzjZeWwXhbSXiP54K0jO3cFGoDsyqHr0kLPBYkCsfETigdFrY2hF0r1NGyW4aqeMRG6OGWWGEC3+lOocT9Q4zJ6WeqZuaMytsQVcTEhy82i6CHiVFhuC9v9nLg794ClkmXiK1bR8sH16QONpSus8Xb51aeUpZ4Lp/Lp4t1+ZVuXYUkObvhSFK6nIZ9VNPrFailniLSMOJZK8Cr99ejyKwMbTcJzMZZ83fU5bRAvBpSL/YMk3Bqf3Tvwi0j4G+a38F3eK3cJI9dIdob6ORdjJSSrXghimLXojkIJqB template: metadata: name: cloudflare-token-cert-manager - namespace: traefik-system + namespace: traefik type: Opaque - diff --git a/infra/traefik/kustomization.yaml b/infra/traefik/kustomization.yaml index c02856b..791707e 100644 --- a/infra/traefik/kustomization.yaml +++ b/infra/traefik/kustomization.yaml @@ -13,6 +13,6 @@ helmCharts: repo: https://traefik.github.io/charts version: 26.0.0 releaseName: traefik - namespace: traefik-system + namespace: traefik includeCRDs: true valuesFile: values.yaml diff --git a/infra/traefik/ns.yaml b/infra/traefik/ns.yaml index c5d4ae8..9be8390 100644 --- a/infra/traefik/ns.yaml +++ b/infra/traefik/ns.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: traefik-system \ No newline at end of file + name: traefik \ No newline at end of file diff --git a/infra/traefik/traefik-forward-auth/auth-secret.yaml b/infra/traefik/traefik-forward-auth/auth-secret.yaml index e286a21..0ed313e 100644 --- a/infra/traefik/traefik-forward-auth/auth-secret.yaml +++ b/infra/traefik/traefik-forward-auth/auth-secret.yaml @@ -2,17 +2,14 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: name: traefik-forward-auth-secrets - namespace: traefik-system + namespace: traefik spec: encryptedData: - google-client-id: AgAEkeepnq/vbztbNDKgIrhoLfYv+mfsFlGwqZ5ncs73mn/2O5VHkVUAZNWkOb6GVb3MGukFAEgGOR2le8T9I0uooLIl82qEl/KYIEv5pSoAfrUHU98L6/dTL2gTQ+2YHIR2olobccgyiFay7xf309gxRrgH9yALsdh9z5SGpcEuSqOPx26Lwm6oEpxz8gvvrGy3va2+ow3JE5tLTpyL3llZI3ddRwoT+ZXajkYuuykM49JWLcHUNHNKVc3Ytcne8rsPv8+tibLa2M0plwQM8sXp9I6Har64wWIoZkh+stYrfJP+lrH8eEQXSGYEFQbhelu39sW+boKYqAJYFUORjBjqmAUSwFUeXbZ3aS9ts1czfVP/uuUl+a8ntliMl0khtRulOiT4pe3pqYjNZUp2+IIh4Qy8OuyOvGydL+mRsWknzSYgNIH6UiBQPj6EhGOuTpB7mMlksHGqa8p/hVcqukkFjr96G4ys54l2dpPXwhmDxaWHZEcckDoUYsl3KUtfZbYNRb5QAG7AN/ZN5DIdqi6HqGp/foL4rsNb71qw3IThHQu5XCFK230S7N5bAE5WFcxnmVr0qVN0zLWbfQDidce6m0HtlAJtPfIe6SiEQOb/A3G8TX6mYPO0KFTxM5jY1+eL/rK8b1RZecu1urX75CXIQSw7gbIWi8V6kAwzxukSsLGwR24KGTuZwlf8Dka08CzA8i6d0uWHfaT/dF4E/keaL2/e2pLTFpKhcyJB1PCSSW6baLjr3hExNZ6Yx5twSv6hF6Yc77dKt0lr6OyIgOaZqC/GIAUwGQM= - google-client-secret: AgCmVRg6/11B52kqqoEEOTAcVkZHW4w1sfRwX9u7LGbFg/9bU3nVHdNu11i1cULtWIpSgqxo7hxFQe3ck/HsZX/gSKQhRLz4YfG/e4vhZ8GDAAycTeJg5rZUoSwDMd894JT0D0uwel5vo11hfkcCAlZ8gnMw7SvJ6fj6cBACwfNEnlJNAMiXYdMdqoX4BIsuxKVXQN3ctJ9Yodvi3U2BdPw4kZwjbWVj510WSqYIEjhJ5Vqcxkds+QaQ+xzis3g/IWbAnW6GdplJJavTGPQ9UgJh3cukHpjcijB0hkydXJCl5kdXRm+j0NLqpe8g2owZKTq3NsT0fZjTaUdC+IeIBMGANSdxRO0+l6lxpcIIjxPpXMK+fnDyRVTnwxZxOhn8JktiM/txcsCMIVKeneif2eextPcXy424aCTmDYdYD9CX7LtrW4fB+plmg7V0Y/CWTEz2AhRmPAd0BnSkFMs433luWFE6m6d3gy9oqjHrE53Ds5NbKUNEq8rCyJdaTHek8rqdp46nmRgyvZSNFfue30sV4ASrY5Qf1Q1+DknAz3uOF2RAQdTlp2nG3XEZzVx9NRgZmhF84VoX+RY5IfI+Ujxejs+43pL+8L265gaBl5KOozLAdkbeqsIxkXPZMXPpmXiDzZD/BiFDaSJLAAMqmNEtBe8IWBjdDgvyMjPS7XCPj2zPEyONmBRgpSuw1P96xlI+cqpw2obOmfNFOb6osco0pO/mLIE6B3L0dud7OJB5K5QQwA== - secret: AgBFgeQpgQZMfcFhAkblaHX7k6jJCLXxFt2ZopePyQk0hLezpLljFozRrdcC2CNiFMNJSwLcSyMwFoVNMlfBM5Ma0t+w61NtUPW/HjhnZu9+5ReMvKmyc8ean/uThP5D+RBlp6NeSBnOYFXQjx6bNvoutKYfj2pD9XM4n0gBERkl3rzddZtnMdtDSCxKuj6zcyMx4zixD2Dmatq0f8k2uVeRWxOA/zFHdvcJBmAW6ABWB0fTS190qcx2k1TY9nABew0d7I2Ozf4Afs2kCGrTueV6owWx2oImSUptXZ2NspO2H5NrmCrTCOH7jmZuDaKZD1D9X/g8IP5ZTec20vjqKibCU+Zegtztyqh3o8LtWITvD3+Ui+N7/QKQqW+cIGHhcTwFsiC+Yb+DhSt57zzQunDKPalUWMCb97T/bhGXLl8gZfUm+Nhqi8iqNgWZD3IDQdKG2xc+wPc5A1ljl7rKZRL28jRF3JZAmJ+5J5c4atyt2RYAmCeSPxfkoviqLFy8Bno70m1MiB0ONIqhBu6dIn6fkBFAj1DqV3oZTxuSTa1s+q7sKeROO4wwOGdYNL4GkXeDdxB94P559GOk1y9Bg4hlemxcQgHDW3qh69eVlaugb/JKyLmqPiWHVkEgLcwRJqbX6L+f8SaPZ6KhBuPLZ0exkA2zPxOK74NVglZ2NXCn4aypQuJb5YiqSHWw4AYw78BnFu4KbfQBfdnQiXq7g3fV6vfX + google-client-id: AgAZUbcBNMC2gTzr4jZUcFRJfP+qQoRaxtXLvt22EQBvCkiAYYJoIO0h5WcWeOUFWOpPRuJzyMuUIvLEoDQutOB+yGOGmDAvowjqJ48FRHj+fY2qyoku4sazUN0jaRcK+e2qT9DrnNlkykb1VHQ4tPK90kZirir6Ci1S+hDRSlJH/Bpg4vlr0/2gF3LnNceTngLeOKNyKR6/T8Jk6Ay/2qU4LVv6l1v3orFFNk17wrnYHtBi/Zw5gbzS5quawITRn1XK0/rGqCNUr6eAmn4Hv3ciHV6aZp+oqjWlo6zag6TyoOzjJRQY2UrYeMDnpUPfXBfdilAg6o0OFavJrMjAgEz/KjhFN7I2jlwah680AC01PWb+44VIAGB5vlFCgfX7c5TI+5U87nT+WZaH+oynFp0UELWN411YtxzEMAz9R6YEbb3c0V86vEfj7i0Zgd9/6iIgqfJR/d+2mLEX5bhLbwT3rNaVVELXyLJfbfB5GzVRGiG8BIzzp2PdxeG7+Mjiu8h/YEoW04da6qhXnaPZ23HbeWjQSMjL7I/uPmLOeOtP85sb7BIgAfJFpAAd8GhcG6olOyHL8QzCKGwav+w85viNlAk2vhp5m3Mpaph6ZH7Pj+ylA4fOjER0oZZxtJksz6qoQPxEWzjkR99xQ4hgnUQR51GWCremqgRF+ZEEZ1jqdfb30oID7+GKaqJx74Qz3bwhEvfrEUXOCJwAN+HYyA1di+/NfprZZqhWf/QfBYiB/wl+I7vjzBqOLcPRhhJ4PcosqkydiLtMAjpVVdTf7gHeA9pX7roWAyU= + google-client-secret: AgCPjnJAJl3fRQ+y6fqr++H1MHml32Pd9I+Uo5TLuQyvsljvUYdcSbBrgNn5+xKEvYBnW+0s2qnbcVLVCoULmRcLoKfM7I+1p6c1/XU+BRP7cWtecO4Oh9f9TXlRJtEDE9GGAsS/wJIamYU45rZGiNHvAYy1QZclEwohIXESs4zWE7scClhkjM9On2magpAbZ49I5Hm0brgxg3oFq64MlOgavXvj9tataqil4L0w6nmzuCW4DBlzCKnUumhxVL2b2Xhw+w6zxtdTdBgIRWoH3sOLS15Sp63Y9j5DD5NRX3ARGIvpmipFI5Im6CBVLxE2oCIiSUMfALWhHGYSnq6Tqclid0TdxbeHrHX914ivxu66JnXrMiy3RaOdPTh71uk6xGkeEaPy/cCk9Xfs0jxzsitC2QOBAxTltMvBmakBa9Vk5tkBFiXRTL2TkE/13NfA/rhCol0BrQd7eB5KrifKfJRSGQlNYsvY2pgtelykoMHQ2CN8FXHAsWRnVBRFGhiQZicJvgZuOLYvkONPobdwtKOz5bXaOjGdNThL5s+tL2clH/E4xZeqFV3hHMCOW3JRjhzNB45eEib+h2+g75vyxXXf1AAjo3vgv29MM5gd79g+VqEeVKorZ1k77IPWookGVYZapYCriM9foPMK502GB8RktNygztWpYzGcBx65K6/vSzIw+tmEWE99z1dX+IVt+ylk9nbuSn6cm3adw0MHL1+Wm+C1KtWUMX/DusTkywkbulWgXA== + secret: AgBBkzZj6wTV3ijo6tZEMIXatheaNxWQrM8zdpr4tvKvRrm1F2Za9qas5Td+RFtynmEeIUn7dlPk/DXldW6iFnqfCkliNGkJlKov7BqOVCS/LozQPDjMaz70I4lniSiSH5r2Z+zBBvxhy6CGIN6bZoIT2mT18B4V18IZPT7L/o5kFBD6/u0TeE1VWZneXNB/T3XQgaZZ1eLoPrxheRo08sQS417P1CvNS9s+BJn7GKQTeidHSc/WlahsHPoIwR1b3f/YuUo9juld+CZ1E8+4d5pKpmsiv4irGWHVqCWhTA1BpbH+zb4DJZ3IYPp0UCCJjhdLttvKaZjRkHVzftft0SCZCvmmtcLkgXU5WUeKEHOjGW6D1KftblqvASq01i9WCytQABS1kpEIgEnjANz3nyraLVqKxLOfU+XSRdFrwhLBLeIKOb1x0xb7L9cHRqMKYlhCDDL1MbjjSFC+eNZnB/DLHF+cAYH2CHhfaSZxRbUIOKg9wMcogsUAowE8R6vrZkaUWMp8XrnIP+JdgYvwTci9UpVlWSRt/4XvvUczkAJ6nES1/Xp0ASVG8yN3X2Ddb3E8APeBgpSa2MRCHOHH0XE5+5GvbWFgOE2eZpfnNvmbVLCRnDIPVyY72IMdP9iz5dE5bQZnpz6b9Z4nj0kJPzl2+YQ5vuyT4HC25V1yRWSLKFVzMhAexv6oTix0ERomunbhxN6OS+cJBefY/sfguYA4CR/k template: metadata: - annotations: - sealedsecrets.bitnami.com/managed: "true" name: traefik-forward-auth-secrets - namespace: traefik-system + namespace: traefik type: Opaque - diff --git a/infra/traefik/traefik-forward-auth/deployment.yaml b/infra/traefik/traefik-forward-auth/deployment.yaml index 1ff1de8..093bc7d 100644 --- a/infra/traefik/traefik-forward-auth/deployment.yaml +++ b/infra/traefik/traefik-forward-auth/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: traefik-forward-auth - namespace: traefik-system + namespace: traefik spec: replicas: 1 selector: diff --git a/infra/traefik/traefik-forward-auth/ingress.yaml b/infra/traefik/traefik-forward-auth/ingress.yaml index 2221189..16b592b 100644 --- a/infra/traefik/traefik-forward-auth/ingress.yaml +++ b/infra/traefik/traefik-forward-auth/ingress.yaml @@ -2,7 +2,7 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: traefik-dashboard-auth - namespace: traefik-system + namespace: traefik spec: entryPoints: - websecure diff --git a/infra/traefik/traefik-forward-auth/kustomization.yaml b/infra/traefik/traefik-forward-auth/kustomization.yaml index 0375034..8382cce 100644 --- a/infra/traefik/traefik-forward-auth/kustomization.yaml +++ b/infra/traefik/traefik-forward-auth/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: traefik-system +namespace: traefik commonLabels: app: traefik-forward-auth diff --git a/infra/traefik/traefik-forward-auth/middleware.yaml b/infra/traefik/traefik-forward-auth/middleware.yaml index 9ce533a..51b80c0 100644 --- a/infra/traefik/traefik-forward-auth/middleware.yaml +++ b/infra/traefik/traefik-forward-auth/middleware.yaml @@ -2,10 +2,10 @@ apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: traefik-forward-auth - namespace: traefik-system + namespace: traefik spec: forwardAuth: - address: http://traefik-forward-auth.traefik-system.svc.cluster.local:4181 + address: http://traefik-forward-auth.traefik.svc.cluster.local:4181 authResponseHeaders: - X-Forwarded-User trustForwardHeader: true \ No newline at end of file diff --git a/infra/traefik/traefik-forward-auth/service.yaml b/infra/traefik/traefik-forward-auth/service.yaml index bd37e3b..17912d6 100644 --- a/infra/traefik/traefik-forward-auth/service.yaml +++ b/infra/traefik/traefik-forward-auth/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: traefik-forward-auth - namespace: traefik-system + namespace: traefik spec: type: ClusterIP selector: