Merge pull request #21730 from lavalamp/fix-proxy-svc-pod

test/e2e/proxy.go

@@ -125,6 +125,16 @@ func proxyContext(version string) {
 				"tlsdest1": 460,
 				"tlsdest2": 462,
 			},
+			ReadinessProbe: &api.Probe{
+				Handler: api.Handler{
+					HTTPGet: &api.HTTPGetAction{
+						Port: intstr.FromInt(80),
+					},
+				},
+				InitialDelaySeconds: 1,
+				TimeoutSeconds:      5,
+				PeriodSeconds:       10,
+			},
 			Labels:      labels,
 			CreatedPods: &pods,
 		}

test/e2e/util.go

@@ -247,6 +247,7 @@ type RCConfig struct {
 	CpuLimit       int64 // millicores
 	MemRequest     int64 // bytes
 	MemLimit       int64 // bytes
+	ReadinessProbe *api.Probe
 
 	// Env vars, set the same for every pod.
 	Env map[string]string
@@ -1637,6 +1638,7 @@ func (config *RCConfig) create() error {
 							Image:          config.Image,
 							Command:        config.Command,
 							Ports:          []api.ContainerPort{{ContainerPort: 80}},
+							ReadinessProbe: config.ReadinessProbe,
 						},
 					},
 					DNSPolicy: api.DNSDefault,