From 58875fe315dbbb8d76a2bc5abf1914abc4b6bcba Mon Sep 17 00:00:00 2001 From: Izaak Lauer <8404559+izaaklauer@users.noreply.github.com> Date: Tue, 5 Oct 2021 14:58:41 -0400 Subject: [PATCH] Nil check config.Pod --- builtin/k8s/platform.go | 61 +++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/builtin/k8s/platform.go b/builtin/k8s/platform.go index aaaf30f623f..cd524e6c775 100644 --- a/builtin/k8s/platform.go +++ b/builtin/k8s/platform.go @@ -613,38 +613,39 @@ func (p *Platform) resourceDeploymentCreate( } var sidecarContainers []corev1.Container - for _, sidecarConfig := range p.config.Pod.Sidecars { - - sidecarEnvVars := make(map[string]string) - // Add deploy config environment to container env vars - for k, v := range sidecarConfig.StaticEnvVars { - sidecarEnvVars[k] = v - } - for k, v := range deployConfig.Env() { - sidecarEnvVars[k] = v - } + if p.config.Pod != nil { + for _, sidecarConfig := range p.config.Pod.Sidecars { + sidecarEnvVars := make(map[string]string) + // Add deploy config environment to container env vars + for k, v := range sidecarConfig.StaticEnvVars { + sidecarEnvVars[k] = v + } + for k, v := range deployConfig.Env() { + sidecarEnvVars[k] = v + } - sidecarContainer, err := configureK8sContainer( - sidecarConfig.Name, - sidecarConfig.Image, - sidecarConfig.Ports, - sidecarConfig.StaticEnvVars, - sidecarConfig.Probe, - sidecarConfig.ProbePath, - sidecarConfig.CPU, - sidecarConfig.Memory, - sidecarConfig.Resources, - sidecarConfig.Command, - sidecarConfig.Args, - p.config.ScratchSpace, - volumes, - log, - ) - if err != nil { - return status.Errorf(status.Code(err), - "Failed to define sidecar container %s: %s", sidecarConfig.Name, err) + sidecarContainer, err := configureK8sContainer( + sidecarConfig.Name, + sidecarConfig.Image, + sidecarConfig.Ports, + sidecarConfig.StaticEnvVars, + sidecarConfig.Probe, + sidecarConfig.ProbePath, + sidecarConfig.CPU, + sidecarConfig.Memory, + sidecarConfig.Resources, + sidecarConfig.Command, + sidecarConfig.Args, + p.config.ScratchSpace, + volumes, + log, + ) + if err != nil { + return status.Errorf(status.Code(err), + "Failed to define sidecar container %s: %s", sidecarConfig.Name, err) + } + sidecarContainers = append(sidecarContainers, *sidecarContainer) } - sidecarContainers = append(sidecarContainers, *sidecarContainer) } // Update the deployment with our spec