From 7e532bdb116ec595767f43270bf18c6c2424a305 Mon Sep 17 00:00:00 2001
From: Artur Korzeniewski <artur.korzeniewski@intel.com>
Date: Fri, 21 Jul 2017 11:09:36 +0200
Subject: [PATCH] Helm-toolkit: Fixed upgrade daemonset snippet

The issue was with type of upgrade strategy, which was rendered as empty.
It was due to wrong access to the pod_replacement_strategy, which was
out of modified scope:

      daemonsets:
        pod_replacement_strategy: RollingUpdate
        dhcp_agent:
          enabled: false
          min_ready_seconds: 0
          max_unavailable: 1

and the snippet was modifying the scope to daemonset.dhcp_agent, then
trying to access daemonsets.dhcpagent.pod_replacement_strategy, which was
not there:

{{- $upgradeMap := index $envAll.Values.pod.lifecycle.upgrades.daemonsets $component }}
updateStrategy:
  type: {{ .pod_replacement_strategy }}

The fix is to evaluate the common variable before entering the scope
modification.

{{- $pod_replacement_strategy := $envAll.Values.pod.lifecycle.upgrades.daemonsets.pod_replacement_strategy -}}
type: {{ $pod_replacement_strategy }}

Change-Id: I78937b1bf1e0d50ca372de095582c71105d76331
Closes-Bug: 1705662
---
 .../snippets/_kubernetes_upgrades_daemonset.tpl          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl b/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl
index 29f287d19b..4849af27e5 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl
@@ -15,14 +15,15 @@
 {{- define "helm-toolkit.snippets.kubernetes_upgrades_daemonset" -}}
 {{- $envAll := index . 0 -}}
 {{- $component := index . 1 -}}
-{{- $upgradeMap := index $envAll.Values.pod.lifecycle.upgrades.daemonsets $component }}
+{{- $upgradeMap := index $envAll.Values.pod.lifecycle.upgrades.daemonsets $component -}}
+{{- $pod_replacement_strategy := $envAll.Values.pod.lifecycle.upgrades.daemonsets.pod_replacement_strategy -}}
 {{- with $upgradeMap -}}
 {{- if .enabled }}
 minReadySeconds: {{ .min_ready_seconds }}
 updateStrategy:
-  type: {{ .pod_replacement_strategy }}
-  {{- if .pod_replacement_strategy }}
-  {{- if eq .pod_replacement_strategy "RollingUpdate" }}
+  type: {{ $pod_replacement_strategy }}
+  {{- if $pod_replacement_strategy }}
+  {{- if eq $pod_replacement_strategy "RollingUpdate" }}
   rollingUpdate:
     maxUnavailable: {{ .max_unavailable }}
   {{- end }}