CHORE(merge): merge branch develop
- Sync main with develop branch - Apply development changes
This commit is contained in:
@@ -30,20 +30,6 @@ spec:
|
||||
env:
|
||||
- name: NODE_ENV
|
||||
value: production
|
||||
- name: ARGOCD_SERVER_URL
|
||||
value: "https://argocd-server.argocd.svc.cluster.local"
|
||||
- name: ARGOCD_TOKEN
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: argocd-token
|
||||
key: token
|
||||
optional: false
|
||||
- name: ARGOCD_CA_CERT
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: argocd-ca-cert
|
||||
key: ca.crt
|
||||
optional: true
|
||||
- name: PROMETHEUS_URL
|
||||
value: "http://prometheus.monitoring.svc.cluster.local:9090"
|
||||
resources:
|
||||
|
||||
@@ -4,7 +4,7 @@ kind: Kustomization
|
||||
resources:
|
||||
- deployment.yaml
|
||||
- service.yaml
|
||||
- sealed-argocd-token.yaml
|
||||
# SealedSecret은 각 overlay에서 관리
|
||||
|
||||
commonLabels:
|
||||
app.kubernetes.io/name: portfolio
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
---
|
||||
apiVersion: bitnami.com/v1alpha1
|
||||
kind: SealedSecret
|
||||
metadata:
|
||||
name: argocd-token
|
||||
namespace: portfolio
|
||||
spec:
|
||||
encryptedData:
|
||||
token: AgA6ns/ylNLMLS9mxTuLK77+lRSErBQJD/UTNkVTFEA/DJMWtrttbZ8qbl80P1FEMTrL5t6ZPErxNVc5oeIbpcng6WCR+jTWv6pNsP+YVTCRZarTpn3fIkV5yc1G6YgGIlhVGr3KeNvOhYcKgFg9ivPsZSrDXgixUjppcYLnsdwKJuFZNAQ5KInCDDyK7POhSYMjHbevxS2m+hhApj74g4Ns+RHnS2U5QdLLyXnTsTaj/AeIigGf7rScgMXd2nis3KI4VuZ+YHA/oCC8F+TBM2Qys+oD+MsGgDi+q/Ix+U6GlPy0StXiTNXUytuvfsW0XR8PuXszWMv2o8KXHaFTw3vFSHjcStJzhWbXTNvAJL/dsIWGJiizIfCIvpg3FOh+3rzF21kgNqQczdLXmoLuwR8TRifuWlGmKOwL2Y1Z7njlJuxyhl2LWgjw+Ih9VByWdNi3WzlzAFceslpVYYDdwPv3PwqAz5l5QEEhMpTKsGmPE/gRLRVz1+clymsn28AW3nf4SBPVeu0jsEsdVZOYRmT+AyyIhOonytP7fJ1KhNNmUHJPmPODj83p24PSs3F6NDwbcYYipIA1TcF16VJsjzge7d4EDVAyHo6QHrz17sIt90CBjhYwHDHRJzZciY3U51EmPxeYnMZSlM46uv0ulVs9BXcyz0hDTf0iiTmhfubtLK+lGZI9nM6j4Uwr8z9Ra0aAaaxuI9wJ9FqjboAMQynjvongsQ+5
|
||||
template:
|
||||
metadata:
|
||||
name: argocd-token
|
||||
namespace: portfolio
|
||||
type: Opaque
|
||||
@@ -14,7 +14,7 @@ commonLabels:
|
||||
# 이미지 태그 설정
|
||||
images:
|
||||
- name: ghcr.io/mayne0213/portfolio
|
||||
newTag: develop-sha-5b67e3ecc973bd95ac4fdeedaf4661dc467154df
|
||||
newTag: develop-sha-1a00e7b5c4a974d13a84b1128be5ff545da2d0eb
|
||||
|
||||
patchesStrategicMerge:
|
||||
- deployment-patch.yaml
|
||||
|
||||
@@ -13,7 +13,7 @@ commonLabels:
|
||||
# 이미지 태그 설정
|
||||
images:
|
||||
- name: ghcr.io/mayne0213/portfolio
|
||||
newTag: main-sha-f13b149e0e4335558efcadcad66284f3321ec9bd
|
||||
newTag: main-sha-5df61a879ec383585c422fcd525931249b85b8f2
|
||||
|
||||
patchesStrategicMerge:
|
||||
- deployment-patch.yaml
|
||||
|
||||
Reference in New Issue
Block a user