Skip to content

Commit 1ef2bdf

Browse files
committed
fix: avoid port 8080 conflict in Config CI tests and GitLab setup
Pass PORT=8082 to act runner so node/typescript integration tests don't conflict with Kind's hostPort 8080 mapping. Use correct ingress port in gitlab.sh health check curl.
1 parent c7418a6 commit 1ef2bdf

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

e2e/e2e_config_ci_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ func runGitHubWorkflow(t *testing.T, dir string) {
7878
"-W", ".github/workflows/func-deploy.yaml",
7979
"-s", "KUBECONFIG="+readFile(t, Kubeconfig),
8080
"--var", "REGISTRY_URL="+Registry,
81+
// Use a non-standard port for function test servers to avoid
82+
// conflicting with Kind's hostPort mapping (8080 → container:80).
83+
"--env", "PORT=8082",
8184
)
8285
cmd.Dir = dir
8386
cmd.Stdout = os.Stdout

hack/gitlab.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,15 @@ EOF
183183
$KUBECTL wait pod --for=condition=Ready -l '!job-name' -n gitlab --timeout=5m
184184

185185
echo '::group::Waiting for Gitlab'
186-
if ! curl --retry 120 -f --retry-all-errors --retry-delay 5 "${gitlab_host}"; then
186+
local -r gitlab_port="${FUNC_E2E_HTTP_PORT:-8080}"
187+
if ! curl --retry 120 -f --retry-all-errors --retry-delay 5 "http://${gitlab_host}:${gitlab_port}"; then
187188
$KUBECTL logs pod/gitlab -n gitlab
188189
echo '::endgroup::'
189190
return 1
190191
fi
191192
echo
192193
echo '::endgroup::'
193-
echo "the GitLab server is available at: http://${gitlab_host}"
194+
echo "the GitLab server is available at: http://${gitlab_host}:${gitlab_port}"
194195
echo "${green}✅ GitLab${reset}"
195196
}
196197

0 commit comments

Comments
 (0)