From 576a5510f91367bda8acc04c335913243616a488 Mon Sep 17 00:00:00 2001
From: "Roy Tang (rt7380)" <rt7380@att.com>
Date: Tue, 14 May 2019 17:08:52 -0500
Subject: [PATCH] HTK: Update kubernetes_pod_anti_affinity function

Currently the weight value is hardcoded for anti-affinity type
preferredDuringSchedulingIgnoredDuringExecution.  This ps updates
the htk function to retrieve the weight value from the configured
setting if it exists, or default to use the original hardcoded
value of 10 if it is not set (for backward compatibility).

Change-Id: I98c8b05ed7861c9c17e9c32569f53bde6ac2579d
---
 .../templates/snippets/_kubernetes_pod_anti_affinity.tpl    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl b/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl
index 1bab4520e..fa01225ea 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl
@@ -27,6 +27,8 @@ values: |
           default: kubernetes.io/hostname
         type:
           default: requiredDuringSchedulingIgnoredDuringExecution
+        weight:
+          default: 10
 usage: |
   {{ tuple . "appliction_x" "component_y" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" }}
 return: |
@@ -74,7 +76,11 @@ podAntiAffinity:
         matchExpressions:
 {{ $matchExpressions | indent 10 }}
       topologyKey: {{ $antiAffinityKey }}
+{{- if  $envAll.Values.pod.affinity.anti.weight }}
+    weight: {{ index $envAll.Values.pod.affinity.anti.weight $component | default $envAll.Values.pod.affinity.anti.weight.default }}
+{{- else }}
     weight: 10
+{{- end -}}
 {{- else if eq $antiAffinityType "requiredDuringSchedulingIgnoredDuringExecution" }}
   {{ $antiAffinityType }}:
   - labelSelector: