Revise Helm Charts for Production Installations (#537)

* Revise helm charts ingress yaml error on host enabled * Revise ArgoCD install.yaml to fix misuse of ARGOCD_REDIS_SERVICE env
yorkie-team · May 22, 2023 · dbcec29 · dbcec29
1 parent 1a85319
commit dbcec29
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/build/charts/yorkie-argocd/templates/ingress.yaml b/build/charts/yorkie-argocd/templates/ingress.yaml
@@ -15,10 +15,13 @@ metadata:
 spec:
   ingressClassName: {{ .Values.ingress.ingressClassName }}
   rules:
+    {{ if .Values.ingress.hosts.enabled }}
+    - host: {{ .Values.ingress.hosts.apiHost }}
+      http:
+    {{ end }}
+    {{ if not .Values.ingress.hosts.enabled }}
     - http:
-      {{ if .Values.ingress.hosts.enabled }}
-      host: {{ .Values.ingress.hosts.apiHost }}
-      {{ end }}
+    {{ end }}
         paths:
           - path: {{ .Values.ingress.hosts.argoCDPath }}/
             pathType: Prefix

diff --git a/build/charts/yorkie-argocd/templates/install.yaml b/build/charts/yorkie-argocd/templates/install.yaml
@@ -1035,9 +1035,6 @@ spec:
         - ""
         - --appendonly
         - "no"
-        env:
-        - name: ARGOCD_REDIS_SERVICE
-          value: argocd-redis
         image: redis:7.0.9-alpine
         imagePullPolicy: Always
         name: redis
@@ -1092,7 +1089,7 @@ spec:
       - args:
         - /usr/local/bin/argocd-repo-server
         - --redis
-        - $(ARGOCD_REDIS_SERVICE):6379
+        - argocd-redis:6379
         env:
         - name: ARGOCD_RECONCILIATION_TIMEOUT
           valueFrom:

diff --git a/build/charts/yorkie-cluster/templates/ingress.yaml b/build/charts/yorkie-cluster/templates/ingress.yaml
@@ -17,10 +17,13 @@ metadata:
 spec:
   ingressClassName: {{ .Values.ingress.ingressClassName }}
   rules:
+    {{ if .Values.ingress.hosts.enabled }}
+    - host: {{ .Values.ingress.hosts.apiHost }}
+      http:
+    {{ end }}
+    {{ if not .Values.ingress.hosts.enabled }}
     - http:
-      {{ if .Values.ingress.hosts.enabled }}
-      host: {{ .Values.ingress.hosts.apiHost }}
-      {{ end }}
+    {{ end }}
         paths:
           - path: /
             pathType: Prefix

diff --git a/build/charts/yorkie-cluster/values.yaml b/build/charts/yorkie-cluster/values.yaml
@@ -63,7 +63,6 @@ ingress:
   hosts:
     enabled: false
     apiHost: api.yorkie.dev
-    adminHost: admin.yorkie.dev
 
   alb:
     enabled: false

diff --git a/build/charts/yorkie-monitoring/templates/ingress.yaml b/build/charts/yorkie-monitoring/templates/ingress.yaml
@@ -16,10 +16,13 @@ metadata:
 spec:
   ingressClassName: {{ .Values.ingress.ingressClassName }}
   rules:
+    {{ if .Values.ingress.hosts.enabled }}
+    - host: {{ .Values.ingress.hosts.apiHost }}
+      http:
+    {{ end }}
+    {{ if not .Values.ingress.hosts.enabled }}
     - http:
-      {{ if .Values.ingress.hosts.enabled }}
-      host: {{ .Values.ingress.hosts.apiHost }}
-      {{ end }}
+    {{ end }}
         paths:
           - path: {{ .Values.ingress.hosts.grafanaPath }}/
             pathType: Prefix