From commits-return-8010-archive-asf-public=cust-asf.ponee.io@openwhisk.apache.org Fri Aug 30 05:01:16 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 92A64180608 for ; Fri, 30 Aug 2019 07:01:16 +0200 (CEST) Received: (qmail 87130 invoked by uid 500); 30 Aug 2019 05:01:16 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 87121 invoked by uid 99); 30 Aug 2019 05:01:15 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Aug 2019 05:01:15 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C334C86017; Fri, 30 Aug 2019 05:01:15 +0000 (UTC) Date: Fri, 30 Aug 2019 05:01:15 +0000 To: "commits@openwhisk.apache.org" Subject: [openwhisk-deploy-kube] branch master updated: Refactor invoker env templates (#516) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156714127570.20449.3394530034982352942@gitbox.apache.org> From: chetanm@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: openwhisk-deploy-kube X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c060b2e5f57783dfdf729baf4f2602a0d02b16c7 X-Git-Newrev: 05591c7ef13372c9c0efcbbc62c66f4c56f4affd X-Git-Rev: 05591c7ef13372c9c0efcbbc62c66f4c56f4affd X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. chetanm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git The following commit(s) were added to refs/heads/master by this push: new 05591c7 Refactor invoker env templates (#516) 05591c7 is described below commit 05591c7ef13372c9c0efcbbc62c66f4c56f4affd Author: David Grove AuthorDate: Fri Aug 30 01:01:09 2019 -0400 Refactor invoker env templates (#516) Breaks the apihost macro into two macros so that intent of each is clear. --- helm/openwhisk/templates/_helpers.tpl | 4 ++++ helm/openwhisk/templates/controller-pod.yaml | 1 + helm/openwhisk/templates/invoker-pod.yaml | 3 +++ 3 files changed, 8 insertions(+) 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 @@ imagePullSecrets: 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 @@ spec: {{- 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 @@ spec: # 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