From 5bae118324f0582e6cced8cde6f3ff91974fed0e Mon Sep 17 00:00:00 2001 From: James Andariese Date: Sun, 23 Apr 2023 22:02:35 -0500 Subject: [PATCH] adapt for cascade --- argo1/values.yaml | 4 ++-- secrets/git-creds.yaml | 20 ++++++++++++++++++++ secrets/sealed-secret.yaml | 22 ---------------------- secrets/secret.yaml | 14 -------------- 4 files changed, 22 insertions(+), 38 deletions(-) create mode 100644 secrets/git-creds.yaml delete mode 100644 secrets/sealed-secret.yaml delete mode 100644 secrets/secret.yaml diff --git a/argo1/values.yaml b/argo1/values.yaml index 9ca504b..f9a1726 100644 --- a/argo1/values.yaml +++ b/argo1/values.yaml @@ -1,7 +1,7 @@ bootstrap: source: - repoURL: "https://set.to.your.fork/of/this" - targetRevision: "main" + repoURL: "https://git.strudelline.net/infra/argo1" + targetRevision: "prod" haproxy-ingress: enabled: false diff --git a/secrets/git-creds.yaml b/secrets/git-creds.yaml new file mode 100644 index 0000000..65b89bb --- /dev/null +++ b/secrets/git-creds.yaml @@ -0,0 +1,20 @@ +kind: SealedSecret +apiVersion: bitnami.com/v1alpha1 +metadata: + name: local-git-token + namespace: argocd + creationTimestamp: null +spec: + template: + metadata: + name: local-git-token + namespace: argocd + creationTimestamp: null + labels: + argocd.argoproj.io/secret-type: repo-creds + encryptedData: + password: AgCrPpaueeC98AAO4vUUFacf3nxHvm6Cwb3BGNggNJPOPRAWfnBnQlgSNXjpxcb/ugVl/CUzyl7nE58hvL7kgE84OTUNlNV1QNPQht+7GNhbOAUpujnMEouoTdhAL20dJ87zAxI1bK36eyXw9z21q0EaclSivr9Xzy/XPeozEtZA0mE5Ie7imNzvicVegt+7F2VGWHA6ZbhrLzQ3PW+YJ0iqkyiGW2G0RTgzcMHcbrAIs/7yPakzDdMi30mP3Esnd2RyThJtTNv+4sqjbf1WJlz2kJ2jep+B+n7Q/wlJ/pzSOhYZE50NjCnxtUpXa0sDpPYgAu/i4ZDL3rjsD7YbI0HHa3eMc+RFvqWuN3LR2t0d83ETGPCYZmuRcV2rZ0VCL9FG3KmlaSCm/5Td8rU1bEuc+IPqFKgrrr4srhOzjC6yZtqdmqD/X+1uprXM1nLs0/xFELVI9BHZhsVq2BWm4v0469Ks+URVa3gYjl7w37PfEQR5MJyhbzxXdHisNyjHVWWWWWgSdgZPwT7Ga2tJ/05So/KPjrejmI9368Brj5Ijre2xVNSUTSvuEMmJ/4J50f9uQ2x/kYnPgi6W13kZ6Ij2mOmkGStFSNQ1cEYfvHbF/Ac3K+nkRG4q8VMOwWXjLArLdAkYRm6KrNom24HZKjACeM9cg8t7O3ka/rtEtVGNonV+dAO1vgPBQiRe426n3G96e45SyczeYOyiQXM+EK+056s1THno82S1GsOKd30zZTFwYc+rBL8s + project: AgBgc4SimGITdak1irksspEwZQVOTfr2alI3vI6G7HKyGkZndKefQu2q8y11u5+JyMpTYXjkNDeyAr+h46yxer8DGmTG/Te5nm+OyeqZSB2JoMnTxzNQcesmgk7rIC/UkIOYMjYWGUc/ZtEdcObGlluYPeY3JzOeH47E50T3TfbR4AbXcxzsNbQpPrxEeQEtLtcQYSVK7/Si93ot+0062mjtU8+QtJkuVwAZSFPsknsUDHwwB0/dGyjPNGSDxCQhG78GHvWOGaWZJJovRpEUz5ehJ5v78t69nUw10Xcb3MTGJZQVLBNfMv64YmYR3VHsXRCtR4LQEUvYyax3706U7Q7MX7pgpfQsKINrpVpJAZNn02b/ejPSmMCpHrm+ePmhsS0Om5kWC1rOB5BVFnD0Ocn7/22jbOAx9Tix6e4Jaw8zgTYG9TGkIRRjQGzmzzjES+8v2J6OHK+I4AI3QamnDm+0lvMIvwp+a9ifSR6Mr/35EU1uqHdZlPoOUkLV10EseWwL/b4PPQ88K7fM18ijk2atPNJ95nqsgHoXi05DGQBF1iz0tF1F4Dp9VYDbY/cGMJGJKu6+4UJ7CqssKXNmz1X1ks8VJAymM73D9kG/LybM8XXCjP6vK6Nkd9AsrukZk/o/ZzTFsN7bHgrM+INvgqsD/cSAx7Zq2LmFHA0P43OnaJqvoWZpkho1faOEQf6XUucMBhnbMppu + type: AgCJqmj46leRcOtPPq8j2jGreNiSnipk8ak8Fh6Evpq6o8/Q29yDSa/w3L5iZ0ilpL4xuZqIk4UJD1HZ1z9rDFzGTxP8wY9tlZJy0qdT9apOgnQVGw+J1xMc/AreXM7nNZ39Wvi3QvuRqNbA7oRA2a9fGbKBTalJyUkgP5LvOSlpd0t/p5hPWn4K+4PB9JoeonT/kvGF8Z1iyfN4f5Dsm+LR8BKBgGdiI2ztx/q3zdpSnEvg0an5enPjU0e+44S9FcS4zM/vx+W7nkB+KgM5vi+Dy82K34oRV8Ux0W7bsn5L1aH2KsDwUU6+x75oZ1NhAC2WWRB/wVadhSXLDmA0ZL10abJqVM8ixdYuOQqgJyZdJSOZs9NVlVbzWOB/Y5nJbdLyOofoxu0jLsMPmZcj1CDa/0TkIrgbDsEbtrEZLCyyoB1kfNn5pWjVkGdr80OQLLh6BEpd7lMpdyuRWMCeGnJA7N5wX6nXR7TbMNfBCLTa3PiaHom8MiNbbrBOXxtjvpt0tGbSNtcXVMdqiiR+AmJ5LAPOA/DvJNNAakkp/72mpDg48bS9+te13AY5e6zWSzwelwCGF6VgHWSJ59N3FWJWYyBI9v4w83OtL4phhMe9kebpIDt89yG0sm7cwiRjW7B5KnImVe51pBT3xzow50H1SsX7sEfxDCSJqAL888USQ2MvMNcvc3lGd9DS97EDN2y2Z1o= + url: AgBeMXNzB5eT5gZHbf2ZZWBeBSHqdm2mb3WezMAA/9qHE8epYYC9oC21gOjfq4AapWrbaBd0I+ScciEIvIZ6pr5Lwk4yVSpShSgYnCW+iS53EPp2YfcHoc5T4a3Si7sSvbpEbNTSY56Q4tL9vTyfKVUk3iVdQxiUgK3aKN1QZky8XS6/Z7yF03PuwymN40PkdmivSgn9Qy8VSOLhw7Uw3RGprcDyJ2IjUNbosyUxW8ifT1Tune4BUmKfyOrOBDEe4kAw8XWM5C/0E7z3qMVDOl7Uu2qR3NbcAwX3FF7UD4YWCD3g7j22F6WjJCtImRNHygkCHy2Xv15QlBptJtSNYwWkwSQS7BXPlikQOqtu9QQAo7BJ2RCy9bsEAciIBWYfqDa69dmL1hYCq/kBnutQleaLbZPVDXFRxZAdSOewGYq1Xd3hpN0GPbOsOmMTRQQmBQBLwuqA7kF6lbWLqyfKngQllKc7aUYRiCK1ce6HLqPLaH3hUoztPdKUQD2K1G1+2+RztxgF3vlUlo7twSqh5IbGnifZBDHEnnjC6iAz4Y61qdLCdBnR81JtfFGi8W/Ar/K/B9NnTdIPqTLUF056pLaPC17OmeiaQJ9o172nSU928wMXybvMj3hRvgagHtADFaPcG6u5lHggMY9d9x76UouWlhqMs/WczsKgadOWAL3P7DX48d1mX5Bx1jtKzu7WE97XrhsVqKBEl/GuyH01tSQwm+AzIvsmChrV46JZ + username: AgCzvfwyKtys4rAj1UVt0Hrgb3BAl9woA46eoAeo2EdtTnlPuvrVpenBQ+GkoLeGHN/sbuyK1GUKktRBjj9Y9OlziJBwT93EYryS0Ro3WiCbeal7oCXzyWDL2zEXpkrwmi9gBYZWw+yTTGtmHdtoRgnv/3QypmLRTJHtUnv+wwfzF2YR5LwOS5guGTPQBsVUBLC0roEI5PawIIPJlHQMWjijZbcekUjzVE3Kr85xPCyyZ3qEymvJH4jAzC22uDYU5riv8+g1UBABDKPRZFt5mMFM5NoJa2BsOqqp3I/URAOdLbfX7z50MktbJLITooEU7k8SbmDH3tewbsPCDzlmRePd945wKQPWUJaplqIwpszlB2+iVo3qPjb31/yMhrkZFmXXJIACYJij8kDrfESEbL/ObsynAMByN3UivCNnks03aouOhoCSn88Aiz4cvhm7w/U5ADdPMFQv01+HsPeKOy+nXMxii+phAmaLMpEb4E8k+it2aGg4SWRTCuefST5Sy9i94+UVKldUHbAus8pVaEHgKO6Tfx+psXe+Y2wQSk75HYU9LvBbNQzaeGIJ67RLU439LjB2WAyXglJEr8rH5DndZHpmG9fy0xh41uYBkXSgoVYkGcqi63LEHEhcw0BlkLvhvIwom96kKyT3VrAnSwgaryBUf5E7twJ3taBq6wU6lcSmTDCQMiX1wyTkWB7y5Prb6tmNSw== diff --git a/secrets/sealed-secret.yaml b/secrets/sealed-secret.yaml deleted file mode 100644 index 2bbdb38..0000000 --- a/secrets/sealed-secret.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - creationTimestamp: null - name: local-git-token - namespace: argocd -spec: - encryptedData: - password: AgAlNckjIJjOhBKYA54pngBa50DagQ6BtT0I9vvjyhbwBV62efdfnIrRcPSUzrXzSnCMrJPFCYyGZQwHCe7+MurVLPX+i94bBDFjZlGwP7kokaMQjTi4122nWbM0y9AGrYQUtDV3KodRdUkhRP8aAuhqtbzOjqSKB96xHc9EzUKupwrhs7iymbY50d5b7FVxvCBWL0ZzctIwlZU7o2OQ46ImmrAo/0Hn1ueI2wsuhSjg4a4xsh1GipVsRWTCuLO5Ot0eDOgEqQEhTQji5+uwOy4iCuYnj+UHlNodClGsn9MsRv4dIZhCt8kapKKTv4PdQNKSq9JjefgPjyXJs7Za5xTOj07KSsOHdrOQOBNzbf2piaKiGt3p1e8/NhdhB4ODpxbW973y/2ErR4xcf+hpCKQ8CqffNIYEvcRs+NcZAq0afaHQymWTjzqRgYjtceDp8gNIUbQxD5WRlbvaxRwgDWfe4aSrp/cRw7JbwkcOEQGfjGNJr15PmYO7jT8yb8ZJNavUG9KK4tCio8j2nCC7OZECewWr1vj/FLquYvD6AYeKMHKgfL2eRdxcqTwbXIoWXAP6JeWF1oN97xN0TANPljf+Pyt89D73BHMDVuQ1Ei2528y7JZy6xir7C3PoDRBBbSX0imMmHFCngSwtbGYMKdRfbxJ7rG+aamYGo6LUfqArrpnXDGPe4ti/FIp/fUKjYs7azT1f+Ntwfg== - project: AgCaMGRFcW9LaVW8M5dLLwpEGEAnbwXgHZzBWkgkc804rL9lKNuu6L40l0QmZizziEf14u3MdVh5VecHo9julJgMQNaArWIwOLRGR3vcETcYdYHjMmQwUT+TO7GwY7xJZCAxEKMoQrM74ha+wgT2uWMn0uEOFTkobTQfnWLoTlXZcspIWFcTNhdgZeJKAqZMKIt7yE1CF0AjMy+7XWDAGHOByyWllpZSHp2wh78fuaK0tLGzY50+NmwE44cft6lATSh5a/Ko1UL+1uCDeMRvrs2cR5+1Zh9MNWbXHKCggyM81vojf831p58dfJ3yPzXJTWLADZ/k2o3liWvY43W5mp/C4my9wUYR9JRXFsByvbvtu+7vvdhFV2YLEPErKvJAVv66R/r+6u3YQTAAtz8iAHaxLtEn9Tj91b+iBeCqZnnChqfRF4Ts2XZvSmwH6O1V8k6Lv1s9ULYN7lDesvO0W4vbkO01P72vaPgjWYgDLkxeWrnEx5jQM9jPs29U9NaCiiWxnHxReGN87WklCA0Gsb5eyXmbXoh50qICx26Cf2TUqbrVGyMPT0pEJdavXpX7mgQDohP9iAy9ALGFicUmZ8gDH9DeadtqkHT8UgGWWoAGroTMulRCWK1v+plVfRJkfrtw3AXmWTegkNFYX8lYjyAHJokMOEpF4OjL1By2XngfwAnd2eAiSWtU1cPL1Jjv2NCYDR5ZlHXu - type: AgBWOyU8137TFCt3kJC2WJV3gXlBQEirknbHVmS3IDcxwmyhuIxZh5NeLbDfc7Ip9OEtGQFViBD523gUzr3qJRZBE0IAWplF98+NwRopT3jVjxRCt8H6yF8+/3EiagUBe/9WM/eb5+S428KMDT7eDn9PiB6pEjoduxD5w/l+QDBUQQOoejc98bzxjC8ml8EpkaMS4H4yiO7JAlW2QYFRyF1fFaopoEdwyIEkPJ5Br/TXDOtdJeCEIhUhNKE+wQmNZc7MBJKWiqGyb54HzdsAndmF2PQs1FZ+sUCn0xJtu1pP8WTpcKGm4VpHPASlDNQgpuNFBvkYRGe+MErAmqyrAs0E5VU3R0qoIkmbhuvXY+gOploJ2YljG5gqLUx8DtECoSmkrF92oQZx61Yf4duvE/mEciWcDRThzUXwrG8A+qj8B/JxomoEQB4xu/l3WgNBOPMonF77b2dpTckBfH9VH70QKygbMTGAj7zl/sZDavPMZq37SCqNTmRhcDBs1qt3wtv8sUy6F4RUmr6XZsOtePxGg+WYijeHpXXeQSu7oASiZgUcNnjIPFPLc64IXoUv3s4a/QiSGRCgz8uUqws6QSu+TggY4P7f8VBOrJATv4jbOc++XGgWe0o/+b9oQACn5qPrdCkR4hiGd5wZ1BQXVINK5FMXCJq3l4kIjxDdKC6TjfG4vhi2VLld5eAz6f9cNphrocM= - url: AgAk92yrw8BJX0rVsCkZOEz3PhkLMoNhKBOXEAGqlcH+AESKIKUH152fMcfFKNj3DBrOEaNGXM+HiM1DLCd+e4A46ytx/aqSF4uEno2853wLlHjlLQlqfSWdkMYwosSV11Y9MuMGhGTMyCB/u10QUIycUjBs/gZEHDrJV/ObJYtw1pIlMadeKG5nomYYoOiMArdKZ1EXqv010imTItAhrW+Xn4h7/GftCEm2vWPbCdTbFBNIirif2DIAge7kTM3NeLzeLdAqf+tM7+A2Ekw7lU6+bnuVGGNWzEbQI/e4soSGYATQqVdhRPD/UFRJJrmp6IFZ2ymgqKr7t7EbTJ8UKr+GiMP2Gy/9ihBe3cDiQuVEfj791yHMSfChkIQ4vDYzJjMueYJE5pAz04y6QMbqgDxfVaQlx1B2XTP2ma3W+9bMB8vrDCuqK5iWtfM1jSmLVnM10KCsxcQAraE6C8jOArpkUqMPzsCmIfAudEe8FUxv56EeOP0MVT7sHLDKjklxqfgFCzzeqpGAZOP+k8zLT89vXlqbgeUWl3VmXMRqheDmhS6v8YiwJhkusvEdMeC8GOukvXM5limKC/+SZDIUNLlf0wct8/ymi0nkkmcGsfI2Jl7M5ZyOrjjXfvMLeNhc/vE+atXeKIXy8NLoDM0UwjyvMiO2mOpx3ZUwu2M5ff2i9n3rpxevYTh+fpOLWz2CXpLkMzvIm8wIgOow/4mWWYuY1Oqg - username: AgCIo+y2uwCJVEfnLl8wwTKLyw10rMfpJExCHcXq7dBlYWit2tG/uBQr6SM0jqlRINoe0jSNcaVUuzdRZWjvRwW7fwRonz2rjFih9wdmCXYhSc5K4qF5FeB8mO7tmOW+CzILUviZfqnqTyYLzd66BV2etCusuGHPBGomOYsaELYLMzQmpKPLt7an4PP8dUAM09aCeKe0KkTwQcgCkNRKBPRysg1mXnulCpGgWdUDGsj5QCM3byp2+l45g+/RDvELZgnkRjzVNNnXK9AI4Xy3vekDMoNEuFX3A+YWoBwI6LRSRWFOy5hi6w596PrvCq/O4FEomIsFqk9jkBY7dEVXsUX6JKVpIxkwtlKSChO3rt558YGipamt1csNKstM7frgtkzfXoNB7jQiKzHULeimtZnUOSjI8TaboeBKKKLHfrlbIWrJBHD1xJ3kuYCM/O7dpHM5aGBOwPSbjc72ur9Lso/uDs/ZvibsYkuaIBnP+Y8rj+t2d6cFe8//W4zcC90L+0Gnxn1/rLyuAp+B92bb13yq7sY50la2zu7zmvsL41/V4NYErgAUMciT2bSZMvSNh6wtx2IhCyJJSByDbsUMth7ixzfbuK8bgIeoyS3L3V17pB90YI9ttGNLmZ5zJLXzIhejD817EpnrIXHBQqjl0fNpxRgwJw2rmAH8fkKxSbsdT+hX3BORI/LUmFMuXuWhsarwbjTXmVHUV5qvbX0= - template: - metadata: - creationTimestamp: null - labels: - argocd.argoproj.io/secret-type: repo-creds - name: local-git-token - namespace: argocd - type: Opaque - diff --git a/secrets/secret.yaml b/secrets/secret.yaml deleted file mode 100644 index db11e45..0000000 --- a/secrets/secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -stringData: - password: password - project: default - type: git - url: https://github.com/ - username: bobtedsmithy -kind: Secret -metadata: - labels: - argocd.argoproj.io/secret-type: repo-creds - name: local-git-token - namespace: argocd -type: Opaque