Merge "Treasuremap- Dex bind_password updated for subclusters"

2021-07-09 19:51:58 +00:00 · 2021-07-09 19:51:58 +00:00 · 88e7e7d7cd
commit 88e7e7d7cd
parent bbff8b6bc9 77c49201be
5 changed files with 67 additions and 57 deletions
--- a/manifests/function/dex-aio/replacements/update-dex.yaml
+++ b/manifests/function/dex-aio/replacements/update-dex.yaml
@ -21,7 +21,7 @@ replacements:
    objref:
      kind: VariableCatalogue
      name: imported-secrets
-    fieldref: "{.dex.ldap.bind_password}"
+    fieldref: "{.dex.ldap.target-cluster.bind_password}"
  target:
    objref:
      kind: HelmRelease
--- a/manifests/site/reference-airship-core/target/encrypted/results/imported/secrets.yaml
+++ b/manifests/site/reference-airship-core/target/encrypted/results/imported/secrets.yaml
@ -6,29 +6,30 @@ metadata:
    name: imported-secrets
 dex:
    ldap:
-        bind_password: ENC[AES256_GCM,data:K4DZ6YVR1t/rptpqmqnPQXvwc2CcgD8=,iv:hTlrbXCrhZY6vj3SLFEoKJR5u/9U0P0Lt7YSb8MAtdc=,tag:UVzphBM0rFJVUTjkoVraww==,type:str]
+        target-cluster:
+            bind_password: ENC[AES256_GCM,data:bgtoME5sx5VI0+QKeq37MNh6tAaqNBE=,iv:Hvnkwu+/t8y2hVr5Z1KM19dle07pr8COpfBor7LXNBY=,tag:m0p62My8xQHAKIjvNuFMdQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2021-05-12T04:15:43Z"
-    mac: ENC[AES256_GCM,data:eFgnSlP7jtAnhpPezglvmFF0xPLO8KKpnQqySum9PzYCZ9Z7B9fSieZBe58m3dZowSBP2Ns0hiW4QZXPtFX04NKN/+97jUvO2f75pqzYTwYC/asn49O2N6riRM5H7MmqNp+C6fwNUhOutAFjG1CCwOnhB59yId7LlhpQyE+Ofus=,iv:CEK+Lmpz1Tf4S+bZ5I3etOWs2FCMBsecXpq1BteT5gE=,tag:gTs/yy9fLxBrjMAU6KRqMg==,type:str]
+    lastmodified: "2021-07-01T15:09:46Z"
+    mac: ENC[AES256_GCM,data:QpZ7KPHQCXidYvd14E9sM4Q1y1hvMBbhbJ80GbMDFMJ0B0fZNXVrOUBYnPLiXgZPkXU2kB7kthzdTM3WW12WCUDTUELIANVAKJD0t8KY4Fok1jgJIoHd1WOwwK5frmRRutudGHBnyv706R4OdLfhvJcg1vsJjCTe1IPJGFtjOzs=,iv:DeGj+0A9+dq8RRfs/dFs0iXgUb7u/vePXJHnUXaXMfA=,tag:zWbN/LvGW0if9FtFD2HLSA==,type:str]
    pgp:
-        - created_at: "2021-04-14T16:28:50Z"
-          enc: |-
+        - created_at: "2021-07-01T15:09:44Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            wcBMAyUpShfNkFB/AQgAXrMxHATnkcDVixx+LpHMRFZeEnJsnKhFMkYIC+fhtpJD
-            V73hTSSBhbFTlko81oBohS151qNrS1qtVbOhS5anlTOrgZnZ2Fmwt7YIxc68xbhO
-            1fX8XbDAU2NmtWSdmc9sFLCrnpKakHuJfq6PMii8Cga126K7Smt62XuyFWw7r1Z+
-            gyJXgIE2c1GNZmgKhhPgcVBZuyGr6x1Ml4t6qPqMTn1af64T4co+ujI0n1n3dXie
-            p/xCPD2QrI1DSMZgvJzPf8SVUD9jh70LUGJR4fY4U1kTazs/K1JwrPLSH/rWStUA
-            +MNtXkitYzQa4KH4Zr+3rEH6pC8ezgtntT99Wkj8g9LmAcyF+naWCh0Akaui+UNJ
-            21DterDBlRsuJWUgFB54Kw+rSh7T1E4XbZzGQrb86EtCx9+gtPaRJoGYBi98wWAR
-            MORhPC2ylZX46XzMj9DTfMN44rvitTcA
-            =mdwS
+            hQEMAyUpShfNkFB/AQf/T+38VIaLTPNKJiJO4S3xdWP5FYXfvTzfJxPKR4bJK1Hg
+            GELjI4ez+4VLlfp0nqPt4iSCM1rYyjkxJMI7vAI9Kf55DxcjDjQ/4XEKc54lwPWT
+            uNk/M5l22i51IHQYACrJXB5qRWsHoLpmCkbI3mkdR6ZEuOH5km3JENBf3/Q3UFY8
+            3YNczvKRiB055fQs2FHAtnFtUkuYdCnLAhw4a38y+9M9CcPlX3Zmf8TfiwJzE7nJ
+            zvtzS4hS3d7nqTRB55kh0kzYUf1wfQrUoCsSaHmhHEFACYKS8QUDTbpinAknGvQS
+            gWDA1DV8vtoCzvQQvL3gzjbKVshsbKBH7JjeOLQBTdJeARcuwDkphX1QSdxHZuje
+            0bsUZ0smQfrSheX0uxbGkxXF8fqv9VvefA+K/DRFcHIwND485pLb9KTxwH8xKCHR
+            s0QbO1z1bid/D0YFtaW3Sy8w6URbCvZMCs04EnD5dw==
+            =zJWk
            -----END PGP MESSAGE-----
          fp: FBC7B9E2A4F9289AC0C1D4843D16CEE4A27381B4
    unencrypted_regex: ^(kind|apiVersion|group|metadata)$
--- a/manifests/site/reference-multi-tenant/target/encrypted/results/imported/secrets.yaml
+++ b/manifests/site/reference-multi-tenant/target/encrypted/results/imported/secrets.yaml
@ -6,29 +6,32 @@ metadata:
    name: imported-secrets
 dex:
    ldap:
-        bind_password: ENC[AES256_GCM,data:K4DZ6YVR1t/rptpqmqnPQXvwc2CcgD8=,iv:hTlrbXCrhZY6vj3SLFEoKJR5u/9U0P0Lt7YSb8MAtdc=,tag:UVzphBM0rFJVUTjkoVraww==,type:str]
+        target-cluster:
+            bind_password: ENC[AES256_GCM,data:lEzc8j3sh9Znxq+8xEbtGsOlOGoOaSs=,iv:WxPCPjXNZDFyxfGQ5jzGt6YbgYK5MJKlI4DJ7xzzvos=,tag:LuRoxFq4f6LXSHDdHoTCtA==,type:str]
+        subcluster-lma:
+            bind_password: ENC[AES256_GCM,data:WXgIGqhVYlUT7CgBqI7eNG6B1llyU7KY,iv:HjK06OKv+mMOsaxXvH6sxb6BQy6gCFC/3wWS91vhj7E=,tag:/XvaVPcZFz1aLgdVQXpclg==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2021-05-12T04:15:43Z"
-    mac: ENC[AES256_GCM,data:eFgnSlP7jtAnhpPezglvmFF0xPLO8KKpnQqySum9PzYCZ9Z7B9fSieZBe58m3dZowSBP2Ns0hiW4QZXPtFX04NKN/+97jUvO2f75pqzYTwYC/asn49O2N6riRM5H7MmqNp+C6fwNUhOutAFjG1CCwOnhB59yId7LlhpQyE+Ofus=,iv:CEK+Lmpz1Tf4S+bZ5I3etOWs2FCMBsecXpq1BteT5gE=,tag:gTs/yy9fLxBrjMAU6KRqMg==,type:str]
+    lastmodified: "2021-07-01T15:21:33Z"
+    mac: ENC[AES256_GCM,data:v5cxEcg99IUwZ45oNF4VV7u6UitX8WmEDllxPumk6A05Za7R+EaFGHIP/zNBGdEYiBUTrEbOs2vdUR5an8wXoMV36QyZcWtxPAtwx+7fwD0ILOKBBPCiIYcRCCr3YsiVBX6vt1n/6telQenEm3LOLL7q30fqDNkPw4/tS41HvaU=,iv:nd6kQvNflgaZmF7aDPDkztYuw7sBSgt67sWLSvs1ge8=,tag:vMjyeu0HgjqV3uLisGX3JQ==,type:str]
    pgp:
-        - created_at: "2021-04-14T16:28:50Z"
-          enc: |-
+        - created_at: "2021-07-01T15:21:32Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            wcBMAyUpShfNkFB/AQgAXrMxHATnkcDVixx+LpHMRFZeEnJsnKhFMkYIC+fhtpJD
-            V73hTSSBhbFTlko81oBohS151qNrS1qtVbOhS5anlTOrgZnZ2Fmwt7YIxc68xbhO
-            1fX8XbDAU2NmtWSdmc9sFLCrnpKakHuJfq6PMii8Cga126K7Smt62XuyFWw7r1Z+
-            gyJXgIE2c1GNZmgKhhPgcVBZuyGr6x1Ml4t6qPqMTn1af64T4co+ujI0n1n3dXie
-            p/xCPD2QrI1DSMZgvJzPf8SVUD9jh70LUGJR4fY4U1kTazs/K1JwrPLSH/rWStUA
-            +MNtXkitYzQa4KH4Zr+3rEH6pC8ezgtntT99Wkj8g9LmAcyF+naWCh0Akaui+UNJ
-            21DterDBlRsuJWUgFB54Kw+rSh7T1E4XbZzGQrb86EtCx9+gtPaRJoGYBi98wWAR
-            MORhPC2ylZX46XzMj9DTfMN44rvitTcA
-            =mdwS
+            hQEMAyUpShfNkFB/AQf8DvZoCwWzJVyIVhskOfEG2bQBkYlujMfjEeSOs+KX9Jny
+            K/AO9heVLZM1JcfOjmhTyoYgvUiLpKah03Let2Ee+ezNTVisohtIFp3AwwAHNR1D
+            U52SKDGjSvRT0D3Nb26eXvrju1Yg+Ut+2JRhjH6cJnKSwsmiaH46HburluVgbFoR
+            6mNFWVuOcJ4LJcHvydRVDfQxEo6NE4EPFY9ClXxlQHWwnW8AppL8PwQbFVLrawjA
+            5p45eva8Ln6ese9uO8JAuxClmLmkViSXRtosQGjhUuaAL7R72GH3DGSWv9dveLwR
+            i4voaxlfKzuy7UAH83aqJ6xbKr3vowJgo84farY/VNJeAbK+QA2PAtgFG0IvK3qJ
+            N1XhongOBD0KNL3Kx50sLWo2ArNAdjOTBl8coIpVzWxhAhvF7OmFEULxyT1r2yA8
+            NNXakKtXCxhFRshAQqVumU7y0q3lJyIlSegpDZU+OQ==
+            =t/hv
            -----END PGP MESSAGE-----
          fp: FBC7B9E2A4F9289AC0C1D4843D16CEE4A27381B4
    unencrypted_regex: ^(kind|apiVersion|group|metadata)$
--- a/manifests/site/test-site/target/encrypted/results/imported/secrets.yaml
+++ b/manifests/site/test-site/target/encrypted/results/imported/secrets.yaml
@ -6,29 +6,30 @@ metadata:
    name: imported-secrets
 dex:
    ldap:
-        bind_password: ENC[AES256_GCM,data:flF1ShNSQMELmGApJuTOIFJXMYd6R8zz,iv:h5qJA3FFkFtEdCC3z8F4WwISgFTifQYuxmr6uxJxc6U=,tag:/jgvUmDGL5gpjhwuDb6I4w==,type:str]
+        target-cluster:
+            bind_password: ENC[AES256_GCM,data:F2OObaUraJ6MqjMYLNf9JdGTpo8qGbY=,iv:cHYbmTdfxsWkJU7V2NISGrRhUwoflk+5Tkq04KHL9So=,tag:wG3L5Gqf9kZnF5u3yiY4YA==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2021-06-15T21:38:48Z"
-    mac: ENC[AES256_GCM,data:r5EdvmvdlGmzdjWSQ1TbNwiCiYoChkqw6W29crxQjQDsNchVhCzIH9jylOAvWF6NfY4E/k7lFcq/OizG63KW1wrPQTYs2EtHSdJAmkkK+nbJvSsZS5nFL1NqMmylwfkv/KK0YOIjCafF/rYEZuntzaOXsr7jUTeJNecWhZ076RU=,iv:D0Knq4usdNCb49KYvxvrnCrTe2toVtT3EuKu31x8dpg=,tag:oQNctGI8rWqzoaXyz+nDbw==,type:str]
+    lastmodified: "2021-07-01T15:33:29Z"
+    mac: ENC[AES256_GCM,data:bHyR4Pfb6/cxRx2hlHR/9S8MjHtkoIdtfE8e45nUgE5HAMep1CwyaNJaG54ZnkseJQMDgV8mVxQzzEzpwl4OP16mh1pRdrvqNVNAkxtMLB5UZcutJrOPxyhxiG0CQxN+bDeHyA7pBTLdVkrML/Kv1q4KJHB5Jckz3+ICLSyguYo=,iv:hZWqm27DxE95Kjpc5YI2PiqLrewtagLtgxHy4OfsYZs=,tag:Xp7u80qKOj5hiwq6iwo1iQ==,type:str]
    pgp:
-        - created_at: "2021-04-14T16:28:50Z"
-          enc: |-
+        - created_at: "2021-07-01T15:33:29Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            wcBMAyUpShfNkFB/AQgAXrMxHATnkcDVixx+LpHMRFZeEnJsnKhFMkYIC+fhtpJD
-            V73hTSSBhbFTlko81oBohS151qNrS1qtVbOhS5anlTOrgZnZ2Fmwt7YIxc68xbhO
-            1fX8XbDAU2NmtWSdmc9sFLCrnpKakHuJfq6PMii8Cga126K7Smt62XuyFWw7r1Z+
-            gyJXgIE2c1GNZmgKhhPgcVBZuyGr6x1Ml4t6qPqMTn1af64T4co+ujI0n1n3dXie
-            p/xCPD2QrI1DSMZgvJzPf8SVUD9jh70LUGJR4fY4U1kTazs/K1JwrPLSH/rWStUA
-            +MNtXkitYzQa4KH4Zr+3rEH6pC8ezgtntT99Wkj8g9LmAcyF+naWCh0Akaui+UNJ
-            21DterDBlRsuJWUgFB54Kw+rSh7T1E4XbZzGQrb86EtCx9+gtPaRJoGYBi98wWAR
-            MORhPC2ylZX46XzMj9DTfMN44rvitTcA
-            =mdwS
+            hQEMAyUpShfNkFB/AQf/aIUo2/hys4vcUeN5oIIGFGbQ9MIBhTOcTtbUVaOMK4f3
+            GihHbhV1Hh33tQ14cPOUWsOMmVx8L+67S9+ccEcNw6ZMhmZJ+54ZDx5+O7LvxV5j
+            pyMhmTMDfI2clWrxKUJUU2pXZAks6W6RnGvkqx/8mcR2ACIXBu4xj6W4g7VeZ8LH
+            UuuYQiPBD/+Kb6hScCq3G+fcUsTyuDFWaGJArCjgQPFPcNwbiurBo537Ngas5jTQ
+            WGnTVR/cmwv9jzaEiPR9mY+MJ+lA7fNWu4biR4qlbROzUe9q0mUm3qZWmrgOSDp9
+            IiJEmej2Zod63JfYrefqu225oF1fMLwz4G5ixVIJa9JeAc3Bwu/bCYCj7qsj9iwN
+            Z7MZ50es4Gq9XM52wm3RgJKF7BHUhG2GuH8v7ipjaTO3qaQGOd1P4KpH2JropHKT
+            ydYG9fDZrLWXGVt1gmze/eV73L1ZDt2lMQmFJaynVg==
+            =NSuc
            -----END PGP MESSAGE-----
          fp: FBC7B9E2A4F9289AC0C1D4843D16CEE4A27381B4
    unencrypted_regex: ^(kind|apiVersion|group|metadata)$
--- a/manifests/site/virtual-network-cloud/target/encrypted/results/imported/secrets.yaml
+++ b/manifests/site/virtual-network-cloud/target/encrypted/results/imported/secrets.yaml
@ -6,29 +6,34 @@ metadata:
    name: imported-secrets
 dex:
    ldap:
-        bind_password: ENC[AES256_GCM,data:K4DZ6YVR1t/rptpqmqnPQXvwc2CcgD8=,iv:hTlrbXCrhZY6vj3SLFEoKJR5u/9U0P0Lt7YSb8MAtdc=,tag:UVzphBM0rFJVUTjkoVraww==,type:str]
+        target-cluster:
+            bind_password: ENC[AES256_GCM,data:J6VGm0fe2Gm2gnZtNe/+rWq3wN0emNE=,iv:rREcPG5YegFTo/EV9mtZHgd1TIZKM5bwvbst3wOA6fA=,tag:J1zj466bdQoTPeIFXBqeZg==,type:str]
+        subcluster-lma:
+            bind_password: ENC[AES256_GCM,data:QYZXpMeGSdCEunSCjN02Orkz7I0WOxkt,iv:pCuhemAuZojXuidzhjhwUO94125xL7uCINJ+J+cwb+c=,tag:y2rO53o8PhzbYyMBnDAJFQ==,type:str]
+        subcluster-wordpress:
+            bind_password: ENC[AES256_GCM,data:F9SnfpfM6lKBfdWeSEroI9eCzLI974up,iv:q0HDfObdLGlNLPS8msPMnE+zCURZuDPJNGHjJtaY7t8=,tag:lr5esTIYs+8a4lkAMrKmNg==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2021-05-12T04:15:43Z"
-    mac: ENC[AES256_GCM,data:eFgnSlP7jtAnhpPezglvmFF0xPLO8KKpnQqySum9PzYCZ9Z7B9fSieZBe58m3dZowSBP2Ns0hiW4QZXPtFX04NKN/+97jUvO2f75pqzYTwYC/asn49O2N6riRM5H7MmqNp+C6fwNUhOutAFjG1CCwOnhB59yId7LlhpQyE+Ofus=,iv:CEK+Lmpz1Tf4S+bZ5I3etOWs2FCMBsecXpq1BteT5gE=,tag:gTs/yy9fLxBrjMAU6KRqMg==,type:str]
+    lastmodified: "2021-07-01T15:35:38Z"
+    mac: ENC[AES256_GCM,data:dYk5QmsbjO+RZ180M7m5D8pANo70OVfwIq9MdIOchOABv+s3fa+Q3CyxBZdpQZ7TwW/SP0N0VgieBfbGTk9RtvyzGe7tNlPDkRXwA+3s5TVmE4eTN4Q/2xG+eo192hmS5tbCwoP2xf48QlDYrOswBAfFIk7Vo0F9JYHCvP0BKiI=,iv:s/zvKKOodfAcOuQ9ezhxSmZItiKgLwGPBsiHV8Y5/Pg=,tag:OCzMMTG8h2nps2oBd+nIjA==,type:str]
    pgp:
-        - created_at: "2021-04-14T16:28:50Z"
-          enc: |-
+        - created_at: "2021-07-01T15:35:38Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            wcBMAyUpShfNkFB/AQgAXrMxHATnkcDVixx+LpHMRFZeEnJsnKhFMkYIC+fhtpJD
-            V73hTSSBhbFTlko81oBohS151qNrS1qtVbOhS5anlTOrgZnZ2Fmwt7YIxc68xbhO
-            1fX8XbDAU2NmtWSdmc9sFLCrnpKakHuJfq6PMii8Cga126K7Smt62XuyFWw7r1Z+
-            gyJXgIE2c1GNZmgKhhPgcVBZuyGr6x1Ml4t6qPqMTn1af64T4co+ujI0n1n3dXie
-            p/xCPD2QrI1DSMZgvJzPf8SVUD9jh70LUGJR4fY4U1kTazs/K1JwrPLSH/rWStUA
-            +MNtXkitYzQa4KH4Zr+3rEH6pC8ezgtntT99Wkj8g9LmAcyF+naWCh0Akaui+UNJ
-            21DterDBlRsuJWUgFB54Kw+rSh7T1E4XbZzGQrb86EtCx9+gtPaRJoGYBi98wWAR
-            MORhPC2ylZX46XzMj9DTfMN44rvitTcA
-            =mdwS
+            hQEMAyUpShfNkFB/AQf/dKz+TXC8/V8X4HgWzQ+rgrpXZPF8e7hhRY5+gCU4Y+j5
+            0wQJzgLusuVyHm1XwVLaJWlLGp7Kc5aadqLsQqB7waHumxiT3WQmGhqMQZHDqIgp
+            wr24ZxdpD50SmUNEjXAxJ6k/Pft1HmcxkMraYcYwSxAB7H6ERMv7nViFeRkv5hoA
+            uX0Ae1k/ZDUPf5plMSyNDeuRy3cE5vsI2mCZPitNSZQXUEI7+PY9DkU09Zig+Vws
+            vDUT2KdBHnDU6Of62RlxGIcZnnN3148TsHWk7fp1Z0TnkzoqBc2SfdufT016xI0y
+            WiaNg4JaED93N/mprWStymwc4KS5dg6toMAlJTcUKdJcAak1NHN/jTGGBCU5uj2l
+            oM0lvUccQpaZ/ABRuUXORSYnioKnoLnZtIE5phtz2SsT+5jntZ0Cts9nkfevQZCx
+            nqpFLguNcPey2mXUnHOy/Sjsd25W6HmG3uZJSd0=
+            =8gLG
            -----END PGP MESSAGE-----
          fp: FBC7B9E2A4F9289AC0C1D4843D16CEE4A27381B4
    unencrypted_regex: ^(kind|apiVersion|group|metadata)$