Skip to content

Commit

Permalink
drop support for the istio add on flag (#243)
Browse files Browse the repository at this point in the history
* drop support for the istio add on flag

* update test
  • Loading branch information
dprotaso authored Nov 3, 2022
1 parent f5be74f commit 62b15bd
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,6 @@ This is a helper script for Knative E2E test scripts. To use it:
1. By default `knative_teardown()` and `test_teardown()` will be called after
the tests finish, use `--skip-teardowns` if you don't want them to be called.

1. By default Istio is installed on the cluster via Addon, use
`--skip-istio-addon` if you choose not to have it preinstalled.

1. By default Google Kubernetes Engine telemetry to Cloud Logging and Monitoring is disabled.
This can be enabled by setting `ENABLE_GKE_TELEMETRY` to `true`.

Expand Down
12 changes: 2 additions & 10 deletions e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ function setup_test_cluster() {
set +o errexit
set +o pipefail

# Wait for Istio installation to complete, if necessary, before calling knative_setup.
# TODO(chizhg): is it really needed?
(( ! SKIP_ISTIO_ADDON )) && (wait_until_batch_job_complete istio-system || return 1)
if function_exists knative_setup; then
knative_setup || fail_test "Knative setup failed"
fi
Expand Down Expand Up @@ -130,7 +127,6 @@ function fail_test() {
}

SKIP_TEARDOWNS=0
SKIP_ISTIO_ADDON=0
E2E_SCRIPT=""
CLOUD_PROVIDER="gke"

Expand Down Expand Up @@ -170,8 +166,8 @@ function initialize() {
case ${parameter} in
--run-tests) run_tests=1 ;;
--skip-teardowns) SKIP_TEARDOWNS=1 ;;
# TODO(chizhg): remove this flag once the addons is defined as an env var.
--skip-istio-addon) SKIP_ISTIO_ADDON=1 ;;
--skip-istio-addon) echo "--skip-istio-addon is no longer supported"
;; # This flag is a noop
*)
case ${parameter} in
--cloud-provider) shift; CLOUD_PROVIDER="$1" ;;
Expand All @@ -184,11 +180,7 @@ function initialize() {
(( IS_PROW )) && [[ -z "${GCP_PROJECT_ID:-}" ]] && IS_BOSKOS=1

if [[ "${CLOUD_PROVIDER}" == "gke" ]]; then
if (( SKIP_ISTIO_ADDON )); then
custom_flags+=("--addons=NodeLocalDNS")
else
custom_flags+=("--addons=Istio,NodeLocalDNS")
fi
fi

readonly IS_BOSKOS
Expand Down
2 changes: 1 addition & 1 deletion test/unit/presubmit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestMainFunc(t *testing.T) {
"--enable-workload-identity --cluster-version=latest "+
"--extra-gcloud-flags --enable-stackdriver-kubernetes "+
"--no-enable-ip-alias --no-enable-autoupgrade "+
"--addons=Istio,NodeLocalDNS "+
"--addons=NodeLocalDNS "+
"--test-command=%s/test/e2e-tests.sh "+
"--run-tests --extra-gcloud-flags= --logging=NONE "+
"--monitoring=NONE", rootDir)),
Expand Down
1 change: 0 additions & 1 deletion test/unit/run_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ func TestRunE2eTests(t *testing.T) {
stdout: []check{
contains("SETTING UP TEST CLUSTER"),
contains("Cluster is gke_deadbeef_1.24"),
contains("kubectl wait job --for=condition=Complete --all -n istio-system --timeout=5m"),
contains("STARTING KNATIVE SERVING"),
contains("Waiting until all pods in namespace knative-serving are up"),
contains("E2E TESTS PASSED"),
Expand Down

0 comments on commit 62b15bd

Please sign in to comment.