Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RELEASE-1.9] Sync upstream release #56

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/500-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ spec:
template:
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
# This must be outside of the mesh to probe the gateways.
# NOTE: this is allowed here and not elsewhere because
# this is the Istio controller, and so it may be Istio-aware.
Expand Down
2 changes: 0 additions & 2 deletions config/500-webhook-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ spec:
role: net-istio-webhook
template:
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
labels:
app: net-istio-webhook
role: net-istio-webhook
Expand Down
3 changes: 0 additions & 3 deletions openshift/release/artifacts/net-istio-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ spec:
template:
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
# This must be outside of the mesh to probe the gateways.
# NOTE: this is allowed here and not elsewhere because
# this is the Istio controller, and so it may be Istio-aware.
Expand Down Expand Up @@ -238,8 +237,6 @@ spec:
role: net-istio-webhook
template:
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
labels:
app: net-istio-webhook
role: net-istio-webhook
Expand Down
14 changes: 12 additions & 2 deletions test/e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,19 @@ initialize $@ --skip-istio-addon

# TODO Re-enable conformance tests for mesh when everything's been fixed
# https://github.com/knative-sandbox/net-istio/issues/584
#
# Also update tests are super flakey and need to be fixed
# https://github.com/knative-sandbox/net-istio/issues/938
#
if [[ $MESH -eq 0 ]]; then
go_test_e2e -timeout=60m ./test/conformance --parallel 12 \
--enable-beta --enable-alpha || fail_test
go_test_e2e \
-timeout 60m \
-parallel 12 \
./test/conformance \
-args \
-enable-alpha \
-enable-beta \
-skip-tests update || fail_test
fi

go_test_e2e -timeout=10m \
Expand Down
Loading