From 361ea8d13dd3d8f80dad39c7b865aeede229a6d7 Mon Sep 17 00:00:00 2001
From: Alan Tang <alantang888@users.noreply.github.com>
Date: Thu, 7 Nov 2019 10:06:22 +0000
Subject: [PATCH] K8S tolerations should contain list instead of object (#155)

Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
---
 charts/argo-cd/Chart.yaml  |  2 +-
 charts/argo-cd/README.md   | 10 +++++-----
 charts/argo-cd/values.yaml | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 1ff3b187..b8031b13 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.2.4"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.0.5
+version: 1.0.6
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 62562b5e..caee1092 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -83,7 +83,7 @@ $ helm install --name my-release argo/argo-cd
 | controller.service.port | Controller service port. | `8082` |
 | controller.serviceAccount.create | Create a service account for the controller | `true` |
 | controller.serviceAccount.name | Service account name. | `"argocd-application-controller"` |
-| controller.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `{}` |
+| controller.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `[]` |
 | controller.volumeMounts | Controller volume mounts | `[]` |
 | controller.volumes | Controller volumes | `[]` |
 
@@ -123,7 +123,7 @@ $ helm install --name my-release argo/argo-cd
 | repoServer.service.annotations | Repo server service annotations. | `{}` |
 | repoServer.service.labels | Repo server service labels. | `{}` |
 | repoServer.service.port | Repo server service port. | `8081` |
-| repoServer.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `{}` |
+| repoServer.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `[]` |
 | repoServer.volumeMounts | Repo server volume mounts | `[]` |
 | repoServer.volumes | Repo server volumes | `[]` |
 
@@ -180,7 +180,7 @@ $ helm install --name my-release argo/argo-cd
 | server.service.type | Server service type | `"ClusterIP"` |
 | server.serviceAccount.create | Create server service account | `true` |
 | server.serviceAccount.name | Server service account name | `"argocd-server"` |
-| server.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `{}` |
+| server.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `[]` |
 | server.volumeMounts | Server volume mounts | `[]` |
 | server.volumes | Server volumes | `[]` |
 
@@ -206,7 +206,7 @@ $ helm install --name my-release argo/argo-cd
 | dex.serviceAccount.name | Dex service account name | `"argocd-dex-server"` |
 | dex.servicePortGrpc | Server GRPC port | `5557` |
 | dex.servicePortHttp | Server HTTP port | `5556` |
-| dex.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `{}` |
+| dex.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `[]` |
 | dex.volumeMounts | Dex volume mounts | `"/shared"` |
 | dex.volumes | Dex volumes | `{}` |
 
@@ -225,4 +225,4 @@ $ helm install --name my-release argo/argo-cd
 | redis.priorityClassName | Priority class for redis | `""` |
 | redis.resources | Resource limits and requests for redis | `{}` |
 | redis.servicePort | Redis service port | `6379` |
-| redis.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `{}` |
+| redis.tolerations | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `[]` |
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 6f962a10..5fbf7fe3 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -72,7 +72,7 @@ controller:
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   ##
   nodeSelector: {}
-  tolerations: {}
+  tolerations: []
   affinity: {}
 
   priorityClassName: ""
@@ -143,7 +143,7 @@ dex:
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   ##
   nodeSelector: {}
-  tolerations: {}
+  tolerations: []
   affinity: {}
 
   priorityClassName: ""
@@ -173,7 +173,7 @@ redis:
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   ##
   nodeSelector: {}
-  tolerations: {}
+  tolerations: []
   affinity: {}
 
   priorityClassName: ""
@@ -240,7 +240,7 @@ server:
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   ##
   nodeSelector: {}
-  tolerations: {}
+  tolerations: []
   affinity: {}
 
   priorityClassName: ""
@@ -445,7 +445,7 @@ repoServer:
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   ##
   nodeSelector: {}
-  tolerations: {}
+  tolerations: []
   affinity: {}
 
   priorityClassName: ""