From 74dda6cdc563d27935daccb2d97336bc5625ae66 Mon Sep 17 00:00:00 2001
From: Michael Goodness <mgoodness@gmail.com>
Date: Wed, 19 Jul 2017 11:22:22 -0500
Subject: [PATCH] [stable/kube2iam] Update strategy (#1510)

* Set UpdateStrategy using .Capabilities

* Bump chart version
---
 stable/kube2iam/Chart.yaml               | 2 +-
 stable/kube2iam/README.md                | 2 +-
 stable/kube2iam/templates/daemonset.yaml | 4 ++--
 stable/kube2iam/values.yaml              | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml
index 299fac64c3..b0118c458d 100644
--- a/stable/kube2iam/Chart.yaml
+++ b/stable/kube2iam/Chart.yaml
@@ -1,5 +1,5 @@
 name: kube2iam
-version: 0.4.0
+version: 0.5.0
 description: Provide IAM credentials to pods based on annotations.
 keywords:
   - kube2iam
diff --git a/stable/kube2iam/README.md b/stable/kube2iam/README.md
index 6fcb046e25..435013abcf 100644
--- a/stable/kube2iam/README.md
+++ b/stable/kube2iam/README.md
@@ -53,8 +53,8 @@ Parameter | Description | Default
 `rbac.create` | If true, create & use RBAC resources | `false`
 `rbac.serviceAccountName` | existing ServiceAccount to use (ignored if rbac.create=true) | `default`
 `resources` | pod resource requests & limits | `{}`
+`updateStrategy` | Strategy for DaemonSet updates (requires Kubernetes 1.6+) | `OnDelete`
 `verbose` | Enable verbose output | `false`
-`updateStrategy` | The strategy for daemon set updates, e.g. `RollingUpdate` (requires Kubernetes 1.6+) | not set
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
diff --git a/stable/kube2iam/templates/daemonset.yaml b/stable/kube2iam/templates/daemonset.yaml
index 8d337f8522..23768da79e 100644
--- a/stable/kube2iam/templates/daemonset.yaml
+++ b/stable/kube2iam/templates/daemonset.yaml
@@ -53,7 +53,7 @@ spec:
 {{ toYaml .Values.nodeSelector | indent 8 }}
     {{- end }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
-  {{- if .Values.updateStrategy }}
+{{- if and (eq .Capabilities.KubeVersion.Major "1") (gt .Capabilities.KubeVersion.Minor "5") }}
   updateStrategy:
     type: {{ .Values.updateStrategy }}
-  {{- end }}
+{{- end }}
diff --git a/stable/kube2iam/values.yaml b/stable/kube2iam/values.yaml
index da56b84965..d9824e4c0d 100644
--- a/stable/kube2iam/values.yaml
+++ b/stable/kube2iam/values.yaml
@@ -40,5 +40,9 @@ resources: {}
   #   cpu: 4m
   #   memory: 16Mi
 
+## Strategy for DaemonSet updates (requires Kubernetes 1.6+)
+## Ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/
+##
+updateStrategy: OnDelete
 
 verbose: false