CHORE(merge): merge branch develop

- Sync main with develop branch
- Apply development changes
This commit is contained in:
2025-12-07 04:08:07 +09:00
4 changed files with 12 additions and 28 deletions

View File

@@ -15,7 +15,7 @@ commonLabels:
# 이미지 태그 설정
images:
- name: ghcr.io/mayne0213/todo
newTag: develop-sha-0e382c41edf46e7cbba7ba281af165f84d7cd8d0
newTag: develop-sha-a76b98071375ac934b8cd039e2d6b2ed1354e278
patchesStrategicMerge:
- deployment-patch.yaml

View File

@@ -1,16 +1,8 @@
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
apiVersion: v1
kind: Secret
metadata:
creationTimestamp: null
name: todo-secrets
namespace: todo-dev
spec:
encryptedData:
database-url: AgA7of9UzqNwfbiJBp6YFU2tZlpR3ACoY4GmZ48Yx1uBNM2YMQrm+az6yPWCLffaLCGg3gFrs+1nOSTFdPeseVl7svILSQuk031tAXBV5VyPzBaxPVg1xA8fT/Q8k+80cgg7g9cQmrnXFWm+KKfIGCDSLmT8h3WoKh82zqil8cDF6ige2Be36yA6tUf/mGeoJp/wU0GZeCjnOIVBsgTb+cIKGVvAVyQmpL9mH4D8ov+hqwZUdJGGZ+PEbhZCDgPVAwVYDicekhU0zdDpFitHqE5Mrh94Ez6vbGc2G+lX93y1ANq7LLrxJw23D4E77hgHm97HJjpLCPyQpdHvk+dIVgRaJt/jVeldHsIhukmzWEKvjex5jtiWbQXxxpHWJS5uS/Iq3ae5RpEx2V/fXhxg1adxiHhtJxAzzyLcwU46nfIp4mdJdx+ypJ5mk5m/snLAgRHxGJC1LQGzJKLXGT7+z57rFaUa3T49Rni5CaHEzPLhMTJSbQoVZfOElFgSuAOLP+7u9ka0jb1UueTi7flFohIRaoc764gNMk3buXZg3Qp/gQpGlQAmO2HkKL2OePNCuD2eAh3tpnRYJ/gINW+dSeTyBUns2EkaXY66urt4GMic9VGtv60y8FL+2k6VGGOwKmXoQDR1aNXmtvE+U4PjgIdZHcPyWxFT0eBA/XEfoO8RlZqs7bL6kALy0cEpSKavtU7uxpilzDTI+PwiX02GhYlcCi2IYAxG0frFI6/lr4KsJJRAOaxg6f+q+ZyNACgY8Yk+FpK2IYevgH5SRjI4pTmQ5sTEPVcGQDlgLmE=
template:
metadata:
creationTimestamp: null
name: todo-secrets
namespace: todo-dev
type: Opaque
---
stringData:
database-url: "mysql://root:dev-root-password@mariadb-dev.mariadb-dev.svc.cluster.local:3306/TodoDB"

View File

@@ -14,7 +14,7 @@ commonLabels:
# 이미지 태그 설정
images:
- name: ghcr.io/mayne0213/todo
newTag: main-sha-4ae45b6243278207f2f511070aa98039f4a7485a
newTag: main-sha-11433eeb1eb8400195285f0cea21317c4770e75e
patchesStrategicMerge:
- deployment-patch.yaml

View File

@@ -1,16 +1,8 @@
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
apiVersion: v1
kind: Secret
metadata:
creationTimestamp: null
name: todo-secrets
namespace: todo
spec:
encryptedData:
database-url: AgCF9otJ9qUVP1c0Nv1dKv1ZMzXbUF4+KdOcOlrztCjiL5/f/LJi4oC35xEDKzXHaOrS5W+Zvupy5KEhC03qJQ2wbfx4BicYn1jjzyz41QoOqElzQYPS520MjZ/3oXg6Q5ZamnHa8PKXn6+oWQZLJxRK5BBqAuNsXl67lr8EJRCXF1EWyp+fRukcm2aDR6rP/U7HKnf32U8T0+huQh2TmvqeqP3ZWSaAry0eQr+WdwtPWor3ycZQjNJzDZ0hMl5xQCvplU2MsoOzFAnu5oTJPqIICvg3RLj5QdwcMy+qktoh6iEwisx5IjGzsDAV5K/BfylXZQPFZZ59fKJG2wbKmRySrwqhrDJYnydoG7RYapLiUl0kuCvXQ2Ld+hEYMPu1d6QuVcTUw6QTcsulD/FDMIMxxHouof3QJJxrd74HJ4TkX1jOnwU7CM9QxveoqoW//XQDwj8GCcs2b1AvedYoI5AfCCqHRn2J4Oj6UqZtcNyuex2LUGjhH5oYoLr9AGUMfOWOea92Yhy89Hf2P7VIbmXFXFvs1FxjeZkrsn0JsRLJjBvv1WciPpIIW6PSI3wfU3Swx1Sd2eL8aOumlY2CPwcIyxtWAWRcEi9Dktg6KcyCgaa8GXR1R54QBYCh+umRyxyyN1VWwHxmIL9ZR3baSktA+Cf9FcLUOJocsmSroj9MYjYLyhmXAi6Q9CJrYSq0B3dv95baqbvYEN8O8oY4/WkxXw2c/bWMHeK8axMy3ejXnpfcgKQUOiqLTNdMk6jy752/UcRM0hYaHkR6s7GibCoTESbpFwJMuyZ81GwzzNj3xbJbO4w=
template:
metadata:
creationTimestamp: null
name: todo-secrets
namespace: todo
type: Opaque
---
stringData:
database-url: "mysql://root:root-password-change-me@proxysql.mariadb.svc.cluster.local:6033/TodoDB"