diff --git a/go.mod b/go.mod index 0160726f7..b63ee0b3d 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.20220203222422-fb092415eb36 - knative.dev/hack v0.0.0-20220203160821-9b303d690fc9 - knative.dev/networking v0.0.0-20220203170321-9ce389cb574b - knative.dev/pkg v0.0.0-20220203020920-51be315ed160 - knative.dev/serving v0.29.1-0.20220204002619-fe023e3ac57d + 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 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index f572c640c..3a9308d0c 100644 --- a/go.sum +++ b/go.sum @@ -1810,27 +1810,26 @@ 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-20220202132833-33800d337f17/go.mod h1:kWv5fckKHd9e/OSe6tUHKjUtJryWjytea9mnZxJoPLA= -knative.dev/eventing v0.29.1-0.20220203222422-fb092415eb36 h1:x5ScuH42jlrfFrHta2kinhOeWKo8EjCAuT6QACFH/WU= -knative.dev/eventing v0.29.1-0.20220203222422-fb092415eb36/go.mod h1:jsc5u3aC+BYmfUR2cRz9jb77krfULStxXkR1EgMUWp0= +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/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-20220201013531-82bfca153560/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack v0.0.0-20220203160821-9b303d690fc9 h1:5BoabmjdxeFOICdkJyMn1n8/ny3kNkVMH/2Iel7/mmI= -knative.dev/hack v0.0.0-20220203160821-9b303d690fc9/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-20220202023132-8ea30455281d/go.mod h1:RzkiJ/LyijMaMUa6tOerhI9lGvQYpfDY0VttqQIX0yk= -knative.dev/networking v0.0.0-20220203170321-9ce389cb574b h1:z4MMkQxwftOmkItUzKCkg8XhF45oDys08VE08M8nVtM= -knative.dev/networking v0.0.0-20220203170321-9ce389cb574b/go.mod h1:RzkiJ/LyijMaMUa6tOerhI9lGvQYpfDY0VttqQIX0yk= +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/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-20220202132633-b619c92456b9/go.mod h1:bZMFTPDPHV3wXuiQ09UJuEGYYQnfpe81MCxNvsMAiJk= -knative.dev/pkg v0.0.0-20220203020920-51be315ed160 h1:usHculW2JbADkFNQS8LN3e+sQo2xdJfBaP6/XSvHxQ4= 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.20220204002619-fe023e3ac57d h1:3jOex6SPy9x9LCLabo20CGi3wSiKrKpFtux3un7iBb8= -knative.dev/serving v0.29.1-0.20220204002619-fe023e3ac57d/go.mod h1:Ghcve0KJr4vo+9GkZQaWy2BjhVs4qmwxZW81UxgYaWM= +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= 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/eventing/pkg/apis/eventing/v1/trigger_validation.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_validation.go index ac033c1d8..65917e9bb 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_validation.go @@ -23,9 +23,11 @@ import ( "regexp" cesqlparser "github.com/cloudevents/sdk-go/sql/v2/parser" + "go.uber.org/zap" corev1 "k8s.io/api/core/v1" "knative.dev/pkg/apis" "knative.dev/pkg/kmp" + "knative.dev/pkg/logging" "knative.dev/eventing/pkg/apis/feature" ) @@ -198,6 +200,14 @@ func ValidateCESQLExpression(ctx context.Context, expression string) (errs *apis if expression == "" { return nil } + // Need to recover in case Parse panics + defer func() { + if r := recover(); r != nil { + logging.FromContext(ctx).Debug("Warning! Calling CESQL Parser panicked. Treating expression as invalid.", zap.Any("recovered value", r), zap.String("CESQL", expression)) + errs = apis.ErrInvalidValue(expression, apis.CurrentField) + } + }() + if _, err := cesqlparser.Parse(expression); err != nil { return apis.ErrInvalidValue(expression, apis.CurrentField, err.Error()) } diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_validation.go b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_validation.go index 7b1b82a06..a29363caf 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_validation.go @@ -99,7 +99,7 @@ func (s *Subscription) CheckImmutableFields(ctx context.Context, original *Subsc } // Only Subscriber and Reply are mutable. - ignoreArguments := cmpopts.IgnoreFields(SubscriptionSpec{}, "Subscriber", "Reply") + ignoreArguments := cmpopts.IgnoreFields(SubscriptionSpec{}, "Subscriber", "Reply", "Delivery") if diff, err := kmp.ShortDiff(original.Spec, s.Spec, ignoreArguments); err != nil { return &apis.FieldError{ Message: "Failed to diff Subscription", diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 6eb232999..915a13035 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -122,10 +122,10 @@ function git_push() { git push "${repo_url}" ${git_args} ) } -# Return the master version of a release. +# Return the major+minor version of a release. # For example, "v0.2.1" returns "0.2" # Parameters: $1 - release version label. -function master_version() { +function major_minor_version() { local release="${1//v/}" local tokens=(${release//\./ }) echo "${tokens[0]}.${tokens[1]}" @@ -141,8 +141,7 @@ function hash_from_tag() { # Setup the repository upstream, if not set. function setup_upstream() { # hub and checkout need the upstream URL to be set - # TODO(adrcunha): Use "git remote get-url" once available on Prow. - local upstream="$(git config --get remote.upstream.url)" + local upstream="$(git remote get-url upstream)" echo "Remote upstream URL is '${upstream}'" if [[ -z "${upstream}" ]]; then echo "Setting remote upstream URL to '${REPO_UPSTREAM}'" @@ -223,7 +222,7 @@ function prepare_dot_release() { if [[ -z "${RELEASE_BRANCH}" ]]; then echo "Last release is ${last_version}" # Determine branch - major_minor_version="$(master_version "${last_version}")" + major_minor_version="$(major_minor_version "${last_version}")" RELEASE_BRANCH="release-${major_minor_version}" echo "Last release branch is ${RELEASE_BRANCH}" else @@ -428,7 +427,7 @@ function parse_flags() { # TODO(adrcunha): "dot" releases from release branches require releasing nightlies # for such branches, which we don't do yet. [[ "${RELEASE_VERSION}" =~ ^[0-9]+\.[0-9]+\.0$ ]] || abort "version format must be 'X.Y.0'" - RELEASE_BRANCH="release-$(master_version "${RELEASE_VERSION}")" + RELEASE_BRANCH="release-$(major_minor_version "${RELEASE_VERSION}")" prepare_from_nightly_release setup_upstream fi diff --git a/vendor/knative.dev/networking/pkg/network.go b/vendor/knative.dev/networking/pkg/network.go index aba0902ef..522b437fd 100644 --- a/vendor/knative.dev/networking/pkg/network.go +++ b/vendor/knative.dev/networking/pkg/network.go @@ -189,6 +189,13 @@ const ( // DefaultExternalSchemeKey is the config for defining the scheme of external URLs. DefaultExternalSchemeKey = "default-external-scheme" + + // ActivatorCAKey is the config for the secret name, which stores CA public certificate used + // to sign the activator TLS certificate. + ActivatorCAKey = "activator-ca" + + // ActivatorSANKey is the config for the SAN used to validate the activator TLS certificate. + ActivatorSANKey = "activator-san" ) // DomainTemplateValues are the available properties people can choose from @@ -287,6 +294,14 @@ type Config struct { // DefaultExternalScheme defines the scheme used in external URLs if AutoTLS is // not enabled. Defaults to "http". DefaultExternalScheme string + + // ActivatorCA defines the secret name of the CA public certificate used to sign the activator TLS certificate. + // The traffic is not encrypted if ActivatorCA is empty. + ActivatorCA string + + // ActivatorSAN defines the SAN (Subject Alt Name) used to validate the activator TLS certificate. + // It is used only when ActivatorCA is specified. + ActivatorSAN string } // HTTPProtocol indicates a type of HTTP endpoint behavior @@ -342,6 +357,8 @@ func defaultConfig() *Config { AutocreateClusterDomainClaims: false, DefaultExternalScheme: "http", MeshCompatibilityMode: MeshCompatibilityModeAuto, + ActivatorCA: "", + ActivatorSAN: "", } } @@ -373,6 +390,8 @@ func NewConfigFromMap(data map[string]string) (*Config, error) { cm.AsBool(AutocreateClusterDomainClaimsKey, &nc.AutocreateClusterDomainClaims), cm.AsBool(EnableMeshPodAddressabilityKey, &nc.EnableMeshPodAddressability), cm.AsString(DefaultExternalSchemeKey, &nc.DefaultExternalScheme), + cm.AsString(ActivatorCAKey, &nc.ActivatorCA), + cm.AsString(ActivatorSANKey, &nc.ActivatorSAN), asMode(MeshCompatibilityModeKey, &nc.MeshCompatibilityMode), asLabelSelector(NamespaceWildcardCertSelectorKey, &nc.NamespaceWildcardCertSelector), ); err != nil { diff --git a/vendor/knative.dev/serving/test/README.md b/vendor/knative.dev/serving/test/README.md index 7c11be231..0086aeb15 100644 --- a/vendor/knative.dev/serving/test/README.md +++ b/vendor/knative.dev/serving/test/README.md @@ -100,13 +100,10 @@ go test -tags=e2e -count=1 ./test/conformance/... \ ## Running performance tests -Each performance test case in Knative serving is a benchmark, to run these -benchmarks, please follow -[dev.md](https://github.com/knative/serving/blob/main/test/performance/dev.md). +Performance tests using [kperf](https://github.com/knative-sandbox/kperf) can be run in +a pull request using the optional test job `/test pull-knative-serving-performance-tests-kperf` -> As of now, only Googlers can run these benchmarks due to one issue of -> [Mako](https://github.com/google/mako) - the benchmarking tool we use. Details -> can be found in the [issue report](https://github.com/google/mako/issues/2). +A report will be generated in the artifacts folder of the test run. ### Running a single test case diff --git a/vendor/knative.dev/serving/test/e2e-networking-library.sh b/vendor/knative.dev/serving/test/e2e-networking-library.sh index f2b83c646..b849dbcd2 100644 --- a/vendor/knative.dev/serving/test/e2e-networking-library.sh +++ b/vendor/knative.dev/serving/test/e2e-networking-library.sh @@ -26,7 +26,7 @@ function stage_gateway_api_resources() { mkdir -p "${gateway_dir}" # TODO: if we switch to istio 1.12 we can reuse stage_istio_head - curl -sL https://istio.io/downloadIstioctl | ISTIO_VERSION=1.11.4 sh - + curl -sL https://istio.io/downloadIstioctl | ISTIO_VERSION=1.12.2 sh - local params="--set values.global.proxy.clusterDomain=${CLUSTER_DOMAIN}" if (( KIND )); then diff --git a/vendor/modules.txt b/vendor/modules.txt index 66f50067f..d931d621a 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.20220203222422-fb092415eb36 +# knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7 ## 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-20220203160821-9b303d690fc9 +# knative.dev/hack v0.0.0-20220209225905-7331bb16ba00 ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20220203170321-9ce389cb574b +# knative.dev/networking v0.0.0-20220214012120-bd21fc977b7b ## 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-20220203020920-51be315ed160 +# knative.dev/pkg v0.0.0-20220210201907-fc93ac76d0b6 ## 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.20220204002619-fe023e3ac57d +# knative.dev/serving v0.29.1-0.20220214180547-26992d3d048d ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1