From 326eedb0f0881652fbb6691dd089e25e3b816bf9 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 14 Oct 2022 17:07:44 +0200
Subject: [PATCH] fix(apps): Fix missing/broken ServiceAccountNames for oauth
 proxies

This patch adjusts the missing or wrong serviceAccountName for some
oauth2-proxy deployments.
---
 apps/k8s01/forecastle/oauth2.yaml | 20 ++++++++++----------
 apps/k8s01/iot/oauth2.yaml        | 13 +++++++------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/apps/k8s01/forecastle/oauth2.yaml b/apps/k8s01/forecastle/oauth2.yaml
index 99dcfa193..7d00abd01 100644
--- a/apps/k8s01/forecastle/oauth2.yaml
+++ b/apps/k8s01/forecastle/oauth2.yaml
@@ -12,8 +12,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-09-18T22:12:45Z"
-    mac: ENC[AES256_GCM,data:BCTe42nF2mNrjsf3zACXrub9I5AbkufUBAtmVHxhipetJhJc4rMOUPdyejexhvKRFP1+AjP+3NpytSQ7HnBLaZSbtd2Iy888rV9E15+ai0uSfpEDp4cYJXu+qsvNOTJsXC0vey9JE3ndK1KpTO+RGD26cBd9pbgXaLSFafes4l8=,iv:IeatbFnjyBqdDfgnSsoEiZCxKVCPlphS+a141S3vV3I=,tag:BV5HBUUwcbWEfxVVYDrheA==,type:str]
+    lastmodified: "2022-10-14T14:57:57Z"
+    mac: ENC[AES256_GCM,data:yW09yJD4Gq4HQom2f/Zuasj8W3s+FOwqmXaZmv8yjUD7Futx2aeLANJ4XGy50hyoFRwLuoC063tSUaivshWPzyMZZJzKGbp9YZsAxwtat1zwr7EHIiI5CzBS8q98S39B2tCebopSJQLnp+Wg2uu5seSkphDc3iM7JHbJllJtPEY=,iv:srRzxC6Goz5ZHCYoir41cep9B5Ef2YOMDQ5BMWKOBzA=,tag:YaY+5FRGaqpMcRnySCIXjQ==,type:str]
     pgp:
         - created_at: "2022-01-22T04:06:16Z"
           enc: |-
@@ -57,7 +57,7 @@ sops:
             -----END PGP MESSAGE-----
           fp: B137EE1549DFAF960DD1E2B15147025FB9F09E07
     encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|hosts?|tang|externalURL|.*-secret|.*-url|.*Secret|.*-domain)$
-    version: 3.7.1
+    version: 3.7.3
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -65,7 +65,7 @@ metadata:
     name: oauth2-proxy
     namespace: forecastle
 spec:
-    serviceAccountName: forecastle-reconciler
+    serviceAccountName: flux-reconciler
     releaseName: oauth2-proxy
     chart:
         spec:
@@ -126,8 +126,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-09-18T22:12:45Z"
-    mac: ENC[AES256_GCM,data:BCTe42nF2mNrjsf3zACXrub9I5AbkufUBAtmVHxhipetJhJc4rMOUPdyejexhvKRFP1+AjP+3NpytSQ7HnBLaZSbtd2Iy888rV9E15+ai0uSfpEDp4cYJXu+qsvNOTJsXC0vey9JE3ndK1KpTO+RGD26cBd9pbgXaLSFafes4l8=,iv:IeatbFnjyBqdDfgnSsoEiZCxKVCPlphS+a141S3vV3I=,tag:BV5HBUUwcbWEfxVVYDrheA==,type:str]
+    lastmodified: "2022-10-14T14:57:57Z"
+    mac: ENC[AES256_GCM,data:yW09yJD4Gq4HQom2f/Zuasj8W3s+FOwqmXaZmv8yjUD7Futx2aeLANJ4XGy50hyoFRwLuoC063tSUaivshWPzyMZZJzKGbp9YZsAxwtat1zwr7EHIiI5CzBS8q98S39B2tCebopSJQLnp+Wg2uu5seSkphDc3iM7JHbJllJtPEY=,iv:srRzxC6Goz5ZHCYoir41cep9B5Ef2YOMDQ5BMWKOBzA=,tag:YaY+5FRGaqpMcRnySCIXjQ==,type:str]
     pgp:
         - created_at: "2022-01-22T04:06:16Z"
           enc: |-
