Address comments

- Use context for timeout
- do not override exec probe

Signed-off-by: Shash Reddy <shashwathireddy@gmail.com>

cmd/queue/main.go

@@ -247,14 +247,9 @@ func probeQueueHealthPath(port int, timeoutSeconds int) error {
 		},
 		Timeout: timeoutDuration,
 	}
-
-	stopCh := make(chan struct{})
-	timeCh := time.After(timeoutDuration)
-
-	go func() {
-		<-timeCh
-		close(stopCh)
-	}()
+	ctx, cancel := context.WithTimeout(context.Background(), timeoutDuration)
+	defer cancel()
+	stopCh := ctx.Done()
 
 	var lastErr error
 	timeoutErr := wait.PollImmediateUntil(aggressivePollInterval, func() (bool, error) {

pkg/reconciler/revision/resources/deploy_test.go

@@ -580,7 +580,7 @@ func TestMakePodSpec(t *testing.T) {
 					withExecReadinessProbe([]string{"echo", "hello"})),
 				queueContainer(
 					withEnvVar("CONTAINER_CONCURRENCY", "0"),
-					withEnvVar("SERVING_READINESS_PROBE", `{"tcpSocket":{"port":8080,"host":"127.0.0.1"},"successThreshold":1}`),
+					withEnvVar("SERVING_READINESS_PROBE", "{}"),
 				),
 			}),
 	}, {

pkg/reconciler/revision/resources/queue.go

@@ -336,12 +336,7 @@ func applyReadinessProbeDefaults(p *corev1.Probe, port int32) {
 		p.TCPSocket.Host = localAddress
 		p.TCPSocket.Port = intstr.FromInt(int(port))
 	case p.Exec != nil:
-		// Use default TCP connect probe to ensure data path is open from queue-proxy to
-		// user-container. User-defined ExecProbe will still be run on user-container.
-		p.TCPSocket = &corev1.TCPSocketAction{}
-		p.SuccessThreshold = 1
-		p.TCPSocket.Host = localAddress
-		p.TCPSocket.Port = intstr.FromInt(int(port))
+		//User-defined ExecProbe will still be run on user-container.
 		p.Exec = nil
 	}