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

RuntimeClass-admission: fixup comment, simplify nested ifs

Browse Source 
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
This commit is contained in:
Eric Ernst 2019-07-01 14:36:37 -07:00
parent b4e3bd381b
commit d409619284
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugin/pkg/admission/runtimeclass/admission.go
View File

@ -127,7 +127,7 @@ func NewRuntimeClass() *RuntimeClass {
} }
} }
// admissionAction handles Admit and Validate phases of admission, switching based on the admissionPhase parameter // prepareObjects returns pod and runtimeClass types from the given admission attributes
func (r *RuntimeClass) prepareObjects(attributes admission.Attributes) (pod *api.Pod, runtimeClass *v1beta1.RuntimeClass, err error) { func (r *RuntimeClass) prepareObjects(attributes admission.Attributes) (pod *api.Pod, runtimeClass *v1beta1.RuntimeClass, err error) {
pod, ok := attributes.GetObject().(*api.Pod) pod, ok := attributes.GetObject().(*api.Pod)
@ -160,12 +160,13 @@ func (r *RuntimeClass) getRuntimeClass(pod *api.Pod, runtimeClassName *string) (
func setOverhead(a admission.Attributes, pod *api.Pod, runtimeClass *v1beta1.RuntimeClass) (err error) { func setOverhead(a admission.Attributes, pod *api.Pod, runtimeClass *v1beta1.RuntimeClass) (err error) {
if runtimeClass != nil { if runtimeClass == nil || runtimeClass.Overhead == nil {
if runtimeClass.Overhead != nil { return nil
}
// convert to internal type and assign to pod's Overhead // convert to internal type and assign to pod's Overhead
nodeOverhead := &node.Overhead{} nodeOverhead := &node.Overhead{}
err := nodev1beta1.Convert_v1beta1_Overhead_To_node_Overhead(runtimeClass.Overhead, nodeOverhead, nil) err = nodev1beta1.Convert_v1beta1_Overhead_To_node_Overhead(runtimeClass.Overhead, nodeOverhead, nil)
if err != nil { if err != nil {
return err return err
} }
@ -176,8 +177,6 @@ func setOverhead(a admission.Attributes, pod *api.Pod, runtimeClass *v1beta1.Run
} }
pod.Spec.Overhead = nodeOverhead.PodFixed pod.Spec.Overhead = nodeOverhead.PodFixed
}
}
return nil return nil
} }