@@ -171,7 +171,7 @@ sops:
             -----END PGP MESSAGE-----
           fp: B137EE1549DFAF960DD1E2B15147025FB9F09E07
     encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|hosts?|tang|externalURL|.*-secret|.*-url|.*Secret|.*-domain)$
-    version: 3.7.1
+    version: 3.7.3
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -193,8 +193,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-09-18T22:12:45Z"
-    mac: ENC[AES256_GCM,data:BCTe42nF2mNrjsf3zACXrub9I5AbkufUBAtmVHxhipetJhJc4rMOUPdyejexhvKRFP1+AjP+3NpytSQ7HnBLaZSbtd2Iy888rV9E15+ai0uSfpEDp4cYJXu+qsvNOTJsXC0vey9JE3ndK1KpTO+RGD26cBd9pbgXaLSFafes4l8=,iv:IeatbFnjyBqdDfgnSsoEiZCxKVCPlphS+a141S3vV3I=,tag:BV5HBUUwcbWEfxVVYDrheA==,type:str]
+    lastmodified: "2022-10-14T14:57:57Z"
+    mac: ENC[AES256_GCM,data:yW09yJD4Gq4HQom2f/Zuasj8W3s+FOwqmXaZmv8yjUD7Futx2aeLANJ4XGy50hyoFRwLuoC063tSUaivshWPzyMZZJzKGbp9YZsAxwtat1zwr7EHIiI5CzBS8q98S39B2tCebopSJQLnp+Wg2uu5seSkphDc3iM7JHbJllJtPEY=,iv:srRzxC6Goz5ZHCYoir41cep9B5Ef2YOMDQ5BMWKOBzA=,tag:YaY+5FRGaqpMcRnySCIXjQ==,type:str]
     pgp:
         - created_at: "2022-01-22T04:06:16Z"
           enc: |-
@@ -238,4 +238,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: B137EE1549DFAF960DD1E2B15147025FB9F09E07
     encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|hosts?|tang|externalURL|.*-secret|.*-url|.*Secret|.*-domain)$
-    version: 3.7.1
+    version: 3.7.3
diff --git a/apps/k8s01/iot/oauth2.yaml b/apps/k8s01/iot/oauth2.yaml
index ac06dad4c..5f98f6b5a 100644
--- a/apps/k8s01/iot/oauth2.yaml
+++ b/apps/k8s01/iot/oauth2.yaml
@@ -12,8 +12,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-10-11T13:17:35Z"
-    mac: ENC[AES256_GCM,data:7ZxRqvJYjYI/AMgPmxlqvB0Mhu5Shimi6blJ+Nc8hoFBFT0R51VAezLgEsq8ATwZkxMThiwkoF2Ya5mwQ95fwmYUqeJWWXGHJ4Hb1DLRi6u+Rw4V/IApz2HhT/UdGeUNAQLzt94XA/zP9x7HOnaJU8y6Ldkhtkk39MaUujqtkrg=,iv:lCrYOorDMs0Ju93esg8j1I0Sj0LH4Kw/QvSv4vzKJrI=,tag:uZO84hSgVSf3OV6KkNgBjw==,type:str]
+    lastmodified: "2022-10-14T14:59:53Z"
+    mac: ENC[AES256_GCM,data:k2y1OClNvTMcERNzs/DCgaZsEp+qiUkHk+0btcxIXf22tnUYlC97juSNqmM3WwSfCxmixkoIMBRmJgYtwXY1QAdEkBhJcwOae6SCYZFd2lnmNL14XiTzWklGNBrqcefh9AXin8RVoTwsDjCKElRRg0P+01qnXBcYIbVY1DXGIKY=,iv:MmmBBszriOprn3wJPibbmaewxQiC7UKgltWCAeADUoY=,tag:ylePCEtaASjrmbLGZTnMpw==,type:str]
     pgp:
         - created_at: "2022-01-22T04:06:16Z"
           enc: |-
