From 85489ab8390a27c70bd06d861643901a648d9222 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Thu, 2 Dec 2021 08:53:45 -0800 Subject: [PATCH] upgrade to latest dependencies (#1534) bumping knative.dev/eventing 7fc053b...72a4be0: > 72a4be0 Update actions (# 5948) > d91fd15 Update community files (# 5947) > 24e133d fix flaky retry-after header test case (# 5943) > e73a69b upgrade to latest dependencies (# 5941) bumping knative.dev/pkg 438776b...0c482f1: > 0c482f1 Update actions (# 2369) > 07fb0dd Update community files (# 2368) bumping knative.dev/networking 0151d6b...9e2b349: > 9e2b349 Update community files (# 584) > 0c7cac4 Update actions (# 585) > 2731deb Drop implicit dependencies from go.mod (# 583) > cf04ce1 upgrade to latest dependencies (# 582) bumping knative.dev/hack 813559c...4ec2223: > 4ec2223 Update community files (# 124) bumping knative.dev/serving a81da90...d24124c: > d24124c Update net-kourier nightly (# 12384) > eb98a9c Add emptydir conformance test in Beta (# 12167) > 83c5b42 Update actions (# 12379) > a618846 Update community files (# 12378) > b7aa4b7 Custom Metrics HPA Autoscaler (# 12277) > 49d5b8c Add net-gateway-api to Kind (# 12375) > 0a8ebfb Update net-certmanager nightly (# 12367) > 281338f Drop indirect dependencies from go.mod (# 12351) > a6e26e5 Add net-gateway-api (# 12357) > 0ed761b Update net-contour nightly (# 12370) > 48d2385 Update net-kourier nightly (# 12369) > 95f3fb7 Update net-istio nightly (# 12368) > 93319c1 Pass ko flags to podspeed preparation step (# 12365) Signed-off-by: Knative Automation --- go.mod | 14 ++++++---- go.sum | 27 +++++++------------ .../apis/autoscaling/annotation_validation.go | 4 ++- vendor/knative.dev/serving/test/e2e-common.sh | 27 +++++++++++++++++++ .../serving/test/e2e-networking-library.sh | 4 +++ vendor/knative.dev/serving/test/e2e-tests.sh | 16 ++++++++--- vendor/modules.txt | 14 ++++++---- 7 files changed, 75 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index 7a75c75f2..e5a6fbc0f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,10 @@ module knative.dev/client go 1.16 require ( + github.com/emicklei/go-restful v2.15.0+incompatible // indirect + github.com/go-openapi/spec v0.20.2 // indirect github.com/google/go-cmp v0.5.6 + github.com/googleapis/gnostic v0.5.3 // indirect github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect github.com/mitchellh/go-homedir v1.1.0 github.com/smartystreets/assertions v1.0.0 // indirect @@ -18,10 +21,11 @@ require ( k8s.io/cli-runtime v0.21.4 k8s.io/client-go v0.21.4 k8s.io/code-generator v0.21.4 - knative.dev/eventing v0.27.1-0.20211126120551-7fc053b79089 - knative.dev/hack v0.0.0-20211122162614-813559cefdda - knative.dev/networking v0.0.0-20211126074453-0151d6b9c689 - knative.dev/pkg v0.0.0-20211129195804-438776b3c87c - knative.dev/serving v0.27.1-0.20211129222808-a81da906c7b2 + k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect + knative.dev/eventing v0.27.1-0.20211202084045-72a4be098484 + knative.dev/hack v0.0.0-20211202013744-4ec2223904bf + knative.dev/networking v0.0.0-20211202071645-9e2b3496bb72 + knative.dev/pkg v0.0.0-20211202025645-0c482f157959 + knative.dev/serving v0.27.1-0.20211202122446-d24124ce039c sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index f23a3efb1..3dcdcacd1 100644 --- a/go.sum +++ b/go.sum @@ -55,18 +55,15 @@ contrib.go.opencensus.io/exporter/zipkin v0.1.2/go.mod h1:mP5xM3rrgOjpn79MM8fZbj dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v50.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.10/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= @@ -75,9 +72,7 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= -github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= @@ -140,7 +135,6 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= -github.com/aws/aws-sdk-go v1.37.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -1113,7 +1107,6 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= @@ -1380,7 +1373,6 @@ golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1452,9 +1444,7 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -1736,22 +1726,25 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/caching v0.0.0-20211126074453-72ad79574e83/go.mod h1:q/8RJkWzHcAzFJkVdCfmGrOHFGgjNDiYf6pE+ZMwlaE= -knative.dev/eventing v0.27.1-0.20211126120551-7fc053b79089 h1:CxTQ4uk9BpwWzXARM/20uENtwGwxOyS11ankbuz9GDE= -knative.dev/eventing v0.27.1-0.20211126120551-7fc053b79089/go.mod h1:gGQdsi8sNQKIfCFJ58CngPFBrnO5Oqn8pNjZNFMDg88= +knative.dev/eventing v0.27.1-0.20211202084045-72a4be098484 h1:aUjqUjNXHE9E9D3KvMqm4nAZ9c88dDP5UMoin9TZCn8= +knative.dev/eventing v0.27.1-0.20211202084045-72a4be098484/go.mod h1:UEnzKapiHxRsFUF8wbJXFMsfktaEtGltBZdTebSNRCU= knative.dev/hack v0.0.0-20211101195839-11d193bf617b/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack v0.0.0-20211122162614-813559cefdda h1:WBfGcmu5pN+RCxDotKVYtWlJVI2V4Hvah+XD9mcSR/o= knative.dev/hack v0.0.0-20211122162614-813559cefdda/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20211202013744-4ec2223904bf h1:Z4mOmsg8nqFurWIHr5JpA3iVgqI6EHjT5HsklQ+fi4U= +knative.dev/hack v0.0.0-20211202013744-4ec2223904bf/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack/schema v0.0.0-20211122162614-813559cefdda/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= -knative.dev/networking v0.0.0-20211126074453-0151d6b9c689 h1:otYE0083+P6O88kmhRg8ElVPJrojcvlO6AU4wWeGmXA= knative.dev/networking v0.0.0-20211126074453-0151d6b9c689/go.mod h1:/rx6BM9Vn0X2RRLOhi0RDzwrj0sr0zEJNSWUIZR7vbM= +knative.dev/networking v0.0.0-20211202071645-9e2b3496bb72 h1:9NKLcCn5uaSV3h9JMtN2lLnNhiWK4aQiahY+H4V6uyc= +knative.dev/networking v0.0.0-20211202071645-9e2b3496bb72/go.mod h1:ZvA2FO5wExIGXTpH+egSwEK/SIaQVm6i7ErvFWsJMaU= knative.dev/pkg v0.0.0-20211101212339-96c0204a70dc/go.mod h1:SkfDk9bWIiNZD7XtILGkG7AKVyF/M6M0bGxLgl0SYL8= knative.dev/pkg v0.0.0-20211125172117-608fc877e946/go.mod h1:fZUlVceKtVNyFU6LokWGk2a9QFQXeSTtnbKOjjkQ690= knative.dev/pkg v0.0.0-20211129153605-754f332c0c51/go.mod h1:RnaMfVuCsk4ikspMTTc1k0kQKGdbDGxt6mxIPuanfv0= -knative.dev/pkg v0.0.0-20211129195804-438776b3c87c h1:TcVqa/i/E/KcusxjroLEaMB2bDV42lYzN2Z+4soudE8= knative.dev/pkg v0.0.0-20211129195804-438776b3c87c/go.mod h1:AKPae1Cmj+k0GWXWnF2tKY7q5qPa1mTD7oCP4OeMvEM= +knative.dev/pkg v0.0.0-20211202025645-0c482f157959 h1:MLtwkPFGEM6IUGFFBWX0Nvon494culUqZJ3JLKy4dps= +knative.dev/pkg v0.0.0-20211202025645-0c482f157959/go.mod h1:AKPae1Cmj+k0GWXWnF2tKY7q5qPa1mTD7oCP4OeMvEM= knative.dev/reconciler-test v0.0.0-20211112132636-ae9e2e21972f/go.mod h1:gTsbLk496j/M9xqMpx/liyCQ0X3bwDpRtcs2Zzws364= -knative.dev/serving v0.27.1-0.20211129222808-a81da906c7b2 h1:fzeiw6zhQU1RlyeUzOmW43/fSHt8SEtCCQZLyKIiGs8= -knative.dev/serving v0.27.1-0.20211129222808-a81da906c7b2/go.mod h1:N1EK1mAXdVEAg+5dX6rM7J/UGjUTAEIwOs+qqBeZQy8= +knative.dev/serving v0.27.1-0.20211202122446-d24124ce039c h1:RpnSzfHMetCB9f1NDORn0KnJTE0edN9N7Iipn+FoCx0= +knative.dev/serving v0.27.1-0.20211202122446-d24124ce039c/go.mod h1:6cR8XjM/4CNpieXhqI2taLv2NCl0Tc9VddfRK29FNHQ= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go b/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go index 766fafe8e..307767a13 100644 --- a/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go +++ b/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go @@ -225,7 +225,9 @@ func validateMetric(m map[string]string) *apis.FieldError { } case HPA: switch metric { - case CPU, Memory: + case "": + break + default: return nil } default: diff --git a/vendor/knative.dev/serving/test/e2e-common.sh b/vendor/knative.dev/serving/test/e2e-common.sh index f872e5038..05c7af59b 100644 --- a/vendor/knative.dev/serving/test/e2e-common.sh +++ b/vendor/knative.dev/serving/test/e2e-common.sh @@ -25,6 +25,7 @@ export INGRESS_CLASS=${INGRESS_CLASS:-istio.ingress.networking.knative.dev} export ISTIO_VERSION="latest" export KOURIER_VERSION="" export CONTOUR_VERSION="" +export GATEWAY_API_VERSION="" export CERTIFICATE_CLASS="" # Only build linux/amd64 bit images export KO_FLAGS="${KO_FLAGS:---platform=linux/amd64}" @@ -149,6 +150,14 @@ function parse_flags() { readonly INGRESS_CLASS="contour.ingress.networking.knative.dev" return 2 ;; + --gateway-api-version) + # currently, the value of --gateway-api-version is ignored + # latest version of Contour pinned in third_party will be installed + readonly GATEWAY_API_VERSION=$2 + readonly INGRESS_CLASS="gateway-api.ingress.networking.knative.dev" + readonly SHORT=1 + return 2 + ;; --system-namespace) [[ -z "$2" ]] || [[ $2 = --* ]] && fail_test "Missing argument to --system-namespace" export SYSTEM_NAMESPACE=$2 @@ -210,6 +219,18 @@ function knative_setup() { fi fi + # Install gateway-api and istio. Gateway API CRD must be installed before Istio. + if is_ingress_class gateway-api; then + # TODO: Do not use fixed Gateway API version and Istio version. + kubectl apply -k 'github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.3.0' + export ISTIO_VERSION=1.11.4 && curl -sL https://istio.io/downloadIstioctl | sh - + if (( KIND )); then + $HOME/.istioctl/bin/istioctl install -y --set values.gateways.istio-ingressgateway.type=NodePort --set values.global.proxy.clusterDomain="${CLUSTER_DOMAIN}" + else + $HOME/.istioctl/bin/istioctl install -y --set values.global.proxy.clusterDomain="${CLUSTER_DOMAIN}" + fi + fi + stage_test_resources install "${INSTALL_SERVING_VERSION}" "${INSTALL_ISTIO_VERSION}" @@ -318,6 +339,12 @@ function install() { # kubectl -n ${SYSTEM_NAMESPACE} delete leases --all wait_for_leader_controller || return 1 fi + + # Due to https://github.com/vmware-tanzu/carvel-kapp/issues/381, deploy svc by kubectl instead of kapp. + if is_ingress_class gateway-api; then + kubectl delete -f ${REPO_ROOT_DIR}/third_party/gateway-api-latest/istio-gateway.yaml + kubectl apply -f ${REPO_ROOT_DIR}/third_party/gateway-api-latest/istio-gateway.yaml + fi } # Check if we should use --resolvabledomain. In case the ingress only has diff --git a/vendor/knative.dev/serving/test/e2e-networking-library.sh b/vendor/knative.dev/serving/test/e2e-networking-library.sh index 35e0ecaca..9fec09ed0 100644 --- a/vendor/knative.dev/serving/test/e2e-networking-library.sh +++ b/vendor/knative.dev/serving/test/e2e-networking-library.sh @@ -105,5 +105,9 @@ function setup_ingress_env_vars() { export GATEWAY_OVERRIDE=envoy export GATEWAY_NAMESPACE_OVERRIDE=contour-external fi + if is_ingress_class gateway-api; then + export GATEWAY_OVERRIDE=istio-ingressgateway + export GATEWAY_NAMESPACE_OVERRIDE=istio-system + fi } diff --git a/vendor/knative.dev/serving/test/e2e-tests.sh b/vendor/knative.dev/serving/test/e2e-tests.sh index b850bb552..2425a3622 100644 --- a/vendor/knative.dev/serving/test/e2e-tests.sh +++ b/vendor/knative.dev/serving/test/e2e-tests.sh @@ -65,18 +65,29 @@ if [[ -z "${INGRESS_CLASS}" \ alpha="--enable-alpha" fi -TEST_OPTIONS="${TEST_OPTIONS:-${alpha} --enable-beta --resolvabledomain=$(use_resolvable_domain) ${use_https}}" +# Currently only Istio, Contour and Kourier implement the beta features. +beta="" +if [[ -z "${INGRESS_CLASS}" \ + || "${INGRESS_CLASS}" == "istio.ingress.networking.knative.dev" \ + || "${INGRESS_CLASS}" == "contour.ingress.networking.knative.dev" \ + || "${INGRESS_CLASS}" == "kourier.ingress.networking.knative.dev" ]]; then + beta="--enable-beta" +fi + +TEST_OPTIONS="${TEST_OPTIONS:-${alpha} ${beta} --resolvabledomain=$(use_resolvable_domain) ${use_https}}" if (( SHORT )); then TEST_OPTIONS+=" -short" fi toggle_feature autocreateClusterDomainClaims true config-network || fail_test +toggle_feature kubernetes.podspec-volumes-emptydir Enabled go_test_e2e -timeout=30m \ ./test/conformance/api/... \ ./test/conformance/runtime/... \ ./test/e2e \ ${parallelism} \ ${TEST_OPTIONS} || failed=1 +toggle_feature kubernetes.podspec-volumes-emptydir Disabled toggle_feature autocreateClusterDomainClaims false config-network || fail_test toggle_feature tag-header-based-routing Enabled @@ -110,7 +121,6 @@ go_test_e2e -timeout=30m -tags=hpa ./test/e2e ${TEST_OPTIONS} || failed=1 # InitContainers test uses emptyDir. toggle_feature kubernetes.podspec-volumes-emptydir Enabled toggle_feature kubernetes.podspec-init-containers Enabled -go_test_e2e -timeout=2m ./test/e2e/emptydir ${TEST_OPTIONS} || failed=1 go_test_e2e -timeout=2m ./test/e2e/initcontainers ${TEST_OPTIONS} || failed=1 toggle_feature kubernetes.podspec-init-containers Disabled toggle_feature kubernetes.podspec-volumes-emptydir Disabled @@ -138,7 +148,7 @@ rm "${ARTIFACTS}/k8s.log-$(basename "${E2E_SCRIPT}").txt" header "Collecting performance data" -cat <