CHORE(merge): merge branch main into develop
- Sync develop with main branch - Resolve merge conflicts
This commit is contained in:
@@ -14,6 +14,7 @@ spec:
|
||||
rollingUpdate:
|
||||
maxUnavailable: 1
|
||||
maxSurge: 1
|
||||
revisionHistoryLimit: 1
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
|
||||
@@ -14,7 +14,7 @@ commonLabels:
|
||||
# 이미지 태그 설정
|
||||
images:
|
||||
- name: ghcr.io/mayne0213/todo
|
||||
newTag: main-sha-11433eeb1eb8400195285f0cea21317c4770e75e
|
||||
newTag: main-sha-79deced3754eb0c7635c8506065aefd55be7d001
|
||||
|
||||
patchesStrategicMerge:
|
||||
- deployment-patch.yaml
|
||||
@@ -8,11 +8,10 @@ metadata:
|
||||
namespace: todo
|
||||
spec:
|
||||
encryptedData:
|
||||
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
|
||||
database-url: AgBg7nC3lqjal0EqXw1wjAl63CO9dmXwaKG1QT63WtpavuZv+0DFI4+CXWR1ECpV4TaSyFR5AFX+UwlYuOXOITxj/TceS4ToiUY6FIER2dVIeprT2NMtpHpEvkGYDXGjmIdGEfkKajwxo3GQjJZmYJlORJxagYQELQ24cYyvogjFGzXgQyhGlAZmHrbKjsMlImsCHtxijPYraFcawGL/wcm102v7GRHf0vGft9keam9ofaiUdydQ0fb8XJZctfrjdLVcHN54/5fBKgyOiAmvas3RDZDIjwWnmwaqjo5U3uLGlbCHBgTLIkB3pG4Tsrp93B4Rexb9hqesMcvzmm7wzZ23gz4yrC44xMUfMOpZkXNSYJ9ZDvkzj2WYlSYPhyfqfVSd/7sz8kraCVVqO4oQzDIY0aPfZhcVhbu3ZE9OrbjSTzATfCZ27fn3sRtoFeoBJ7luStdfAJnd0Wa6CFo/VyMwQiwFeS/+83RvxrbpcjmbpxBPQYCfoCTk2fITc6iAgEXmtT9naafqa/z9NaZ8PvEcl7rf9xVQILEqTg9GzTDnPidAif7ILm+g3IjfhiU0Ifp6AbIRp99iEn4PYls6G8AEjuwBqP0NSot2IxI14DLEleO+gVxzzD/4PIbwPlEIFoQXdLLD6QoU8CIVYbA1sTzgbmkuibkFMCBT/ZcmiqJaGrKDS7/EyXxPbX8xWZrxqbIjsEQ+jcwebgeOZrX2cWxU5LBvgJUeiP9Uf7yR/d7edmCyXXKPDWjMU3waOxsOKvuTLwOW5c0CwVjUi1d2eLhPmRJCmefOE3+O1W7jHKziM1oeQxywAlo244eif+N8rYg=
|
||||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
sealedsecrets.bitnami.com/namespace-wide: "true"
|
||||
name: todo-secrets
|
||||
namespace: todo
|
||||
type: Opaque
|
||||
|
||||
Reference in New Issue
Block a user