Mayne0213/jovies
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHORE(merge): merge branch main into develop

Browse Source 
- Sync develop with main branch
- Resolve merge conflicts
This commit is contained in:
Mayne0213
2025-12-12 00:48:47 +09:00
parent 5aafac4f7f 19a44dccec
commit 31ecd1dda4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/k8s/overlays/dev/kustomization.yaml
View File

@@ -14,7 +14,7 @@ commonLabels:
# 이미지 태그 설정 # 이미지 태그 설정
images: images:
- name: ghcr.io/mayne0213/jovies - name: ghcr.io/mayne0213/jovies
newTag: develop-sha-4aa296e37e3611aa8acf3b31565ef7c80aeff3c0 newTag: develop-sha-6fd63cf0ff5bdaa34f12952b3d69c6896f8aed5d
patchesStrategicMerge: patchesStrategicMerge:
- deployment-patch.yaml - deployment-patch.yaml

2
deploy/k8s/overlays/prod/kustomization.yaml
View File

@@ -13,7 +13,7 @@ commonLabels:
# 이미지 태그 설정 # 이미지 태그 설정
images: images:
- name: ghcr.io/mayne0213/jovies - name: ghcr.io/mayne0213/jovies
newTag: main-sha-95deb4ded78e0ff47d7dada4f265f64e2ab9dc61 newTag: main-sha-af477b9ff79f3e19a03dedfccdb099161469471f
patchesStrategicMerge: patchesStrategicMerge:
- deployment-patch.yaml - deployment-patch.yaml