fix: add kustomize merge annotation to secrets that exist in base install.yaml
Validate manifests / validate (push) Failing after 3s

argocd-notifications-secret and argocd-secret are defined as empty secrets in
the upstream install.yaml. Without the merge annotation, kustomize errors on
duplicate resource IDs when the KSOPS generator also produces them.
This commit is contained in:
2026-04-19 23:41:29 +01:00
parent f9097676c7
commit 8b21b56512
2 changed files with 36 additions and 32 deletions
@@ -1,27 +1,29 @@
apiVersion: ENC[AES256_GCM,data:flg=,iv:83F3hv2qP3ASBB0lQ7g+QjjoXk0KMFn5V2IvHH11yOk=,tag:Q3rkQD0aKmwqpYL+TSYJfA==,type:str]
kind: ENC[AES256_GCM,data:Jk69Vv9H,iv:rtddSB8OSwWR82N6f43rz57H0oTMjzqq3aODCg3v9rU=,tag:iFHeJUsAlro6hgT8tupdJg==,type:str]
apiVersion: ENC[AES256_GCM,data:uDM=,iv:5zJ9zeBF9HcDpeW5pa2V8DKod7it0QmpJbPYbC2C5l8=,tag:VG3DWeTa0BrkAyy4IEPZgw==,type:str]
kind: ENC[AES256_GCM,data:jSg5p1A0,iv:IQJbzH8kwB8MDtvPODxnVjyHPDJZsmk7pJAsxQgXvIk=,tag:2Z/s7DoQHq1PWCzYyxPdkQ==,type:str]
metadata:
name: ENC[AES256_GCM,data:ewPTx2Lq00hgzYyeVa2+oM6LgFQDK8gg5hLL,iv:1J1Wy46Hvr6mp85q9fv99B9cfsTuExjvpoTDB/8myrY=,tag:DaC/cJ7vkrKMu6Oz7/DJjA==,type:str]
namespace: ENC[AES256_GCM,data:S6wkoPiJ,iv:Cy5HLamnoj1np9bt7ODeGUTucH2PQSxTOPgJl4QfPsQ=,tag:pEepbzA1a0CTmi0tuFA1kA==,type:str]
name: ENC[AES256_GCM,data:nTkL/kAqE63tkjbiJfMAi/FVktLgoXtvBMXU,iv:bjBX8Zw3jkNOXNqKcX1QiKAESRvVAlmy8iKPYWm9bXs=,tag:ZwkFTOOTSq1tx5G6VCCzwA==,type:str]
namespace: ENC[AES256_GCM,data:6wXXTlFW,iv:MNaxNMCC37T4cwcH7QvluctCD4hso/LTYZPGfc3Dl8s=,tag:W81+Q/KyX0mIrfbk/gNwKg==,type:str]
labels:
app.kubernetes.io/component: ENC[AES256_GCM,data:8d2YjLFBp3VPl2zeuxJfOzm788lCAZ3d,iv:qiSqfljW5Hm+Rj5uQ2wSNPMlpwpGIMb8McBMh1LZGaw=,tag:1o+ZMmq3RL3BzUFB6h42nA==,type:str]
app.kubernetes.io/name: ENC[AES256_GCM,data:MFLQilzVzVtXvL/aNV+w4vV4FtS5m80VO34HxkxFyQ==,iv:BNIT3ZRHdzumBUjJdmH/mDihAM5NnyE0HQfwznuJiCk=,tag:rKzodfi6OxO81RK7ZqXaFA==,type:str]
app.kubernetes.io/part-of: ENC[AES256_GCM,data:CbEvLB1O,iv:jummL2+j0lnceAtETXX3h7tS38JXzZxLA79u7Fp7IqA=,tag:jYyQkKOJE4nVXmU1MiviQg==,type:str]
type: ENC[AES256_GCM,data:gAPVO9VZ,iv:3s1IB/K0wdApZlrxdaDBRDf3bBkU9GtCBDy3tZCBlMw=,tag:ZT848ft/1YThZw6ikdrNzw==,type:str]
app.kubernetes.io/component: ENC[AES256_GCM,data:mIBkwyxqAgtQYHpKpvscsSOgGpEweCYX,iv:4Dq0AnGByGTtAUY5dgiRfpdcnyoqSHnLnyYJZ/mJTvM=,tag:qI7ETqJhfQtZ/1uJP4/LVA==,type:str]
app.kubernetes.io/name: ENC[AES256_GCM,data:fJliyNDZ4Rfa6D2QIKLKcmxGk7Pv59DNGLKqjVC78g==,iv:ziFzw+V3crWBdW5Z9mIpRUpuY1Y8xk0fPMrFfHuuxvk=,tag:6OF9t2bn/temQMEhrahnuQ==,type:str]
app.kubernetes.io/part-of: ENC[AES256_GCM,data:lCtXuuKf,iv:XaxeTocZimiU0q0QbDW0N66aKUFX5XHUnSaI95YdLQk=,tag:gEEpdYJ2wG95StL4Dr3J1g==,type:str]
annotations:
kustomize.config.k8s.io/behavior: ENC[AES256_GCM,data:CNXKM2k=,iv:CMLFoADwTlFdkL79xzF1wmqxWbtOM6h9GAfwniZz8Iw=,tag:xBpOixAte8XFalWYOTkbyg==,type:str]
type: ENC[AES256_GCM,data:OCyLelpq,iv:Y1DFcVAFKY4X1gXuNyjciZfFNpfYUByk9qGudC90ebM=,tag:IS9Eqe5NwaiwjOfCNzKFpw==,type:str]
stringData:
gitea-token: ENC[AES256_GCM,data:/6S07DKQX8woDMwLfr/YMRX5RZkyuwZQneGaI26VTy25DKNHNxWOIw==,iv:qWC5ngTvJjFt9EPqhwZWeTtSAKKnGJuCnViN+MtJ09k=,tag:FosylS/Zn08jf39o/M8I6g==,type:str]
gitea-token: ENC[AES256_GCM,data:HtJ71iZcM9EBnYbzbpwnpdx8ErpEYxP+ud//klM7z1DllyaPpSy5JA==,iv:t2IvB5MsFEDC8XkDnKxACj6USz1z9cAwzNYMvpH2a/4=,tag:65N0OlkQgQt+74vI0MEDcQ==,type:str]
sops:
age:
- recipient: age1s0gzgh8c00tgnkgxrqyz2nu0k56xvc9ev3jdenkmu90egux9xfmsxvvj43
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSZEJDem1jRUVsakpiNWFV
MHNIOGVHd2l2eFAvbThjNzhCeDh2KzVXTWdVCld6VnRQWGVmd2hWTTJqUFQ1L3Zt
Zk5XTURvUVRqSmswVitDdnprcUQ5MlUKLS0tIHpSaWc1NDZKNVR1KzFlaVN0QUVh
bmVLNHpyMkhHVmhZMjhDaFdad2l1UDAK2uMzseBvBCX3XaO2vrQYkVsnAqg+H2ri
l99fLmj7cj5psvULsz48Dmhxmj8tEWT3m7XDEIYqTq0WR9OAvHLLIQ==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2STlCQXN3dkJRZ2s2SGNl
Wk44bHpjVUhSNmV1MEV1cjB0S3cyR2F5YkVZCk9sZmNaT2kzVVRjZEFyMkdIb1ZX
amY3bFpLOCtMSFdNZnQ5azVwcEdxbm8KLS0tIGo2WU82eVMzUlFtc3JUSkduQVZB
dVNGRTNyTmNjUlVBRy9sOVV3STBZMTAKukXeDMUklESDFF17XezNj1lkNg68Pkng
oFtBnxqsTDNN5WWIR/VWor8GQlA6uGKymIsEtIsMsKtvxCSnOf3+TQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-04-19T22:38:11Z"
mac: ENC[AES256_GCM,data:ZDE0axhBDCtkYXatCpf6og2s0PS3AYrJ31iQTMcdl5eQio7Q6a1YmvNAaQGW9z7EyrJvE2FXlP6scK52kDOB2cXFsXWC6/ZCgpW9Xjz8jxjzfXjycJdBEynTND2bnhXaYRIyZJBi5IeH/kmwc+o3VQvidqrhNHNjZIFq1cL516M=,iv:xATIsjbkpCWKht3/jYmvXA5zhajLNog39mUwHTneM1I=,tag:dIHuobyi09HBjHRXDc4jug==,type:str]
lastmodified: "2026-04-19T22:41:25Z"
mac: ENC[AES256_GCM,data:lD3x8ysEmZQwKzzFOAgdmmnxM5qhqm0iMwlxW/vcYBh6MyMGqcFC0qOCZMd1eo7EbyNYKdBpZrJvp+QXGQWjebPc8sqX0PgGPbWmuk/SqMo0ZMJnre4C59SSIUo9DdQhWRGZoOrbZ7xl20bV/HCab1ACqeoamBNXow7eeeaosKE=,iv:Igy0kZnu98uTpjJyvAOhrj3AC9H7eyU1I++6kpFtNY0=,tag:oWa4jnOTMTfRp28TMUvLFg==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.2