From 2c8a10b18be12996ab88709ad261dfdc2d1e74f7 Mon Sep 17 00:00:00 2001 From: Chris Knowles Date: Sun, 11 Jun 2017 16:54:57 +0800 Subject: [PATCH 1/2] [stable/kube2iam] Rolling updates Also bump to latest image version --- stable/kube2iam/Chart.yaml | 2 +- stable/kube2iam/README.md | 1 + stable/kube2iam/templates/daemonset.yaml | 4 ++++ stable/kube2iam/values.yaml | 5 ++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml index f404e8c9336d..f44ea296f20d 100644 --- a/stable/kube2iam/Chart.yaml +++ b/stable/kube2iam/Chart.yaml @@ -1,5 +1,5 @@ name: kube2iam -version: 0.2.1 +version: 0.3.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 ce9b9996a1e9..951bfe8b40e2 100644 --- a/stable/kube2iam/README.md +++ b/stable/kube2iam/README.md @@ -52,6 +52,7 @@ Parameter | Description | Default `podAnnotations` | annotations to be added to pods | `{}` `resources` | pod resource requests & limits | `{}` `verbose` | Enable verbose output | `false` +`rollingUpdate` | Enable rolling updates to the daemon set (requires Kubernetes 1.6+) | `false` 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 e0fb0504f356..58672edf61f2 100644 --- a/stable/kube2iam/templates/daemonset.yaml +++ b/stable/kube2iam/templates/daemonset.yaml @@ -52,3 +52,7 @@ spec: nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} {{- end }} + {{- if .Values.rollingUpdate }} + updateStrategy: + type: RollingUpdate + {{- end }} diff --git a/stable/kube2iam/values.yaml b/stable/kube2iam/values.yaml index 578c81fd47ea..568ec5a5d0ab 100644 --- a/stable/kube2iam/values.yaml +++ b/stable/kube2iam/values.yaml @@ -9,9 +9,12 @@ host: iptables: false interface: docker0 +# requires k8s 1.6+ +rollingUpdate: false + image: repository: jtblin/kube2iam - tag: 0.2.2 + tag: 0.6.3 pullPolicy: IfNotPresent ## Node labels for pod assignment From 84fb88754bbdc50ba6796d24a0d370df6e7f06c7 Mon Sep 17 00:00:00 2001 From: Chris Knowles Date: Tue, 13 Jun 2017 12:45:49 +0800 Subject: [PATCH 2/2] Allow further update strategies --- stable/kube2iam/README.md | 2 +- stable/kube2iam/templates/daemonset.yaml | 4 ++-- stable/kube2iam/values.yaml | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stable/kube2iam/README.md b/stable/kube2iam/README.md index 951bfe8b40e2..ff76f25af3e0 100644 --- a/stable/kube2iam/README.md +++ b/stable/kube2iam/README.md @@ -52,7 +52,7 @@ Parameter | Description | Default `podAnnotations` | annotations to be added to pods | `{}` `resources` | pod resource requests & limits | `{}` `verbose` | Enable verbose output | `false` -`rollingUpdate` | Enable rolling updates to the daemon set (requires Kubernetes 1.6+) | `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 58672edf61f2..ee3380378b3a 100644 --- a/stable/kube2iam/templates/daemonset.yaml +++ b/stable/kube2iam/templates/daemonset.yaml @@ -52,7 +52,7 @@ spec: nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} {{- end }} - {{- if .Values.rollingUpdate }} + {{- if .Values.updateStrategy }} updateStrategy: - type: RollingUpdate + type: {{ .Values.updateStrategy }} {{- end }} diff --git a/stable/kube2iam/values.yaml b/stable/kube2iam/values.yaml index 568ec5a5d0ab..87fe9d2ad372 100644 --- a/stable/kube2iam/values.yaml +++ b/stable/kube2iam/values.yaml @@ -9,9 +9,6 @@ host: iptables: false interface: docker0 -# requires k8s 1.6+ -rollingUpdate: false - image: repository: jtblin/kube2iam tag: 0.6.3