Merge pull request #6327 from mikedanese/readiness-probe-busted

pkg/kubelet/probe.go

@@ -66,10 +66,14 @@ func (kl *Kubelet) probeContainer(pod *api.Pod, status api.PodStatus, container
 	ref, ok := kl.containerRefManager.GetRef(containerID)
 	if !ok {
 		glog.Warningf("No ref for pod '%v' - '%v'", containerID, container.Name)
-	} else {
-		kl.recorder.Eventf(ref, "unhealthy", "Liveness Probe Failed %v - %v", containerID, container.Name)
+		return probe.Success, err
 	}
-	return ready, err
+
+	if ready != probe.Success {
+		kl.recorder.Eventf(ref, "unhealthy", "Readiness Probe Failed %v - %v", containerID, container.Name)
+	}
+
+	return probe.Success, nil
 }
 
 // probeContainerLiveness probes the liveness of a container.

pkg/kubelet/probe_test.go

@@ -256,14 +256,14 @@ func TestProbeContainer(t *testing.T) {
 			testContainer: api.Container{
 				ReadinessProbe: &api.Probe{InitialDelaySeconds: 100},
 			},
-			expectedResult:    probe.Failure,
+			expectedResult:    probe.Success,
 			expectedReadiness: false,
 		},
 		{
 			testContainer: api.Container{
 				ReadinessProbe: &api.Probe{InitialDelaySeconds: -100},
 			},
-			expectedResult:    probe.Unknown,
+			expectedResult:    probe.Success,
 			expectedReadiness: false,
 		},
 		{
@@ -275,8 +275,8 @@ func TestProbeContainer(t *testing.T) {
 					},
 				},
 			},
-			expectedResult:    probe.Failure,
-			expectedReadiness: false,
+			expectedResult:    probe.Success,
+			expectedReadiness: true,
 		},
 		{
 			testContainer: api.Container{
@@ -299,8 +299,8 @@ func TestProbeContainer(t *testing.T) {
 					},
 				},
 			},
-			expectedResult:    probe.Unknown,
-			expectedReadiness: false,
+			expectedResult:    probe.Success,
+			expectedReadiness: true,
 		},
 		{
 			testContainer: api.Container{
@@ -311,9 +311,9 @@ func TestProbeContainer(t *testing.T) {
 					},
 				},
 			},
-			expectError:       true,
-			expectedResult:    probe.Unknown,
-			expectedReadiness: false,
+			expectError:       false,
+			expectedResult:    probe.Success,
+			expectedReadiness: true,
 		},
 		// Both LivenessProbe and ReadinessProbe.
 		{
@@ -321,7 +321,7 @@ func TestProbeContainer(t *testing.T) {
 				LivenessProbe:  &api.Probe{InitialDelaySeconds: 100},
 				ReadinessProbe: &api.Probe{InitialDelaySeconds: 100},
 			},
-			expectedResult:    probe.Failure,
+			expectedResult:    probe.Success,
 			expectedReadiness: false,
 		},
 		{
@@ -329,7 +329,7 @@ func TestProbeContainer(t *testing.T) {
 				LivenessProbe:  &api.Probe{InitialDelaySeconds: 100},
 				ReadinessProbe: &api.Probe{InitialDelaySeconds: -100},
 			},
-			expectedResult:    probe.Unknown,
+			expectedResult:    probe.Success,
 			expectedReadiness: false,
 		},
 		{