From 37014cbcc9dd47f5a83d5df9ce3bce9aed258625 Mon Sep 17 00:00:00 2001
From: Vignir Hafsteinsson <vignir@gmail.com>
Date: Tue, 9 Apr 2019 17:49:15 +0000
Subject: [PATCH] Support argocd 0.12.0 (#46)

* Adding redis to the helm chart.

Updating from 0.11.0 to 0.12.0

* updating appVersion and helm chart version
---
 charts/argo-cd/Chart.yaml                     |  4 +-
 .../templates/argocd-redis-deployment.yaml    | 38 +++++++++++++++++++
 .../templates/argocd-redis-service.yaml       | 17 +++++++++
 charts/argo-cd/values.yaml                    | 20 +++++++---
 4 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100755 charts/argo-cd/templates/argocd-redis-deployment.yaml
 create mode 100755 charts/argo-cd/templates/argocd-redis-service.yaml

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index a6e2c5fa..0b929154 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "0.11"
+appVersion: "0.12"
 description: A Helm chart for Argo-CD
 name: argo-cd
-version: 0.1.0
+version: 0.2.0
diff --git a/charts/argo-cd/templates/argocd-redis-deployment.yaml b/charts/argo-cd/templates/argocd-redis-deployment.yaml
new file mode 100755
index 00000000..383520fe
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-redis-deployment.yaml
@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: argocd-redis
+  labels:
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-redis
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+    app.kubernetes.io/component: redis
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "argo-cd.name" . }}-redis
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "argo-cd.name" . }}-redis
+        helm.sh/chart: {{ include "argo-cd.chart" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+        app.kubernetes.io/component: redis
+    spec:
+      automountServiceAccountToken: false
+      containers:
+      - name: redis
+        args:
+        - --save
+        - ""
+        - --appendonly
+        - "no"
+        image: {{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}
+        imagePullPolicy: {{ .Values.redis.image.pullPolicy}}
+        ports:
+        - containerPort: {{ .Values.redis.containerPort }}
+
diff --git a/charts/argo-cd/templates/argocd-redis-service.yaml b/charts/argo-cd/templates/argocd-redis-service.yaml
new file mode 100755
index 00000000..01883d75
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-redis-service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: argocd-redis
+  labels:
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-redis
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+    app.kubernetes.io/component: redis
+spec:
+  ports:
+  - port: {{ .Values.redis.servicePort }}
+    targetPort: {{ .Values.redis.servicePort }}
+  selector:
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-redis
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index c107e6f1..5bf74d3b 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -3,7 +3,7 @@ applicationController:
   servicePort: 8083
   image:
     repository: argoproj/argocd
-    tag: v0.11.0
+    tag: v0.12.0
     pullPolicy: Always
 
 server:
@@ -14,11 +14,11 @@ server:
   serviceMetricsPort: 8082
   image:
     repository: argoproj/argocd
-    tag: v0.11.0
+    tag: v0.12.0
     pullPolicy: Always
   uiInitImage:
     repository: argoproj/argocd-ui
-    tag: v0.11.0
+    tag: v0.12.0
     pullPolicy: Always
     
 repoServer:
@@ -26,7 +26,7 @@ repoServer:
   servicePort: 8081
   image:
     repository: argoproj/argocd
-    tag: v0.11.0
+    tag: v0.12.0
     pullPolicy: Always
 
 dexServer:
@@ -40,7 +40,7 @@ dexServer:
     pullPolicy: Always
   initImage:
     repository: argoproj/argocd
-    tag: v0.11.0
+    tag: v0.12.0
     pullPolicy: Always
 
 # terminate tls at ArgoCD level
@@ -125,4 +125,12 @@ rbac:
   #   p, role:org-admin, repositories, delete, *, allow
   #   g, your-github-org:your-team, role:org-admin
   # The default role Argo CD will fall back to, when authorizing API requests
-  policyDefault: #role:readonly
\ No newline at end of file
+  policyDefault: #role:readonly
+
+redis:
+  image:
+    repository: redis
+    tag: 5.0.3
+    pullPolicy: Always
+  containerPort: 6379
+  servicePort: 6379
\ No newline at end of file