diff --git a/config/core/deployments/webhook.yaml b/config/core/deployments/webhook.yaml index 663ab019eb7e..eb9bac03ecc2 100644 --- a/config/core/deployments/webhook.yaml +++ b/config/core/deployments/webhook.yaml @@ -42,11 +42,11 @@ spec: resources: requests: - cpu: 20m - memory: 20Mi + cpu: 100m + memory: 100Mi limits: - cpu: 200m - memory: 200Mi + cpu: 500m + memory: 500Mi env: - name: SYSTEM_NAMESPACE diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index d21fbc66ca12..a9a2dce34b6c 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -85,11 +85,17 @@ add_trap "kubectl -n ${SYSTEM_NAMESPACE} patch configmap/config-autoscaler --typ # Run conformance and e2e tests. go_test_e2e -timeout=30m \ - $(go list ./test/conformance/... | grep -v certificate) \ + $(go list ./test/conformance/... | grep -v 'certificate\|ingress' ) \ ./test/e2e ./test/e2e/hpa \ ${parallelism} \ "--resolvabledomain=$(use_resolvable_domain)" "${use_https}" "$(ingress_class)" || failed=1 +# We run KIngress conformance ingress separately, to make it easier to skip some tests. +go_test_e2e -timeout=20m ./test/conformance/ingress ${parallelism} \ + `# Skip TestUpdate due to excessive flaking https://github.com/knative/serving/issues/8032` \ + -run="Test[^U]" \ + "--resolvabledomain=$(use_resolvable_domain)" "${use_https}" "$(ingress_class)" || failed=1 + if (( HTTPS )); then kubectl delete -f ${TMP_DIR}/test/config/autotls/certmanager/caissuer/ --ignore-not-found turn_off_auto_tls