github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Added similar functionality for init containers as standard containers in PodPreset admission controller

Browse Source
This commit is contained in:
soggiest 2018-11-27 14:31:32 -08:00
parent 22ff267324
commit 1ec6672580
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/pkg/admission/podpreset/admission.go
View File

@ -184,6 +184,12 @@ func safeToApplyPodPresetsOnPod(pod *api.Pod, podPresets []*settingsv1alpha1.Pod
errs = append(errs, err) errs = append(errs, err)
} }
} }
for _, iCtr := range pod.Spec.InitContainers {
if err := safeToApplyPodPresetsOnContainer(&iCtr, podPresets); err != nil {
errs = append(errs, err)
}
}
return utilerrors.NewAggregate(errs) return utilerrors.NewAggregate(errs)
} }
@ -381,6 +387,10 @@ func applyPodPresetsOnPod(pod *api.Pod, podPresets []*settingsv1alpha1.PodPreset
applyPodPresetsOnContainer(&ctr, podPresets) applyPodPresetsOnContainer(&ctr, podPresets)
pod.Spec.Containers[i] = ctr pod.Spec.Containers[i] = ctr
} }
for i, iCtr := range pod.Spec.InitContainers {
applyPodPresetsOnContainer(&iCtr, podPresets)
pod.Spec.InitContainers[i] = iCtr
}
// add annotation // add annotation
if pod.ObjectMeta.Annotations == nil { if pod.ObjectMeta.Annotations == nil {