Add common probe path in autoscaler, networking and activator

pkg/activator/net/revision_backends.go

@@ -69,7 +69,7 @@ type dests struct {
 const (
 	probeTimeout          time.Duration = 300 * time.Millisecond
 	defaultProbeFrequency time.Duration = 200 * time.Millisecond
-	probePath                           = "/_internal/knative/activator/probe"
+	probePath                           = "/healthz"
 )
 
 // revisionWatcher watches the podIPs and ClusterIP of the service for a revision. It implements the logic

pkg/network/status/status.go

@@ -23,6 +23,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"path"
 	"reflect"
 	"sync"
 	"sync/atomic"
@@ -43,8 +44,9 @@ import (
 const (
 	// probeConcurrency defines how many probing calls can be issued simultaneously
 	probeConcurrency = 15
-	//probeTimeout defines the maximum amount of time a request will wait
+	// probeTimeout defines the maximum amount of time a request will wait
 	probeTimeout = 1 * time.Second
+	probePath    = "/healthz"
 )
 
 var dialContext = (&net.Dialer{Timeout: probeTimeout}).DialContext
@@ -356,10 +358,13 @@ func (m *Prober) processWorkItem() bool {
 			return dialContext(ctx, network, net.JoinHostPort(item.podIP, item.podPort))
 		}}
 
+	probeUrl := deepCopy(item.url)
+	probeUrl.Path = path.Join(probeUrl.Path, probePath)
+
 	ok, err := prober.Do(
 		item.context,
 		transport,
-		item.url.String(),
+		probeUrl.String(),
 		prober.WithHeader(network.UserAgentKey, network.IngressReadinessUserAgent),
 		prober.WithHeader(network.ProbeHeaderName, network.ProbeHeaderValue),
 		m.probeVerifier(item))
@@ -427,3 +432,9 @@ func (m *Prober) probeVerifier(item *workItem) prober.Verifier {
 		}
 	}
 }
+
+func deepCopy(in *url.URL) *url.URL {
+	// Safe to ignore the error since this is a deep copy
+	newUrl, _ := url.Parse(in.String())
+	return newUrl
+}

pkg/reconciler/autoscaling/kpa/scaler.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"net/url"
+	"path"
 	"time"
 
 	"knative.dev/pkg/apis/duck"
@@ -47,6 +49,8 @@ const (
 	scaleUnknown = -1
 	probePeriod  = 1 * time.Second
 	probeTimeout = 45 * time.Second
+	probePath    = "/healthz"
+
 	// The time after which the PA will be re-enqueued.
 	// This number is small, since `handleScaleToZero` below will
 	// re-enqueue for the configured grace period.
@@ -116,7 +120,12 @@ func newScaler(ctx context.Context, psInformerFactory duck.InformerFactory, enqu
 func paToProbeTarget(pa *pav1alpha1.PodAutoscaler) string {
 	svc := pkgnet.GetServiceHostname(pa.Status.ServiceName, pa.Namespace)
 	port := networking.ServicePort(pa.Spec.ProtocolType)
-	return fmt.Sprintf("http://%s:%d/", svc, port)
+
+	// Safe to ignore error since we know the string is a valid URL
+	httpDest, _ := url.Parse(fmt.Sprintf("http://%s:%d/", svc, port))
+	httpDest.Path = path.Join(httpDest.Path, probePath)
+
+	return httpDest.String()
 }
 
 // activatorProbe returns true if via probe it determines that the

test/config/security/policy.yaml

@@ -45,5 +45,5 @@ spec:
       triggerRules:
       - excludedPaths:
         - prefix: /metrics
-        - prefix: /_internal/knative/activator/probe
+        - prefix: /healthz
   principalBinding: USE_ORIGIN