Defer containers

pkg/api/resource/helpers.go

@@ -70,6 +70,29 @@ func PodRequestsAndLimits(pod *api.Pod) (reqs map[api.ResourceName]resource.Quan
 			}
 		}
 	}
+	// defer containers define the minimum of any resource
+	for _, container := range pod.Spec.DeferContainers {
+		for name, quantity := range container.Resources.Requests {
+			value, ok := reqs[name]
+			if !ok {
+				reqs[name] = *quantity.Copy()
+				continue
+			}
+			if quantity.Cmp(value) > 0 {
+				reqs[name] = *quantity.Copy()
+			}
+		}
+		for name, quantity := range container.Resources.Limits {
+			value, ok := limits[name]
+			if !ok {
+				limits[name] = *quantity.Copy()
+				continue
+			}
+			if quantity.Cmp(value) > 0 {
+				limits[name] = *quantity.Copy()
+			}
+		}
+	}
 	return
 }
 

pkg/api/testing/serialization_proto_test.go

@@ -102,6 +102,9 @@ func TestProtobufRoundTrip(t *testing.T) {
 	// InitContainers are turned into annotations by conversion.
 	obj.Spec.InitContainers = nil
 	obj.Status.InitContainerStatuses = nil
+	// deferContainers are turned into annotations by conversion
+	obj.Spec.DeferContainers = nil
+	obj.Status.DeferContainerStatuses = nil
 	data, err := obj.Marshal()
 	if err != nil {
 		t.Fatal(err)