Use PORT instead of HEALTHCHECK_PORT for serving container

knative · May 2, 2024 · 4c56f35 · 4c56f35
1 parent 94da517
commit 4c56f35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/test/e2e/multicontainerprobing/multicontainer_readiness_test.go b/test/e2e/multicontainerprobing/multicontainer_readiness_test.go
@@ -61,7 +61,6 @@ func TestMultiContainerReadiness(t *testing.T) {
 				ContainerPort: 8881,
 			}},
 			Env: []corev1.EnvVar{
-				{Name: "HEALTHCHECK_PORT", Value: "8881"},
 				// A port in the next container to forward requests to.
 				{Name: "FORWARD_PORT", Value: "8882"},
 			},
@@ -75,7 +74,7 @@ func TestMultiContainerReadiness(t *testing.T) {
 		}, { // Sidecar with readiness probe.
 			Image: pkgTest.ImagePath(names.Sidecars[0]),
 			Env: []corev1.EnvVar{
-				{Name: "HEALTHCHECK_PORT", Value: "8882"},
+				{Name: "PORT", Value: "8882"},
 				{Name: "FORWARD_PORT", Value: "8883"},
 			},
 			ReadinessProbe: &corev1.Probe{
@@ -88,7 +87,7 @@ func TestMultiContainerReadiness(t *testing.T) {
 		}, { // Sidecar with liveness probe.
 			Image: pkgTest.ImagePath(names.Sidecars[1]),
 			Env: []corev1.EnvVar{
-				{Name: "HEALTHCHECK_PORT", Value: "8883"},
+				{Name: "PORT", Value: "8883"},
 				{Name: "FORWARD_PORT", Value: "8884"},
 			},
 			LivenessProbe: &corev1.Probe{

diff --git a/test/test_images/multicontainer/servingcontainer/servingcontainer.go b/test/test_images/multicontainer/servingcontainer/servingcontainer.go
@@ -23,11 +23,14 @@ import (
 	"log"
 	"net/http"
 	"os"
-	"strconv"
 
 	"knative.dev/serving/test"
 )
 
+const (
+	defaultPort = "8080"
+)
+
 func handler(w http.ResponseWriter, r *http.Request) {
 	log.Println("serving container received a request.")
 	res, err := http.Get(os.ExpandEnv("http://localhost:$FORWARD_PORT"))
@@ -43,10 +46,13 @@ func handler(w http.ResponseWriter, r *http.Request) {
 
 func main() {
 	flag.Parse()
-	var port int
-	if env := os.Getenv("HEALTHCHECK_PORT"); env != "" {
-		port, _ = strconv.Atoi(env)
+	log.Printf("serving container started on port %d", getPort())
+	test.ListenAndServeGracefully(":"+getPort(), handler)
+}
+
+func getPort() string {
+	if port := os.Getenv("PORT"); port != "" {
+		return port
 	}
-	log.Printf("serving container started on port %d", port)
-	test.ListenAndServeGracefully(":"+strconv.Itoa(port), handler)
+	return defaultPort
 }