openstack/openstack-helm
Code Issues Proposed changes

Helm-toolkit: Fixed upgrade daemonset snippet

Browse Source 
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
This commit is contained in:
Artur Korzeniewski 2017-07-21 11:09:36 +02:00
parent d02814940c
commit 7e532bdb11
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl
View File

@ -15,14 +15,15 @@
{{- define "helm-toolkit.snippets.kubernetes_upgrades_daemonset" -}} {{- define "helm-toolkit.snippets.kubernetes_upgrades_daemonset" -}}
{{- $envAll := index . 0 -}} {{- $envAll := index . 0 -}}
{{- $component := index . 1 -}} {{- $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 -}} {{- with $upgradeMap -}}
{{- if .enabled }} {{- if .enabled }}
minReadySeconds: {{ .min_ready_seconds }} minReadySeconds: {{ .min_ready_seconds }}
updateStrategy: updateStrategy:
type: {{ .pod_replacement_strategy }} type: {{ $pod_replacement_strategy }}
{{- if .pod_replacement_strategy }} {{- if $pod_replacement_strategy }}
{{- if eq .pod_replacement_strategy "RollingUpdate" }} {{- if eq $pod_replacement_strategy "RollingUpdate" }}
rollingUpdate: rollingUpdate:
maxUnavailable: {{ .max_unavailable }} maxUnavailable: {{ .max_unavailable }}
{{- end }} {{- end }}