bug :: 버그수정

team-xquare · Feb 28, 2024 · 6a6c8ff · 6a6c8ff
1 parent c94d283
commit 6a6c8ff
Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/charts/xquare-application/Chart.yaml b/charts/xquare-application/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 type: application
 name: xquare-application
-version: 1.0.37
+version: 1.0.38
 appVersion: "1.0.0"
 description: Xquare application
diff --git a/charts/xquare-application/templates/argocd-application.yaml b/charts/xquare-application/templates/argocd-application.yaml
@@ -34,15 +34,11 @@ spec:
     path: {{ .source.path }}
     repoURL: {{ .source.repoURL }}
     targetRevision: HEAD
-    {{ if .source.valueFiles }}
     helm:
       valueFiles:
       {{- range .source.valueFiles}}
-        {{- range .values }}
         - {{ . | quote }}
-        {{- end }}
-      {{ end}}
-    {{ end }}
+      {{ end }}
   syncPolicy:
     automated:
       prune: {{ .syncPolicy.automated.prune }}

diff --git a/charts/xquare-application/values.yaml b/charts/xquare-application/values.yaml
@@ -6,6 +6,7 @@ projects:
         source:
           path: deploy
           repoURL: https://github.com/team-xquare/xquare-gitops-repo.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: true
@@ -17,6 +18,7 @@ projects:
         source:
           path: apps/xquare-club
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: true
@@ -26,6 +28,7 @@ projects:
         source:
           path: apps/istio-resource
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -35,6 +38,7 @@ projects:
         source:
           path: apps/xquare-certificate
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false 
@@ -44,6 +48,7 @@ projects:
         source:
           path: apps/external-auth
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -53,6 +58,7 @@ projects:
         source:
           path: apps/aws-node-termination-handler
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -62,6 +68,7 @@ projects:
         source:
           path: apps/dex
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -71,6 +78,7 @@ projects:
         source:
           path: apps/kube-prometheus-stack
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -80,6 +88,7 @@ projects:
         source:
           path: apps/thanos
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -89,6 +98,7 @@ projects:
         source:
           path: apps/loki-stack
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -98,6 +108,7 @@ projects:
         source:
           path: apps/vault
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -107,6 +118,7 @@ projects:
         source:
           path: apps/vault-secret-operator
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false
@@ -116,6 +128,7 @@ projects:
         source:
           path: apps/kubecost
           repoURL: https://github.com/team-xquare/k8s-resource.git
+          valueFiles: ["values.yaml"]
         syncPolicy:
           automated:
             prune: false