From 9e76512fcc5280bedf4675405a0c38ec8e201c34 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 21 Oct 2020 14:18:02 +0100
Subject: [PATCH] Remove argocd from control plane

---
 charts/kubezero-argo-cd/Chart.yaml  |  2 +-
 charts/kubezero-argo-cd/values.yaml | 30 +++++------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/charts/kubezero-argo-cd/Chart.yaml b/charts/kubezero-argo-cd/Chart.yaml
index 1c2f85e2..93427001 100644
--- a/charts/kubezero-argo-cd/Chart.yaml
+++ b/charts/kubezero-argo-cd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 name: kubezero-argo-cd
-version: 0.5.7
+version: 0.6.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-argo-cd/values.yaml b/charts/kubezero-argo-cd/values.yaml
index e41e907a..78e69376 100644
--- a/charts/kubezero-argo-cd/values.yaml
+++ b/charts/kubezero-argo-cd/values.yaml
@@ -48,16 +48,10 @@ argo-cd:
         additionalLabels:
           release: metrics
 
-    # controller to masters
-    nodeSelector:
-      node-role.kubernetes.io/master: ""
-    tolerations:
-    - key: node-role.kubernetes.io/master
-      effect: NoSchedule
     resources:
-      limits:
+      # limits:
         # cpu: 500m
-        memory: 1536Mi
+        # memory: 2048Mi
       requests:
         cpu: 100m
         memory: 256Mi
@@ -72,12 +66,6 @@ argo-cd:
         additionalLabels:
           release: metrics
 
-    nodeSelector:
-      node-role.kubernetes.io/master: ""
-    tolerations:
-    - key: node-role.kubernetes.io/master
-      effect: NoSchedule
-
   server:
     logFormat: json
     config:
@@ -123,18 +111,10 @@ argo-cd:
 
     extraArgs:
     - --insecure
-    nodeSelector:
-      node-role.kubernetes.io/master: ""
-    tolerations:
-    - key: node-role.kubernetes.io/master
-      effect: NoSchedule
 
-  redis:
-    nodeSelector:
-      node-role.kubernetes.io/master: ""
-    tolerations:
-    - key: node-role.kubernetes.io/master
-      effect: NoSchedule
+  # redis:
+  # We might want to try to keep redis close to the controller
+  #   affinity:
 
   dex:
     enabled: false