Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
skonto committed Mar 28, 2024
1 parent 39202a0 commit 7421235
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
5 changes: 3 additions & 2 deletions test/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,9 @@ function install() {
kubectl wait --timeout=60s --for=condition=Available deployment -n ${SYSTEM_NAMESPACE} activator
fi

toggle_feature loglevel.activator debug config-logging
toggle_feature logging.enable-request-log true config-observability
echo "Enable request logging"
toggle_feature "loglevel.activator" debug config-logging
toggle_feature "logging.enable-request-log" true config-observability

}

Expand Down
18 changes: 9 additions & 9 deletions test/e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ toggle_feature cluster-local-domain-tls enabled config-network || fail_test
go_test_e2e -timeout=2m ./test/e2e/clusterlocaldomaintls ${E2E_TEST_FLAGS} || failed=1
toggle_feature cluster-local-domain-tls disabled config-network || fail_test

toggle_feature system-internal-tls enabled config-network || fail_test
toggle_feature "logging.enable-request-log" true config-observability || fail_test
toggle_feature "logging.request-log-template" "TLS: {{.Request.TLS}}" config-observability || fail_test
# with current implementation, Activator must be restarted when configuring system-internal-tls. See https://github.com/knative/serving/issues/13754
restart_pod ${SYSTEM_NAMESPACE} "app=activator"
go_test_e2e -timeout=2m ./test/e2e/systeminternaltls ${E2E_TEST_FLAGS} || failed=1
toggle_feature system-internal-tls disabled config-network || fail_test
toggle_feature enable-request-log false config-observability || fail_test
toggle_feature request-log-template '' config-observability || fail_test
#toggle_feature system-internal-tls enabled config-network || fail_test
#toggle_feature "logging.enable-request-log" true config-observability || fail_test
#toggle_feature "logging.request-log-template" "TLS: {{.Request.TLS}}" config-observability || fail_test
## with current implementation, Activator must be restarted when configuring system-internal-tls. See https://github.com/knative/serving/issues/13754
#restart_pod ${SYSTEM_NAMESPACE} "app=activator"
#go_test_e2e -timeout=2m ./test/e2e/systeminternaltls ${E2E_TEST_FLAGS} || failed=1
#toggle_feature system-internal-tls disabled config-network || fail_test
##toggle_feature enable-request-log false config-observability || fail_test
#toggle_feature request-log-template '' config-observability || fail_test
# with the current implementation, Activator is always in the request path, and needs to be restarted after configuring system-internal-tls
restart_pod ${SYSTEM_NAMESPACE} "app=activator"

Expand Down

0 comments on commit 7421235

Please sign in to comment.