Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Commit

Permalink
Nil check config.Pod
Browse files Browse the repository at this point in the history
  • Loading branch information
izaaklauer authored and xiaolin-ninja committed Oct 6, 2021
1 parent 657a574 commit 58875fe
Showing 1 changed file with 31 additions and 30 deletions.
61 changes: 31 additions & 30 deletions builtin/k8s/platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 58875fe

Please sign in to comment.