@@ -65,6 +65,7 @@ metadata:
     name: oauth2-proxy
     namespace: iot
 spec:
+    serviceAccountName: flux-reconciler
     releaseName: oauth2-proxy
     chart:
         spec:
@@ -135,8 +136,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-10-11T13:17:35Z"
-    mac: ENC[AES256_GCM,data:7ZxRqvJYjYI/AMgPmxlqvB0Mhu5Shimi6blJ+Nc8hoFBFT0R51VAezLgEsq8ATwZkxMThiwkoF2Ya5mwQ95fwmYUqeJWWXGHJ4Hb1DLRi6u+Rw4V/IApz2HhT/UdGeUNAQLzt94XA/zP9x7HOnaJU8y6Ldkhtkk39MaUujqtkrg=,iv:lCrYOorDMs0Ju93esg8j1I0Sj0LH4Kw/QvSv4vzKJrI=,tag:uZO84hSgVSf3OV6KkNgBjw==,type:str]
+    lastmodified: "2022-10-14T14:59:53Z"
+    mac: ENC[AES256_GCM,data:k2y1OClNvTMcERNzs/DCgaZsEp+qiUkHk+0btcxIXf22tnUYlC97juSNqmM3WwSfCxmixkoIMBRmJgYtwXY1QAdEkBhJcwOae6SCYZFd2lnmNL14XiTzWklGNBrqcefh9AXin8RVoTwsDjCKElRRg0P+01qnXBcYIbVY1DXGIKY=,iv:MmmBBszriOprn3wJPibbmaewxQiC7UKgltWCAeADUoY=,tag:ylePCEtaASjrmbLGZTnMpw==,type:str]
     pgp:
         - created_at: "2022-01-22T04:06:16Z"
           enc: |-
@@ -202,8 +203,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-10-11T13:17:35Z"
-    mac: ENC[AES256_GCM,data:7ZxRqvJYjYI/AMgPmxlqvB0Mhu5Shimi6blJ+Nc8hoFBFT0R51VAezLgEsq8ATwZkxMThiwkoF2Ya5mwQ95fwmYUqeJWWXGHJ4Hb1DLRi6u+Rw4V/IApz2HhT/UdGeUNAQLzt94XA/zP9x7HOnaJU8y6Ldkhtkk39MaUujqtkrg=,iv:lCrYOorDMs0Ju93esg8j1I0Sj0LH4Kw/QvSv4vzKJrI=,tag:uZO84hSgVSf3OV6KkNgBjw==,type:str]
+    lastmodified: "2022-10-14T14:59:53Z"
+    mac: ENC[AES256_GCM,data:k2y1OClNvTMcERNzs/DCgaZsEp+qiUkHk+0btcxIXf22tnUYlC97juSNqmM3WwSfCxmixkoIMBRmJgYtwXY1QAdEkBhJcwOae6SCYZFd2lnmNL14XiTzWklGNBrqcefh9AXin8RVoTwsDjCKElRRg0P+01qnXBcYIbVY1DXGIKY=,iv:MmmBBszriOprn3wJPibbmaewxQiC7UKgltWCAeADUoY=,tag:ylePCEtaASjrmbLGZTnMpw==,type:str]
     pgp:
         - created_at: "2022-01-22T04:06:16Z"
           enc: |-
-- 
GitLab