[release-v1.10] Sync upstream release (#52)

* drop safe-to-evict annotations (knative-extensions#1119) Co-authored-by: dprotaso <[email protected]> * Disable update test (knative-extensions#1121) See: knative-extensions#938 Co-authored-by: dprotaso <[email protected]> * Sync upstream release --------- Co-authored-by: Knative Prow Robot <[email protected]> Co-authored-by: dprotaso <[email protected]> Co-authored-by: John Doe <johndoe@localhost> Co-authored-by: nak3 <[email protected]>
openshift-knative · Jun 9, 2023 · 12aabd8 · 12aabd8
1 parent a40ff4f
commit 12aabd8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/config/500-controller.yaml b/config/500-controller.yaml
@@ -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.

diff --git a/config/500-webhook-deployment.yaml b/config/500-webhook-deployment.yaml
@@ -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

diff --git a/openshift/release/artifacts/1-net-istio.yaml b/openshift/release/artifacts/1-net-istio.yaml
@@ -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.
@@ -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

diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
@@ -21,9 +21,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 \