fix: revert hostPort to 80/443, use dynamic port in template tests

Revert Kind hostPort mapping back to standard ports 80/443 to avoid
breaking existing tests that assume standard ingress ports.

Use port 0 in node/typescript integration tests so the OS assigns a
free port, preventing EADDRINUSE conflicts regardless of port mapping.

Author: cardil

e2e/e2e_config_ci_test.go

@@ -78,9 +78,6 @@ func runGitHubWorkflow(t *testing.T, dir string) {
 		"-W", ".github/workflows/func-deploy.yaml",
 		"-s", "KUBECONFIG="+readFile(t, Kubeconfig),
 		"--var", "REGISTRY_URL="+Registry,
-		// Use a non-standard port for function test servers to avoid
-		// conflicting with Kind's hostPort mapping (8080 → container:80).
-		"--env", "PORT=8082",
 	)
 	cmd.Dir = dir
 	cmd.Stdout = os.Stdout

e2e/e2e_test.go

@@ -80,11 +80,9 @@ const (
 	// must be properly configured in the cluster's DNS and Knative serving.
 	DefaultDomain = "localtest.me"
 
-	// DefaultHTTPPort is the host port where the cluster's ingress listens for
-	// HTTP traffic. The cluster.sh script maps containerPort 80 to hostPort 8080
-	// to avoid requiring CAP_NET_BIND_SERVICE / privileged port access.
-	// Override with FUNC_E2E_HTTP_PORT.
-	DefaultHTTPPort = "8080"
+	// DefaultHTTPPort is the host port where the cluster's ingress listens
+	// for HTTP traffic. Override with FUNC_E2E_HTTP_PORT.
+	DefaultHTTPPort = "80"
 
 	// DefaultRegistry to use when running the e2e tests.  This is the URL
 	// of the registry created by default when using the cluster.sh script
@@ -136,7 +134,6 @@ var (
 	Domain string
 
 	// HTTPPort is the host port where the cluster ingress serves HTTP traffic.
-	// The cluster.sh default maps containerPort 80 → hostPort 8080.
 	// Can be set with FUNC_E2E_HTTP_PORT.
 	HTTPPort string
 

generate/zz_filesystem_generated.go

@@ -115,10 +115,10 @@ nodes:
     image: kindest/node:${kind_node_version}
     extraPortMappings:
     - containerPort: 80
-      hostPort: 8080
+      hostPort: 80
       listenAddress: "127.0.0.1"
     - containerPort: 443
-      hostPort: 8443
+      hostPort: 443
       listenAddress: "127.0.0.1"
     - containerPort: 30022
       hostPort: 30022

hack/cluster.sh

@@ -183,15 +183,14 @@ EOF
   $KUBECTL wait pod --for=condition=Ready -l '!job-name' -n gitlab --timeout=5m
 
   echo '::group::Waiting for Gitlab'
-  local -r gitlab_port="${FUNC_E2E_HTTP_PORT:-8080}"
-  if ! curl --retry 120 -f --retry-all-errors --retry-delay 5 "http://${gitlab_host}:${gitlab_port}"; then
+  if ! curl --retry 120 -f --retry-all-errors --retry-delay 5 "${gitlab_host}"; then
     $KUBECTL logs pod/gitlab -n gitlab
     echo '::endgroup::'
     return 1
   fi
   echo
   echo '::endgroup::'
-  echo "the GitLab server is available at: http://${gitlab_host}:${gitlab_port}"
+  echo "the GitLab server is available at: http://${gitlab_host}"
   echo "${green}✅ GitLab${reset}"
 }
 

hack/gitlab.sh

@@ -23,7 +23,7 @@ const message = HTTP.binary(new CloudEvent({
 }));
 
 test('Integration: handles a valid event', t => {
-  start(func).then(server => {
+  start(func, { port: 0 }).then(server => {
     t.plan(5);
     request(server)
       .post('/')

templates/node/cloudevents/test/integration.js

@@ -12,7 +12,7 @@ const errHandler = t => err => {
 };
 
 test('Integration: handles an HTTP GET', t => {
-  start(func).then(server => {
+  start(func, { port: 0 }).then(server => {
     t.plan(2);
     request(server)
       .get('/?name=tiger')
@@ -27,7 +27,7 @@ test('Integration: handles an HTTP GET', t => {
 });
 
 test('Integration: handles an HTTP POST', t => {
-  start(func).then(server => {
+  start(func, { port: 0 }).then(server => {
     t.plan(2);
     request(server)
       .post('/')

templates/node/http/test/integration.js

@@ -31,7 +31,7 @@ const errHandler = (t: Test) => (err: Error) => {
 };
 
 test('Integration: handles a valid event', (t) => {
-  start(func.handle, {} as InvokerOptions).then((server) => {
+  start(func.handle, { port: 0 } as InvokerOptions).then((server) => {
     t.plan(5);
     request(server)
       .post('/')

templates/typescript/cloudevents/test/integration.ts

@@ -16,7 +16,7 @@ const errHandler = (t: Test) => (err: Error) => {
 };
 
 test('Integration: handles a valid request', (t) => {
-  start(func.handle, {} as InvokerOptions).then((server) => {
+  start(func.handle, { port: 0 } as InvokerOptions).then((server) => {
     t.plan(3);
     request(server)
       .post('/')