CHORE(merge): merge develop into main

- dev/sealed-todo-secrets.yaml: use develop version
- prod/sealed-todo-secrets.yaml: keep main version
This commit is contained in:
2025-12-09 21:16:22 +09:00
parent db80cb3dd8
commit 974464efb4
2 changed files with 0 additions and 8 deletions

View File

@@ -6,11 +6,7 @@ metadata:
namespace: todo-dev
spec:
encryptedData:
<<<<<<< HEAD
database-url: AgASB/VD23jcMNwYG53suOU1+4pOWeGTNhG4dT2faQNcJpLycXMwrSc4qfeHklVKD46H2uETkS07kamcvWMMvwPeAflGPZWHfvgxxMchCAmhlH+YvQ+7VKIDHFIhq/adf1Mf4eEDtBDPDUgWmjYMRVAJgrVwkvNyT/jyOCW05g2Fvg0H8CJigPDvJ1BnB3X9rt4O8AkMXtBAje5JTAALPEtEnzNxbztWr7gVwspnUqx3aAXWh/7L5KXOa7O22dPPa3pMI52dCZR0CqAe48lIDSFhJpr/n59dDna6EeBocJ+AGqov6RGzdZ1gonsSGp+LkfjFpbBAiLMY+WTOj5T6BIVJVOlo4SdqhMNgOyKwtxcBNcKK9kZO9C680sRn1e7cTqyOrRge9/vN0F73+Tt0Pdyby/KziEnVe+UhBmWCGF/rZdWeZChqmztPokjhNmFEIlA1Kja0X6gnb1q4+HtHRBK5Z9wDUKnV1f/+sXc1k8VuQk+19DASq8hmwy3a0fvjNO50yr1QTaNzHOm04y+Cgfeh9HwE47pwa0yyLgP4RivW1OORpfZPdwGHiTepEj6+ZoW+kiJ6QyT/fAyt0U+qNxXNE2fSavdKc3QbX7WUVGNLKG2z6OOAVl83P8NzAbieF/VMvaI47zCGsWPynXZhht+RXWYVlbX1ZGay5mhYyUDxb5xx9HoV/8avkk9tnQGCMm6OpmT60LQheTMDhZQhapHY8ewCRLLEi9JyetQKkVk1cv6yPD0WYlBc80vvu+EFtn4T1BcRQX9FVcdOBD8PHIcNAeKmmBt9sdgvz0vq4x8V2cADld/5txKBJQdN8NfmUjY=
=======
database-url: AgBROlCRc9oDqd35FnZ9CXGIA3DU2DwW24U5VdL1yRBH1+7tYwT0j23eFeEkN9SAzlTyC9rE5Lb0nPYfiNNEnSamlzDhIcH+oXXW2sKgR+lSCYnbED8Q7zEJRQSOGTlxq3PtsCSTA8ZiZ9I4B01ZvrPHb6GLRN6M7s47w3yGtV5ZLiubis5tzzFqtae7bpq/fG+cnPoBEgklcfSjwLqY0zuQnqELsUL+Udv8Rc3Zq5HJ2dUkN3FPGHQROsp/gD1NWi5Er+8RpJKzDKdVI9hdUoXbYm+Ih4TZGNJ61e1SB1MeOhabyxGIzYFH5T0PNTn+rEOXqCwWfU8QSRrt5vHS+48b7bmhPId0OTmVJh13lToYKDakNRGVpfsIuUBdnt8HLQ+qDFaajiF6LPvNaDfmdPtWTgavLnpYGZMO5oT6/GTS0WoRomD9kELgEH8EE0PwLtGhg4NhZNnCm8c3pXTdafrfFVH+eDPn9LQQbIzbMldCjFGsKVW2qtPFshjqBbiALwUENC1QbqbRbFsFJ7L+xiieWf2giPIGkiTDuGaHPC9CiRVAOI72FvUvyaFJRZyEe+jo2oMlCn3IJhZwF94ALuLSmLY5m8A1BZHJKt72QICGdSbYOk8rA4EQEeDOWOoc07vlScZqppCf5oIvzkgxjzS+hVTb3hDBebUC94hred8qZJG3VN10T60mt6wOWthIqEUC57+3EPso0OP0K3xjTPY+9j9fKl/vahLjHsuJOR2+jim83gd9isnPltVdQ/G2u6EGtjVHv3vbhjhcefmGZv2jcVqpc6IpyFny/NjDyPzURykfxjEddd5ELMvd2neep18=
>>>>>>> develop
template:
metadata:
name: todo-secrets

