updated for ooms

Author: jklaw90

vertical-pod-autoscaler/pkg/recommender/input/oom/observer.go

@@ -147,15 +147,19 @@ func (o *observer) OnUpdate(oldObj, newObj interface{}) {
 		klog.ErrorS(nil, "OOM observer received invalid newObj", "newObj", newObj)
 	}
 
-	for _, containerStatus := range newPod.Status.ContainerStatuses {
+	o.processStatuses(oldPod, newPod, newPod.Status.ContainerStatuses, oldPod.Status.ContainerStatuses, oldPod.Spec.Containers)
+	o.processStatuses(oldPod, newPod, newPod.Status.InitContainerStatuses, oldPod.Status.InitContainerStatuses, oldPod.Spec.InitContainers)
+}
+
+func (o *observer) processStatuses(oldPod *apiv1.Pod, newPod *apiv1.Pod, statuses []apiv1.ContainerStatus, oldStatuses []apiv1.ContainerStatus, oldSpecs []apiv1.Container) {
+	for _, containerStatus := range statuses {
 		if containerStatus.RestartCount > 0 &&
 			containerStatus.LastTerminationState.Terminated != nil &&
 			containerStatus.LastTerminationState.Terminated.Reason == "OOMKilled" {
 
-			oldStatus := findStatus(containerStatus.Name, oldPod.Status.ContainerStatuses)
+			oldStatus := findStatus(containerStatus.Name, oldStatuses)
 			if oldStatus != nil && containerStatus.RestartCount > oldStatus.RestartCount {
-				// TODO: jklaw90 figure out how we handle init containers
-				oldSpec := findSpec(containerStatus.Name, oldPod.Spec.Containers)
+				oldSpec := findSpec(containerStatus.Name, oldSpecs)
 				if oldSpec != nil {
 					requests, _ := resourcehelpers.ContainerRequestsAndLimits(containerStatus.Name, oldPod)
 					var memory resource.Quantity

vertical-pod-autoscaler/pkg/recommender/input/oom/observer_test.go

@@ -44,12 +44,20 @@ metadata:
   name: Pod1
   namespace: mockNamespace
 spec:
+  initContainers:
+  - name: InitName11
+    resources:
+      requests:
+        memory: "1024"
   containers:
   - name: Name11
     resources:
       requests:
         memory: "1024"
 status:
+  initContainerStatuses:
+  - name: InitName11
+    restartCount: 0
   containerStatuses:
   - name: Name11
     restartCount: 0
@@ -62,12 +70,20 @@ metadata:
   name: Pod1
   namespace: mockNamespace
 spec:
+  initContainers:
+  - name: InitName11
+    resources:
+      requests:
+        memory: "1024"
   containers:
   - name: Name11
     resources:
       requests:
         memory: "1024"
 status:
+  initContainerStatuses:
+  - name: InitName11
+    restartCount: 0
   containerStatuses:
   - name: Name11
     restartCount: 1
@@ -77,6 +93,36 @@ status:
         reason: OOMKilled
 `
 
+const pod3Yaml = `
+apiVersion: v1
+kind: Pod
+metadata:
+  name: Pod1
+  namespace: mockNamespace
+spec:
+  initContainers:
+  - name: InitName11
+    resources:
+      requests:
+        memory: "1024"
+  containers:
+  - name: Name11
+    resources:
+      requests:
+        memory: "1024"
+status:
+  initContainerStatuses:
+  - name: InitName11
+    restartCount: 1
+    lastState:
+      terminated:
+        finishedAt: 2018-02-23T13:38:48Z
+        reason: OOMKilled
+  containerStatuses:
+  - name: Name11
+    restartCount: 0
+`
+
 func newPod(yaml string) (*v1.Pod, error) {
 	decode := codecs.UniversalDeserializer().Decode
 	obj, _, err := decode([]byte(yaml), nil, nil)

vertical-pod-autoscaler/pkg/recommender/model/cluster.go

@@ -281,7 +281,10 @@ func (cluster *clusterState) RecordOOM(containerID ContainerID, timestamp time.T
 	}
 	containerState, containerExists := pod.Containers[containerID.ContainerName]
 	if !containerExists {
-		return NewKeyError(containerID.ContainerName)
+		containerState, containerExists = pod.InitSidecarsContainers[containerID.ContainerName]
+		if !containerExists {
+			return NewKeyError(containerID.ContainerName)
+		}
 	}
 	err := containerState.RecordOOM(timestamp, requestedMemory)
 	if err != nil {