From 3a57df4ac44beb260a4f8481e69a14cda0511c5a Mon Sep 17 00:00:00 2001 From: knative-automation Date: Thu, 17 Feb 2022 00:54:12 -0800 Subject: [PATCH] upgrade to latest dependencies (#1607) bumping knative.dev/serving 26992d3...a1a7287: > a1a7287 Drop MaxDurationSeconds from the RevisionSpec (# 12635) > 9df07fc bump docker/distribution to v2.8.0 (# 12636) > 0ee7b6f Update community files (# 12632) > 072ddb3 Add pvc e2e test (# 12547) > 615c3c5 Update net-istio nightly (# 12630) > 20a4ca5 upgrade to latest dependencies (# 12624) > 7ab3a5f Update community files (# 12629) > 57b6b75 Update net-contour nightly (# 12628) > 3823b1e Update net-kourier nightly (# 12627) bumping knative.dev/hack 7331bb1...0456e8b: > 0456e8b Update community files (# 152) > b9cb198 Update community files (# 151) > 0e30607 Update kntest path after https://github.com/knative/test-infra/pull/3087 (# 150) bumping knative.dev/pkg fc93ac7...3c00bb0: > 3c00bb0 Update community files (# 2426) bumping knative.dev/networking bd21fc9...4337f03: > 4337f03 upgrade to latest dependencies (# 619) > 2538710 Update community files (# 618) > a70f23c Update community files (# 617) bumping knative.dev/eventing 0326f92...13c0ce8: > 13c0ce8 upgrade to latest dependencies (# 6121) Signed-off-by: Knative Automation --- go.mod | 10 +++---- go.sum | 30 ++++++++++--------- vendor/knative.dev/hack/README.md | 2 +- vendor/knative.dev/hack/library.sh | 2 +- .../pkg/apis/serving/v1/revision_types.go | 5 ---- .../apis/serving/v1/zz_generated.deepcopy.go | 5 ---- .../serving/pkg/testing/v1/service.go | 7 ----- .../knative.dev/serving/test/conformance.go | 2 +- vendor/knative.dev/serving/test/e2e-common.sh | 6 ++++ vendor/knative.dev/serving/test/e2e-tests.sh | 9 ++++++ .../serving/test/e2e-upgrade-tests.sh | 3 +- vendor/modules.txt | 10 +++---- 12 files changed, 46 insertions(+), 45 deletions(-) diff --git a/go.mod b/go.mod index b63ee0b3d..d8dacfce4 100644 --- a/go.mod +++ b/go.mod @@ -18,10 +18,10 @@ require ( k8s.io/cli-runtime v0.22.5 k8s.io/client-go v0.22.5 k8s.io/code-generator v0.22.5 - knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7 - knative.dev/hack v0.0.0-20220209225905-7331bb16ba00 - knative.dev/networking v0.0.0-20220214012120-bd21fc977b7b - knative.dev/pkg v0.0.0-20220210201907-fc93ac76d0b6 - knative.dev/serving v0.29.1-0.20220214180547-26992d3d048d + knative.dev/eventing v0.29.1-0.20220216064840-13c0ce85277b + knative.dev/hack v0.0.0-20220216040439-0456e8bf6547 + knative.dev/networking v0.0.0-20220216014839-4337f034f4ca + knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9 + knative.dev/serving v0.29.1-0.20220216160340-a1a728763819 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 3a9308d0c..72da13756 100644 --- a/go.sum +++ b/go.sum @@ -372,6 +372,7 @@ github.com/docker/cli v20.10.12+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hH github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= @@ -1810,26 +1811,27 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo= k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/caching v0.0.0-20220203025220-f928f34c679a/go.mod h1:kWv5fckKHd9e/OSe6tUHKjUtJryWjytea9mnZxJoPLA= -knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7 h1:Pfmd/rJoXCZbOvD2EIA9U+b8vL75SKVpXNlEkwMvd+4= -knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7/go.mod h1:jsc5u3aC+BYmfUR2cRz9jb77krfULStxXkR1EgMUWp0= +knative.dev/caching v0.0.0-20220210201907-0f9d7ce342fd/go.mod h1:BjBFTZc6CSCxC3FnMOW7RfuN2znfOFLVtGyuV8O9ygs= +knative.dev/eventing v0.29.1-0.20220216064840-13c0ce85277b h1:zxXqiRAI0P6VGUYLiBarfhzV9l9HTR1fkMs9BQkCasc= +knative.dev/eventing v0.29.1-0.20220216064840-13c0ce85277b/go.mod h1:Q6l5svQIhulsqkTQco38HKGCM54Imx7GSIRBASXINAM= knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20220128200847-51a42b2eb63e/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack v0.0.0-20220209225905-7331bb16ba00 h1:MbdDq3JZoCoUzYbw/liB0Idklk/fE2bXiSQnIRhgeC4= knative.dev/hack v0.0.0-20220209225905-7331bb16ba00/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack/schema v0.0.0-20220128200847-51a42b2eb63e/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= -knative.dev/networking v0.0.0-20220210014405-58bc12b06773/go.mod h1:2eVOiwcJEuVV6ejtLEhLEpx92veKYthrt+15BN+Cl2w= -knative.dev/networking v0.0.0-20220214012120-bd21fc977b7b h1:OOdzRCN+RFZV2ZH+tQGQ86MsZAEqZ4IWxTgEz3YqhIY= -knative.dev/networking v0.0.0-20220214012120-bd21fc977b7b/go.mod h1:2eVOiwcJEuVV6ejtLEhLEpx92veKYthrt+15BN+Cl2w= +knative.dev/hack v0.0.0-20220215185059-b9cb1983b600/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20220216040439-0456e8bf6547 h1:lEWsaG/yMLLp3onNushrawsHFXD4LXCXTo5FUUa2GiU= +knative.dev/hack v0.0.0-20220216040439-0456e8bf6547/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack/schema v0.0.0-20220215185059-b9cb1983b600/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= +knative.dev/networking v0.0.0-20220215054657-a70f23cc46a5/go.mod h1:2eVOiwcJEuVV6ejtLEhLEpx92veKYthrt+15BN+Cl2w= +knative.dev/networking v0.0.0-20220216014839-4337f034f4ca h1:1uIKIvGtVIXZD5Om5F78vF6QSD8W7eNLYpSeiwrD5eo= +knative.dev/networking v0.0.0-20220216014839-4337f034f4ca/go.mod h1:3/iXbjjHxxHyo5F0oBo4NDcKMbbsXADFBnLHMSxqD/o= knative.dev/pkg v0.0.0-20220118160532-77555ea48cd4/go.mod h1:etVT7Tm8pSDf4RKhGk4r7j/hj3dNBpvT7bO6a6wpahs= -knative.dev/pkg v0.0.0-20220129160148-ca64d3b3ea8c/go.mod h1:BML2uvSEBhY/cpEsAyWv1+vLy2fxNk8VDJ9fT+D0tj4= -knative.dev/pkg v0.0.0-20220131144930-f4b57aef0006/go.mod h1:bZMFTPDPHV3wXuiQ09UJuEGYYQnfpe81MCxNvsMAiJk= knative.dev/pkg v0.0.0-20220203020920-51be315ed160/go.mod h1:bZMFTPDPHV3wXuiQ09UJuEGYYQnfpe81MCxNvsMAiJk= -knative.dev/pkg v0.0.0-20220210201907-fc93ac76d0b6 h1:YsbAXXRCgwI8BgkbKHHZ/Mztecycw7n5Z5g66+QCVHI= knative.dev/pkg v0.0.0-20220210201907-fc93ac76d0b6/go.mod h1:6ZoCgi60jSUn/WrwTGNAZbsz5/kmwiZZD8EovSLzYZ4= -knative.dev/reconciler-test v0.0.0-20220126171745-740e77ebaace/go.mod h1:XV4cghzCtdASkfUsfMYSnGfGRyd/naDjy9h7Tnae22g= -knative.dev/serving v0.29.1-0.20220214180547-26992d3d048d h1:lqT05LSrMMixTLcwLuw2SLOX5V/8UynBTBu4CKU/AuI= -knative.dev/serving v0.29.1-0.20220214180547-26992d3d048d/go.mod h1:AJtfJib0Dc2FpU0A5OKsBS7MGJMr4uypeSX1tpw6FC0= +knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9 h1:u0vYuNe0BTFvbqN8euaauL/kN3jR7mjmxMc+QRnWsUw= +knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9/go.mod h1:6ZoCgi60jSUn/WrwTGNAZbsz5/kmwiZZD8EovSLzYZ4= +knative.dev/reconciler-test v0.0.0-20220215020657-3f8092fb8739/go.mod h1:m2q6+mGqlPsJ6qP0ssMv3x2UBwIgTdTxgxJ6GK5kgu4= +knative.dev/serving v0.29.1-0.20220216160340-a1a728763819 h1:PwAQne5EcryvaYLc/I6GqeD045eLibOcEKwmkfX8x+k= +knative.dev/serving v0.29.1-0.20220216160340-a1a728763819/go.mod h1:Yg+5htyZekyj3HHPUAzl5vaRM8O7ufuiVNugLwd2OoY= 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/hack/README.md b/vendor/knative.dev/hack/README.md index 570f37097..de565f7c5 100644 --- a/vendor/knative.dev/hack/README.md +++ b/vendor/knative.dev/hack/README.md @@ -111,7 +111,7 @@ main "$@" This is a helper script for Knative E2E test scripts. To use it: 1. [optional] Customize the test cluster. Pass the flags as described - [here](../kntest/pkg/kubetest2/gke/README.md) to the `initialize` function + [here](../tools/kntest/pkg/kubetest2/gke/README.md) to the `initialize` function call if the default values don't fit your needs. 1. Source the script. diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 17ce662ed..8f7b3997e 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -695,7 +695,7 @@ function go_mod_gopath_hack() { # Parameters: $1..$n - parameters passed to the tool. function run_kntest() { if [[ ! -x "$(command -v kntest)" ]]; then - echo "--- FAIL: kntest not installed, please clone knative test-infra repo and run \`go install ./kntest/cmd/kntest\` to install it"; return 1; + echo "--- FAIL: kntest not installed, please clone knative test-infra repo and run \`go install ./tools/kntest/cmd/kntest\` to install it"; return 1; fi kntest "$@" } diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1/revision_types.go b/vendor/knative.dev/serving/pkg/apis/serving/v1/revision_types.go index f54273119..959d5e97a 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1/revision_types.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1/revision_types.go @@ -88,11 +88,6 @@ type RevisionSpec struct { // (send network traffic). If unspecified, a system default will be provided. // +optional TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` - - // MaxDurationSeconds is the maximum duration in seconds a request will be allowed - // to stay open. - // +optional - MaxDurationSeconds *int64 `json:"maxDurationSeconds,omitempty"` } const ( diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1/zz_generated.deepcopy.go b/vendor/knative.dev/serving/pkg/apis/serving/v1/zz_generated.deepcopy.go index 230f6f984..d249e4ff4 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1/zz_generated.deepcopy.go @@ -230,11 +230,6 @@ func (in *RevisionSpec) DeepCopyInto(out *RevisionSpec) { *out = new(int64) **out = **in } - if in.MaxDurationSeconds != nil { - in, out := &in.MaxDurationSeconds, &out.MaxDurationSeconds - *out = new(int64) - **out = **in - } return } diff --git a/vendor/knative.dev/serving/pkg/testing/v1/service.go b/vendor/knative.dev/serving/pkg/testing/v1/service.go index 1f3aae83d..589b90bfb 100644 --- a/vendor/knative.dev/serving/pkg/testing/v1/service.go +++ b/vendor/knative.dev/serving/pkg/testing/v1/service.go @@ -182,13 +182,6 @@ func WithRevisionTimeoutSeconds(revisionTimeoutSeconds int64) ServiceOption { } } -// WithMaxDurationSeconds sets revision max duration timeout -func WithMaxDurationSeconds(maxDurationSeconds int64) ServiceOption { - return func(service *v1.Service) { - service.Spec.Template.Spec.MaxDurationSeconds = ptr.Int64(maxDurationSeconds) - } -} - // WithServiceAccountName sets revision service account name func WithServiceAccountName(serviceAccountName string) ServiceOption { return func(service *v1.Service) { diff --git a/vendor/knative.dev/serving/test/conformance.go b/vendor/knative.dev/serving/test/conformance.go index 57782de5d..526d57e61 100644 --- a/vendor/knative.dev/serving/test/conformance.go +++ b/vendor/knative.dev/serving/test/conformance.go @@ -36,7 +36,6 @@ import ( const ( // Test image names Autoscale = "autoscale" - EmptyDir = "emptydir" Failing = "failing" GRPCPing = "grpc-ping" HelloHTTP2 = "hellohttp2" @@ -53,6 +52,7 @@ const ( SidecarContainer = "sidecarcontainer" SingleThreadedImage = "singlethreaded" Timeout = "timeout" + Volumes = "volumes" WorkingDir = "workingdir" // Constants for test image output. diff --git a/vendor/knative.dev/serving/test/e2e-common.sh b/vendor/knative.dev/serving/test/e2e-common.sh index 5648fe560..e2e2902d9 100644 --- a/vendor/knative.dev/serving/test/e2e-common.sh +++ b/vendor/knative.dev/serving/test/e2e-common.sh @@ -56,6 +56,8 @@ export SYSTEM_NAMESPACE="${SYSTEM_NAMESPACE:-$(uuidgen | tr 'A-Z' 'a-z')}" readonly REPLICAS=3 readonly BUCKETS=10 +export PVC=${PVC:-1} + # Receives the latest serving version and searches for the same version with major and minor and searches for the latest patch function latest_net_istio_version() { local serving_version=$1 @@ -295,6 +297,10 @@ function install() { YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/kind/ingress/${ingress}-kind.yaml") fi + if (( PVC )); then + YTT_FILES+=("${REPO_ROOT_DIR}/test/config/pvc/pvc.yaml") + fi + local ytt_result=$(mktemp) local ytt_post_install_result=$(mktemp) local ytt_flags="" diff --git a/vendor/knative.dev/serving/test/e2e-tests.sh b/vendor/knative.dev/serving/test/e2e-tests.sh index 4fc6f283b..8b6a415e0 100644 --- a/vendor/knative.dev/serving/test/e2e-tests.sh +++ b/vendor/knative.dev/serving/test/e2e-tests.sh @@ -121,6 +121,15 @@ 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 +# RUN PVC tests with default storage class. +toggle_feature kubernetes.podspec-persistent-volume-claim Enabled +toggle_feature kubernetes.podspec-persistent-volume-write Enabled +toggle_feature kubernetes.podspec-securitycontext Enabled +go_test_e2e -timeout=5m ./test/e2e/pvc ${TEST_OPTIONS} || failed=1 +toggle_feature kubernetes.podspec-securitycontext Disabled +toggle_feature kubernetes.podspec-persistent-volume-write Disabled +toggle_feature kubernetes.podspec-persistent-volume-claim Disabled + # Run HA tests separately as they're stopping core Knative Serving pods. # Define short -spoofinterval to ensure frequent probing while stopping pods. toggle_feature autocreateClusterDomainClaims true config-network || fail_test diff --git a/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh b/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh index 396c821f9..e3daf63ae 100644 --- a/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh +++ b/vendor/knative.dev/serving/test/e2e-upgrade-tests.sh @@ -40,7 +40,8 @@ function stage_test_resources() { # Script entry point. # Skip installing istio as an add-on. -initialize "$@" --skip-istio-addon --min-nodes=4 --max-nodes=4 --cluster-version=1.21 \ +# Skip installing a pvc as it is not used in upgrade tests +PVC=0 initialize "$@" --skip-istio-addon --min-nodes=4 --max-nodes=4 --cluster-version=1.21 \ --install-latest-release # TODO(#2656): Reduce the timeout after we get this test to consistently passing. diff --git a/vendor/modules.txt b/vendor/modules.txt index d931d621a..694017b1f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -745,7 +745,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7 +# knative.dev/eventing v0.29.1-0.20220216064840-13c0ce85277b ## explicit knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -771,10 +771,10 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake -# knative.dev/hack v0.0.0-20220209225905-7331bb16ba00 +# knative.dev/hack v0.0.0-20220216040439-0456e8bf6547 ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20220214012120-bd21fc977b7b +# knative.dev/networking v0.0.0-20220216014839-4337f034f4ca ## explicit knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -782,7 +782,7 @@ knative.dev/networking/pkg/apis/networking/v1alpha1 knative.dev/networking/pkg/client/clientset/versioned knative.dev/networking/pkg/client/clientset/versioned/scheme knative.dev/networking/pkg/client/clientset/versioned/typed/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20220210201907-fc93ac76d0b6 +# knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -832,7 +832,7 @@ knative.dev/pkg/tracing/config knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker -# knative.dev/serving v0.29.1-0.20220214180547-26992d3d048d +# knative.dev/serving v0.29.1-0.20220216160340-a1a728763819 ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1