Fix potential nil pointer problem when using multierror pkg (#1311)

This commit is contained in:
Ta-Ching Chen
2019-09-16 11:03:23 +08:00
committed by GitHub
parent 4d654c6fe7
commit 6d3d277cb9
10 changed files with 59 additions and 60 deletions
+4 -4
View File
@@ -73,7 +73,7 @@ func MergePodSpec(srcPodSpec *apiv1.PodSpec, targetPodSpec *apiv1.PodSpec) error
return nil
}
var multierr *multierror.Error
multierr := &multierror.Error{}
// Get item from spec, if they exist in deployment - merge, else append
// Same pattern for all lists (Mergo can not handle lists)
@@ -155,7 +155,7 @@ func mergeContainerLists(srcPodSpec *apiv1.PodSpec, targetPodSpec *apiv1.PodSpec
targetContainers[c.Name] = c
}
var multierr *multierror.Error
multierr := &multierror.Error{}
for _, c := range srcPodSpec.Containers {
container, ok := targetContainers[c.Name]
if ok {
@@ -179,7 +179,7 @@ func mergeInitContainerList(srcPodSpec *apiv1.PodSpec, targetPodSpec *apiv1.PodS
targetContainers[c.Name] = c
}
var multierr *multierror.Error
multierr := &multierror.Error{}
for _, c := range srcPodSpec.InitContainers {
container, ok := targetContainers[c.Name]
if ok {
@@ -202,7 +202,7 @@ func mergeVolumeLists(srcPodSpec *apiv1.PodSpec, targetPodSpec *apiv1.PodSpec) e
specVolumes[vol.Name] = vol
}
var multierr *multierror.Error
multierr := &multierror.Error{}
for _, vol := range srcPodSpec.Volumes {
_, ok := specVolumes[vol.Name]
if ok {