From 806104626f745bb9ca155dd960f143af45b0c66c Mon Sep 17 00:00:00 2001 From: darkworon Date: Wed, 13 May 2020 12:12:07 +0300 Subject: [PATCH] Make mergePodSpec pick up enableServiceLinks (#1601) Attribute enableServiceLinks can be now configured in PodSpec so that environment variables are not injected in function pods and DNS is used for discovery --- pkg/executor/util/merge.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/executor/util/merge.go b/pkg/executor/util/merge.go index e69144ae..180b11cb 100644 --- a/pkg/executor/util/merge.go +++ b/pkg/executor/util/merge.go @@ -106,6 +106,11 @@ func MergePodSpec(srcPodSpec *apiv1.PodSpec, targetPodSpec *apiv1.PodSpec) (*api srcPodSpec.TerminationGracePeriodSeconds = targetPodSpec.TerminationGracePeriodSeconds } + // Possibility to disable kubernetes environment variables for functions/environments (#1599) + if targetPodSpec.EnableServiceLinks != nil { + srcPodSpec.EnableServiceLinks = targetPodSpec.EnableServiceLinks + } + //TODO - Security context should be merged instead of overriding. if targetPodSpec.SecurityContext != nil { srcPodSpec.SecurityContext = targetPodSpec.SecurityContext