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:6pI=,iv:SOiwZYQ9ibt5cxUPsjFGKicXsE3s0aioI+yra2RRYek=,tag:/VH/FB3MOb4TRbE9U7YH6A==,type:str]
kind: ENC[AES256_GCM,data:yBPlCctq,iv:mCLCcSPsRTvqHUl/M2bm092l7U1vBdOw7vI884Tl5Do=,tag:RzBsEWGOQP5E915j1qluAA==,type:str]
apiVersion: ENC[AES256_GCM,data:0Dk=,iv:MBWmnkHji7VXquHkJIuzpSTHDsTmN6OuvtGq1BIyeyM=,tag:JFW/1HOaByUdx+gXE/z5gA==,type:str]
kind: ENC[AES256_GCM,data:3xOGEszG,iv:LHUezglyWj7/zCdJtk12iBZoAO3fL7J3iN5fJgirXVU=,tag:ByU5f2TfIcPy1dvyQeiTRA==,type:str]
metadata:
name: ENC[AES256_GCM,data:MgRKogbwDU3w4zoCOQ==,iv:oxGyw6J1/QFN0dM+qVzhnBKAgiUE1IlfIOnm8pdONK4=,tag:7RfvAzZLaBGbxjNTxmu5tw==,type:str]
namespace: ENC[AES256_GCM,data:XN8z9Tns,iv:6dr4MqhKNOO6TUEmcKxwrzOdI39383UsfC6h9LM0ziU=,tag:EPmtKFsB7kAuTwyG26mkEQ==,type:str]
name: ENC[AES256_GCM,data:hzVHdyJNqK4L763uoA==,iv:frXtAV6aGIKKtdBfESHTla24kqJ4tWadJyPOniZLQY8=,tag:U/7mylj9q+tdn3zy71CG0w==,type:str]
namespace: ENC[AES256_GCM,data:ChUXhzu1,iv:Ha5cKWFVdk1vByysEpg1weZ4APJL8mCXUhySoKrvrFM=,tag:K0rAPI1cCKAa1s3grwk20A==,type:str]
labels:
app.kubernetes.io/name: ENC[AES256_GCM,data:svBm8BdGpGQRm1K0wA==,iv:gqf17yYOr13LeEJ4uA85evTYo9M5cLn/pX01bJEzgU0=,tag:PeQ7I9drbhFbcmncsfxIOQ==,type:str]
app.kubernetes.io/part-of: ENC[AES256_GCM,data:zLxaf5eR,iv:86lK8tESmNUu+3naA7N74bFHJ2CQTi57ctvFmI09h5U=,tag:Otztl8aFAaon0Mrg+D6dfQ==,type:str]
type: ENC[AES256_GCM,data:81RzU4Gg,iv:A0PYn779KKH1abtaeJd2mNG5I4gzM34xPJfWxPzZDQg=,tag:Uo/8mRYAEV5QgvObBh9JCA==,type:str]
app.kubernetes.io/name: ENC[AES256_GCM,data:goqINPH4t07kdDGySQ==,iv:681ojmz83BAMcpDBZ1/Q7vh+HKGCaCsSnFUTXAmeX+E=,tag:fcjXO+BB5NNGMUPTmRODow==,type:str]
app.kubernetes.io/part-of: ENC[AES256_GCM,data:SLtRJ/GB,iv:4eHOqd/0FHjdNC5pAg1rRU4RM9GH6V4/28g8AcWfT5M=,tag:Y4O58iWeUi9zOrn4loNrlg==,type:str]
annotations:
kustomize.config.k8s.io/behavior: ENC[AES256_GCM,data:gU3w9y8=,iv:6Ktt02hCJtAC4WycmLl7/kHMPoAnDa7OSX32teOfcRA=,tag:xAz3NkBxInS0HU80kcCRog==,type:str]
type: ENC[AES256_GCM,data:kkRWsfy7,iv:x8tBB4mO2Yl/By53IPgadKsmtbLXyitXs885tk4+bOU=,tag:b6yYiS1d17D8kFSE29uc8w==,type:str]
stringData:
admin.password: ENC[AES256_GCM,data:CGKjrnQaoGLTSXYbtdxJM6MzMR3bJT8s/7EMoprAI7+4t7Dl3GMMOg7dsCcJ6l+42bUWoTNIIRIS6wYW,iv:UPxi2Fc0jtpVDJpFP657zvZ8Qk55o4eekkuTVjpWJ8I=,tag:EW+aQVirTcABMWqtMDV3xg==,type:str]
server.secretkey: ENC[AES256_GCM,data:JtlnOyf6eJcHOhP0jAtTL5kT9iqJtu0fiozybnpxGZAhYVQl6vB62R4WlIQ=,iv:x0AU+L3CD1e8sgwD4lC+8XxmzQ4lH7QG8o2FZqI6XKk=,tag:z2gZ2nRofFD0sEYAxRhYVw==,type:str]
admin.password: ENC[AES256_GCM,data:n/F+kRLtOct4ZfZ8+5eQjwjLDjT6paDUSYKupAcN41+wdvdYHXEKG7xh92N5lycUYlb2FKCQUvQtQIx0,iv:zL7koqBy7j2N68Vg8MU7k7rL3OfgmS578WZIyJ3Uk+w=,tag:xjdVzaky5cR/6lP4MvlqJQ==,type:str]
server.secretkey: ENC[AES256_GCM,data:U8HySATKld5H+1qiY3l+p5h3VAOnA2HIbdoGU4e+rxJc0D7WVBJc/s9qqoI=,iv:nAVWcA1lBIruOKkJ39/E/2eYqFKj8KEmk8GaXYNJ2e4=,tag:XGSl3SpVbNcSeEMaavfbVA==,type:str]
sops:
age:
- recipient: age1s0gzgh8c00tgnkgxrqyz2nu0k56xvc9ev3jdenkmu90egux9xfmsxvvj43
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPR0FlOE0wNDFKcm1nUUFk
WFB0WWtiMlZmeXJwdStYOW04aDQ2QTVYaVV3ClZ6dFlNanI1WVJxMlM1cXB5a3dW
Y0Q3dHd0M0ltRWp2bTNQbGtuakUzTGsKLS0tIElsMmRGM3AzZU9NZGRDMUhvSXY4
VUlLT2JCSVpWWVY5MVhWUlI4VWpiZ2MKC/Z6MSEhX0iqd8a8zpgPAKFiUiuNHW6k
3u+7+kBsO4Ghww2qhlIzP+AuhEULHTLGoFjePmZNauWTikGmXgHpZw==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxQm1Bd3VIU2NRU0NQbEx0
elRJTC93ZGNBeFVIZmxmL2ZOUmUxa3R1WVhZCkhOZnJGOVdQM3A2ZGNFTm5HK2tW
NEsrbnI5alFiY2xUUGlLWjV0ZFBidm8KLS0tIHBTSFlyMkpJR2JZY0lOcS9NQzJC
VmtYNy9FOW5zTEtGNVFhclJXejBWejAKMNd9TpbVKcMWCCbXVIIqrw2lalsiIH3Q
yZoCIszujQMpomaHtPgRYSBdfqa2/WWgxNO0jE9EWEClW6awOce1/w==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-04-19T22:38:11Z"
mac: ENC[AES256_GCM,data:bfMCYfasYyS6yiJCSn3UQQreL0idoc+1eSqR9Z1vNW7lq7t0vQWy2oW6v8ds+oQH+6ODg5cQT+u4IX7btR8C6ffq84z4Abw0K5ul3POJtkWGvjtnJt2EF2Dvg+q497gUK2LOZR/fFdXSImoTDedFqf/DBV+0DL0QHru/UKIuOOA=,iv:5Ks3iLG6tAT92s+3CINe8jv20qoue8NYmI9Z5WqNmbs=,tag:et5xcTjzIagB4feoYmoDBg==,type:str]
lastmodified: "2026-04-19T22:41:25Z"
mac: ENC[AES256_GCM,data:6U5XlgHdnojCNXZGjP7bmm8MKQGgA9CJNuR+muJ87D6HQxaiCv3vii6WDf4bSkKoewZ8/NX5+ISPg+ntKra9dS5Ggr7QFT09xzL4wuDVm5StPZcUwbYeJnrGuMd0cGhHbTSCJEFnFDHk+pb4SMa3KojfNJHmCMIvzLAjmEv9eWU=,iv:PbU58ASf1ltuaoCYsg8nCk1jnlC51zmuhMoIuqnvec8=,tag:wltrBLCx3bI5vnKBUusIPw==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.2