Merge pull request #31 from Enterprise-connect/v1.1beta_helm_pkg_update

V1.1beta helm pkg update
EC-Release · Jun 24, 2020 · b07220d · b07220d
2 parents d1227d9 + eaa3cb9
commit b07220d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/k8s/agent/templates/_helpers.tpl b/k8s/agent/templates/_helpers.tpl
@@ -79,7 +79,7 @@ Generate container port spec for client agent. Need review for gateway usage
 Generate service port spec for client agent pods. Need review for gateway usage
 */}}
 {{- define "agent.svcPortSpec" -}}
-- port: {{ .Values.agtK8Config.svcPortNum }}
+- port: {{ ternary .Values.agtK8Config.svcPortNum .Values.global.agtK8Config.svcPortNum (kindIs "invalid" .Values.global.agtK8Config.svcPortNum) }}
   targetPort: {{ .Values.agtK8Config.portName }}
   protocol: TCP
   name: {{ .Values.agtK8Config.svcPortName }}
@@ -102,7 +102,7 @@ Generate container HEALTH port spec for client agent. Need review for gateway us
 Generate service health port spec for client agent pods. Need review for gateway usage
 */}}
 {{- define "agent.svcHealthPortSpec" -}}
-- port: {{ .Values.agtK8Config.svcHealthPortNum }}
+- port: {{ ternary .Values.agtK8Config.svcHealthPortNum .Values.global.agtK8Config.svcHealthPortNum  (kindIs "invalid" .Values.global.agtK8Config.svcHealthPortNum) }}
   targetPort: {{ .Values.agtK8Config.healthPortName }}
   protocol: TCP
   name: {{ .Values.agtK8Config.svcHealthPortName }}

diff --git a/k8s/example/values.yaml b/k8s/example/values.yaml
@@ -66,3 +66,8 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+global:
+  agtK8Config:
+    svcPortNum: 18080
+    svcHealthPortNum: 18081