Istio now handles prestop hooks correctly so we can drop our workaround

istio/istio@0e30509

Author: dprotaso

pkg/reconciler/revision/resources/queue.go

@@ -65,10 +65,6 @@ var (
 		ContainerPort: networking.BackendHTTPSPort,
 	}
 	queueNonServingPorts = []corev1.ContainerPort{{
-		// Provides health checks and lifecycle hooks.
-		Name:          v1.QueueAdminPortName,
-		ContainerPort: networking.QueueAdminPort,
-	}, {
 		Name:          v1.AutoscalingQueueMetricsPortName,
 		ContainerPort: networking.AutoscalingQueueMetricsPort,
 	}, {

pkg/reconciler/serverlessservice/resources/services.go

@@ -168,18 +168,6 @@ func MakePrivateService(sks *v1alpha1.ServerlessService, selector map[string]str
 				Protocol:   corev1.ProtocolTCP,
 				Port:       networking.UserQueueMetricsPort,
 				TargetPort: intstr.FromString(servingv1.UserQueueMetricsPortName),
-			}, {
-				// When run with the Istio mesh, Envoy blocks traffic to any ports not
-				// recognized, and has special treatment for probes, but not PreStop hooks.
-				// That results in the PreStop hook /wait-for-drain in queue-proxy not
-				// reachable, thus triggering SIGTERM immediately during shutdown and
-				// causing requests to be dropped.
-				//
-				// So we expose this port here to work around this Istio bug.
-				Name:       servingv1.QueueAdminPortName,
-				Protocol:   corev1.ProtocolTCP,
-				Port:       networking.QueueAdminPort,
-				TargetPort: intstr.FromInt(networking.QueueAdminPort),
 			}, {
 				// When run with the Istio mesh and with the pod-addressability feature
 				// enabled, this mirrors the target port to the "outer" service port to

pkg/reconciler/serverlessservice/resources/services_test.go

@@ -144,11 +144,6 @@ func privateSvcMod(s *corev1.Service) {
 			Protocol:   corev1.ProtocolTCP,
 			Port:       networking.UserQueueMetricsPort,
 			TargetPort: intstr.FromString(servingv1.UserQueueMetricsPortName),
-		}, {
-			Name:       servingv1.QueueAdminPortName,
-			Protocol:   corev1.ProtocolTCP,
-			Port:       networking.QueueAdminPort,
-			TargetPort: intstr.FromInt(networking.QueueAdminPort),
 		}, {
 			Name:       pkgnet.ServicePortNameHTTP1 + "-istio",
 			Protocol:   corev1.ProtocolTCP,