Refactor invoker env templates (#516)
Breaks the apihost macro into two macros so that intent of each is clear.
diff --git a/helm/openwhisk/templates/_helpers.tpl b/helm/openwhisk/templates/_helpers.tpl
index 96a192d..095d2bd 100644
--- a/helm/openwhisk/templates/_helpers.tpl
+++ b/helm/openwhisk/templates/_helpers.tpl
@@ -269,6 +269,10 @@
configMapKeyRef:
name: {{ .Release.Name }}-whisk.config
key: whisk_api_host_name
+{{- end -}}
+
+{{/* Environment variables required for invoker containerpool/containerfactory configuration */}}
+{{- define "openwhisk.invoker.containerconfig" -}}
- name: "CONFIG_whisk_docker_containerFactory_useRunc"
value: {{ .Values.invoker.containerFactory.useRunc | quote }}
- name: "CONFIG_whisk_containerPool_userMemory"
diff --git a/helm/openwhisk/templates/controller-pod.yaml b/helm/openwhisk/templates/controller-pod.yaml
index abbaedc..e4914ee 100644
--- a/helm/openwhisk/templates/controller-pod.yaml
+++ b/helm/openwhisk/templates/controller-pod.yaml
@@ -180,4 +180,5 @@
{{- if .Values.controller.lean }}
{{ include "openwhisk.invoker.apihost" . | indent 8 }}
+{{ include "openwhisk.invoker.containerconfig" . | indent 8 }}
{{- end }}
diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
index 2184351..3a2b481 100644
--- a/helm/openwhisk/templates/invoker-pod.yaml
+++ b/helm/openwhisk/templates/invoker-pod.yaml
@@ -86,6 +86,9 @@
# Needed by invoker to set the environment variable __OW_API_HOST in action containers
{{ include "openwhisk.invoker.apihost" . | indent 10 }}
+ # Needed by invoker to configure the container factory & container pool
+{{ include "openwhisk.invoker.containerconfig" . | indent 10 }}
+
{{- if not .Values.invoker.containerFactory.networkConfig.dns.inheritInvokerConfig }}
{{- if ne .Values.invoker.containerFactory.networkConfig.dns.overrides.nameservers "" }}
# DNS Server(s) to be used by action containers