View File

@@ -8,11 +8,7 @@ metadata:
namespace: todo
spec:
encryptedData:
<<<<<<< HEAD
database-url: AgAp1/AUmSpG12Td9HxJ+UkLyAHCz93JMNGj+DRha1uSjZHJzLGJnv4KoGnefQPBpZ/TekAyDEtnGbegX15xmMwLr28DhNPsOCfQKKInIjAszDGCRQvZTEL72P6L+hdsTvbLISGy0nzo/xOOTfenWIF36XsmDU9FZD4yIldUfN9pzJFEsJ7NuC25lCdZCvhMiTbJH05aD2LwO7tf1Hg8EfeB7SFZE1HFQYScUwqUDLWQotUxOqZ5mck021X3dx+nQq1pHaBm6yvlpuPHFOGBhrDFemaNScF6PeqWxz29PHMASmzf8He9LDHEZRrSnYjmsdoqkc37omrARfV62rs/mlBvQEfFoTmD8B8Ii1/tPAFNeL3K8/6LtRn27jmL9Z9+fY1gNna/fPSvE8HnUjdyIFhS1XkvigXFvAHAyxXv5TItsU5TYEZJKPAsuaJe30Umm3Sz2Cr3h139Dws5pH4lBggxFM9eJzF8McOazCBJNjjFC71MnZLJmSxp6Ttgb+FHaDdiqlfOhVU321QdBh6IkCbRAf9aUzpE83hPJHWJ/aYzdU7VHjA3wtbN4JD9YWkhmnCuByyQ8knwjPAn01l9rfVUVB/k+xBpK/L3rWk2NaQHpIFDRMQ3BymHWMw92GMBtr1o/FqYfGc8pDFwMyjgrhfFDNEeaLfjg7qd+S6JclHW6d4F2ldizkYjqzq63GuteJdM0+fl3CzyxlAIdAXleeIgdSWhXMvX3xvbF7/iN7agq/sjNDIdiyAbjmcV4U2z4UtKOzDiMozTPYhOBX30WLDfSs3wqF7n4aTY6WmYPC8ra+3TV/4EzEkbPX6KKlncS+k=
=======
database-url: AgCb9Tr6QALpNU5ZHGNxDd/iWUIuCLhbRNESk7aPrI2NzpTuUULo+KkCbl5mCLZ8kK1nttTNZnQTJ4DndnUWckOrOD7+2NRBsWOWwm20Z0Y0dM0iQyHK++xeHEDGZSjzUXUmkJMp3B5knjltDINEnlFgnDJZWhOWZjZ/5RrG7gJEjcq/v0wMPe71lk2WdXBnJ6ck7zpI1gl9b0oFzMA2wdx8McjK3KhBuoLEX/G+4RKITiY68EUW/PyOGOctNxT9ZxuKBTlWcsHVQ1KSxI+nrSV6GNA5F7UcGPdWs8x+QV0ntAzqtPZGyenIwsS9DPUFJhAe3g29kz70BSfWrOPq2q/e5Rda+XSEvnAwHsvax0r3b0pKCnLMQpz6Iclt1l2EEmjU0Llys1gkhYJqN2mRcQIWSErT8kKBvNzmY+eG9K0AzSb1RfC+8H5oXHrQ9gPih9LHLoaUIgAPHXn20kAKfPhwEuW7h394ZponDCHljx5lLB1QPDUS+V5wbgN7y+rAPhPgXTw+Qs4lXMi8hrrE8EzEhi2JFys/zSHsXsWKVCKi//ZLVK1FxzyniQpb2Fwqy7Odhk68TAtCqoiRGzI/faaZeTMdjFggrD+BNqaIVEVNoJ41gRECsdz7Egskc7+kyVfvNWx6IP3O0zr8Uxh7wMr+bmsEUdO9RNS1AgaCK/o4k0t49xmjJ3wpIt/MtGWlnY8x1pUq+MV01o8ZW2UKojTHhMegi3LTdqsMYivAG6V0+4wzMPFSwv9rB7ObDLU7f6RRlMQU73hrsRchOmnl5UiNh2RjSKm+yNbqOhZI
>>>>>>> develop
template:
metadata:
annotations: