From 28c3fb5a8bc9fb819290948e15a00cef2b35b252 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 12 Sep 2023 01:37:25 +0000 Subject: [PATCH] upgrade to latest dependencies bumping gomodules.xyz/jsonpatch/v2 13a9e4a...17d7994: > 17d7994 Shortcut when two json documents are same (# 37) bumping knative.dev/eventing a2e2aa3...74baa8f: > 74baa8f [main] Update community files (# 7246) > 94dfb4a Expose a Brokers audience in its status (# 7237) > 7876f12 Add Audience field in CRDs (# 7244) > b082850 [main] Upgrade to latest dependencies (# 7234) > a7b39bc Add more benchmark test for All filter (# 7232) > e057e77 [main] Upgrade to latest dependencies (# 7233) > 25400fb chore: Remove deprecated 'NewScheduler' func (# 7221) > d532005 [main] Upgrade to latest dependencies (# 7220) > 11d9e8a [main] Format Go code (# 7218) > 10e25b9 Autoscaler considers reserved and pending replicas (# 7027) > dd68bd3 [main] Upgrade to latest dependencies (# 7215) > eacaac5 deprecate kntest (# 7211) > b5a4460 Added rekt test for broker eventtype autocreate (# 7202) > d547e2d [main] Format Go code (# 7206) > 25f7e03 Reflect on e2e flags that PingSource is now v1 (# 7208) > 0e8b7ca Move eventtype rekttest pingsource to experiment (# 7180) > 08cf00f Add rekt test for "Any" filter (# 7130) > 11f1ee4 Added rekt test for channel event autocreate (# 7198) > 0045fa9 Broker eventtype autocreate fixes (# 7161) > 7749771 Added benchmark for any filter (# 7195) > 4d8da11 Upgrade to latest dependencies (# 7190) bumping github.com/go-logr/logr 47e013c...4da5305: > 4da5305 make Discard logger equal to null logger > 4d25940 funcr: optimize WithValues/WithName/WithCallDepth > 00ed9d0 Merge pull request # 163 from thockin/example-v-enabled > d4762a8 Merge pull request # 161 from thockin/master > b818fb2 Add examples for Logger methods > b10dd33 Merge pull request # 162 from thockin/github-assign > 5b49379 Fix comments on optional sink interfaces > af0016d Merge pull request # 159 from thockin/master > 18e8b87 Make github assign PRs and issues > a8aea2e funcr: JSON invalid output with 1st field omitted > 4497483 Merge pull request # 160 from thockin/pr-148-takeover > f2636e2 Merge pull request # 155 from thockin/master > 41ad1c2 testr: merge testLogger and testLoggerInterface > b3dc695 Make zero value useful and add .IsZero() > 7ea0fe3 Add pkg doc to example > 8f2e557 If logging as JSON and the type is json.RawMessage log it "as-is" (# 147) > 46d9b05 Use newer gofmt > a49c971 Merge pull request # 146 from thockin/master > 772cb53 Remove deprecated linters > 2d5bc33 Merge pull request # 143 from jeandeaual/testr-interface > abbd0bc Bump Go version for GH actions > 89d4c03 Merge pull request # 144 from balki/patch-1 > a326b84 testr: use an interface to make it work with *testing.B and *testing.F in addition to *testing.T > 059d32c Fix syntax in documentation bumping github.com/google/uuid 44b5fee...b3cae7c: > b3cae7c chore(master): release 1.3.1 (# 127) > 7b8f57c fix(ci): switch to release-please app (# 126) > e69e468 chore(ci): configure release-please, update contrib (# 122) > 97c970d chore(ci): add apidiff check for API compatibility (# 123) > 53f93a8 docs: change godoc URL in README (# 124) > 0b416df docs: update link to RFC 4122 (# 93) > 75e1ac5 docs: shell format go tool command (# 111) > d719869 docs: fix typo node_js docs (# 117) > 574e687 fix: Use .EqualFold() to parse urn prefixed UUIDs (# 118) > c91929c Merge pull request # 121 from noahdietz/setup-codeowners-and-actions > e3f8b98 chore(ci): add Action-based tests (# 121) > db89a3c fix go1.20 resolving to go1.2 > 78d68fc chore(ci): add Action-based tests bumping knative.dev/hack 9cc05a3...3af329f: > 3af329f Update community files (# 313) > 760813a Allow to not vendor the dependencies (# 311) > f63d16e :gift: Source embedded hack scripts (# 222) bumping knative.dev/serving eaff0b3...997d8ef: > 997d8ef fix(activator): Don't cancel all probes on one probe failure (# 14303) > 6567552 Remove AUTHORS file (# 14350) > 4ab6bd7 Update community files (# 14349) > a8a8be2 Update documentation about Knative serving encryption (# 14213) > 9ad6c42 Update net-kourier nightly (# 14344) > d822a70 Change configuration case for tests (# 14330) > 945016d Update net-certmanager nightly (# 14345) > 17c3012 Update net-contour nightly (# 14342) > 0c6808b Update net-istio nightly (# 14341) > 91ba6d0 Update net-gateway-api nightly (# 14343) > fb6997c Update net-contour nightly (# 14339) > b92463c Update net-gateway-api nightly (# 14336) > b61b9f7 Update net-certmanager nightly (# 14335) > 9fb227c Update net-kourier nightly (# 14338) > 4e3cd12 Update net-istio nightly (# 14337) > b25e8dd upgrade to latest dependencies (# 14328) > aeb4e94 Update net-contour nightly (# 14334) > 815fe70 Update DEVELOPMENT.md to Include local registry workaround for ImagePullBackOff (# 14327) > 5e1792e Call Stop() for cert watcher (# 14333) > b557307 Update net-contour nightly (# 14323) > dae0b36 Update net-kourier nightly (# 14329) > 8f2f57b Fix certificate watcher test (# 14331) > b6d4f61 Add PullIfNotPresent to multiple container test (# 14317) > 5a2dc2e Update net-kourier nightly (# 14320) > 442c13d Update net-istio nightly (# 14322) > 8ff8961 Update net-certmanager nightly (# 14319) > 007cb37 Update net-gateway-api nightly (# 14321) > 005838b Re-generate test/config/tls/cert-secret.yaml (# 14324) > 8dbb2d3 Add certificate watcher to queue-proxy (# 14189) > 45b119b upgrade to latest dependencies (# 14316) > ca1c242 Update net-contour nightly (# 14315) > a2ef52b Update net-certmanager nightly (# 14314) > 4dba344 Update net-gateway-api nightly (# 14313) > 18cb237 Update net-istio nightly (# 14312) > ba5a929 Update net-kourier nightly (# 14311) > 323b8c9 upgrade to latest dependencies (# 14308) > 358ec13 Split HTTPGetAction.Path into path and query (# 14273) > cea3201 Update net-kourier nightly (# 14305) > ad5455e fix e2e script & some tests (# 14296) > f89b071 Update net-certmanager nightly (# 14307) > 81d7085 Update net-gateway-api nightly (# 14306) > 899b332 Update net-contour nightly (# 14304) > 09a8095 Use dataplane-trust instead of internal-encryption (# 14301) > ae86b1d upgrade to latest dependencies (# 14302) > 43f7526 Do not skip TestTargetBurstCapacity when `dataplane-trust` is not specified (# 14300) > d39a379 Support conformance test with cgroup v2 (# 14297) > c63d9be Fix comment about Cgroup limit (# 14298) > 9ac8996 Update net-istio nightly (# 14293) > 59bfc12 Update net-certmanager nightly (# 14294) > 7aef47b Update net-contour nightly (# 14295) > 90046c3 Don't reset ENV vars (# 14276) > 82747ef Update net-kourier nightly (# 14292) bumping github.com/openzipkin/zipkin-go 4541717...e84b2cf: > e84b2cf bump dependencies (# 216) > 15a86c1 update gha bumping go version matrix, trying to fix codecov (# 215) > 87e3b85 chore(deps): bump sarama to v1.40.0 (# 214) bumping knative.dev/client-pkg 5abd129...2bcbd97: > 2bcbd97 Update community files (# 117) bumping knative.dev/pkg 81e4ee1...09df2b6: > 09df2b6 Update community files (# 2817) > 6550b1f Bump actions/checkout from 3 to 4 (# 2811) > 27252a3 Added Audience field in duckv1.Destination (# 2797) > 66bf5af Added Audience field in duckv1.Addressable (# 2798) > 211243a generate serviceaccount reconciler (# 2808) > fcccb4e Bump github.com/openzipkin/zipkin-go from 0.4.1 to 0.4.2 (# 2807) > dab3c43 Bump gomodules.xyz/jsonpatch/v2 from 2.3.0 to 2.4.0 (# 2806) > 297c36a Bump github.com/google/uuid from 1.3.0 to 1.3.1 (# 2805) bumping knative.dev/networking 1d7920d...4804203: > 4804203 Update community files (# 854) > 0cf7093 upgrade to latest dependencies (# 853) > 17b4f7b upgrade to latest dependencies (# 852) > e9a822c upgrade to latest dependencies (# 850) > 682b8d7 upgrade to latest dependencies (# 849) > dfd6edf Fix inaccurate instruction for internal-encryption (# 846) > 1e4e183 Improve InternalTLSEnabled util function (# 847) Signed-off-by: Knative Automation --- go.mod | 20 +-- go.sum | 47 ++--- vendor/github.com/go-logr/logr/.golangci.yaml | 3 - vendor/github.com/go-logr/logr/discard.go | 32 +--- vendor/github.com/go-logr/logr/logr.go | 166 +++++++++++------- vendor/github.com/google/uuid/.travis.yml | 9 - vendor/github.com/google/uuid/CHANGELOG.md | 10 ++ vendor/github.com/google/uuid/CONTRIBUTING.md | 16 ++ vendor/github.com/google/uuid/README.md | 10 +- vendor/github.com/google/uuid/node_js.go | 2 +- vendor/github.com/google/uuid/uuid.go | 10 +- .../gomodules.xyz/jsonpatch/v2/jsonpatch.go | 4 + .../pkg/apis/eventing/v1/broker_lifecycle.go | 10 +- .../pkg/apis/eventing/v1/test_helper.go | 8 +- vendor/knative.dev/hack/{hack.go => embed.go} | 13 +- vendor/knative.dev/hack/go.work | 1 + vendor/knative.dev/hack/go.work.sum | 10 -- vendor/knative.dev/hack/infra-library.sh | 2 +- vendor/knative.dev/hack/library.sh | 13 +- .../networking/pkg/config/config.go | 14 +- .../pkg/apis/duck/v1/addressable_types.go | 4 + .../pkg/apis/duck/v1/destination.go | 8 + .../pkg/apis/duck/v1/zz_generated.deepcopy.go | 10 ++ vendor/knative.dev/pkg/hack/update-codegen.sh | 2 +- vendor/knative.dev/serving/AUTHORS | 11 -- .../pkg/apis/serving/v1/route_lifecycle.go | 4 +- .../v1beta1/domainmapping_lifecycle.go | 2 +- .../serving/test/e2e-auto-tls-tests.sh | 8 +- vendor/knative.dev/serving/test/e2e-common.sh | 38 ++-- vendor/knative.dev/serving/test/e2e-tests.sh | 80 ++++----- vendor/modules.txt | 20 +-- 31 files changed, 313 insertions(+), 274 deletions(-) delete mode 100644 vendor/github.com/google/uuid/.travis.yml create mode 100644 vendor/github.com/google/uuid/CHANGELOG.md rename vendor/knative.dev/hack/{hack.go => embed.go} (74%) delete mode 100644 vendor/knative.dev/serving/AUTHORS diff --git a/go.mod b/go.mod index 38dc227f97..edc7794df4 100644 --- a/go.mod +++ b/go.mod @@ -20,12 +20,12 @@ require ( k8s.io/cli-runtime v0.26.5 k8s.io/client-go v0.26.5 k8s.io/code-generator v0.26.5 - knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b - knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d - knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 - knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e - knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 - knative.dev/serving v0.38.1-0.20230823024257-eaff0b39b99e + knative.dev/client-pkg v0.0.0-20230911133121-2bcbd97b17ec + knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d + knative.dev/hack v0.0.0-20230911131120-3af329f73ff3 + knative.dev/networking v0.0.0-20230911132222-48042038ea3d + knative.dev/pkg v0.0.0-20230911130819-09df2b681efd + knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d sigs.k8s.io/yaml v1.3.0 ) @@ -50,7 +50,7 @@ require ( github.com/go-errors/errors v1.4.2 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/swag v0.22.3 // indirect @@ -62,7 +62,7 @@ require ( github.com/google/go-containerregistry v0.13.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect github.com/imdario/mergo v0.3.13 // indirect @@ -80,7 +80,7 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/openzipkin/zipkin-go v0.4.1 // indirect + github.com/openzipkin/zipkin-go v0.4.2 // indirect github.com/pelletier/go-toml/v2 v2.0.9 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect @@ -110,7 +110,7 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/go.sum b/go.sum index 6e40ebd75a..b62bcce00e 100644 --- a/go.sum +++ b/go.sum @@ -122,8 +122,8 @@ github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNV github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -133,6 +133,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -207,12 +208,13 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= @@ -289,13 +291,12 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= -github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= +github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A= -github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM= +github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= +github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -664,8 +665,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc= -gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= 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= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -833,18 +834,18 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b h1:Ln3mDUER89kC4sYHkCpoZVcwthGlMwjekQi2IdMH4vU= -knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b/go.mod h1:GRVZm1rKOy0lpPBGRM1ugK5joDbhXFEvULINHqPoA9U= -knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d h1:K8EcKbY3POUZ+D7uekPUqYY7m+Ci3nkYu1+SqpYiwdY= -knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d/go.mod h1:InEIckt+XICxXXYy2P4kqEJ4nMDXqI1iCUZ84vGDRbM= -knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 h1:n9YEGYuoj31pAkhGlNL+xTQAeXKYTLeMmIZLWA9fAeo= -knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e h1:9CcYOXJKJSiZ5aeNm0AJZ1DjOlisadZhMSa/O/hOSmE= -knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e/go.mod h1:1voQlQD0tuot6U3Kldw+uch33mK2LV85fi3MfbV0CP8= -knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 h1:TI2hMwTM5Bl+yaWu1gN5bXAHSvc+FtH9cqm3NzmDBtY= -knative.dev/pkg v0.0.0-20230821102121-81e4ee140363/go.mod h1:dA3TdhFTRm4KmmpvfknpGV43SbGNFkLHySjC8/+NczM= -knative.dev/serving v0.38.1-0.20230823024257-eaff0b39b99e h1:LbHIIoOPcHXDwoJO/5OYqBx46ChN5heEujHiJK71GBc= -knative.dev/serving v0.38.1-0.20230823024257-eaff0b39b99e/go.mod h1:/q/HksDFhDiPdwOiyFdDE464YF+GjOYL22x7q57NPB0= +knative.dev/client-pkg v0.0.0-20230911133121-2bcbd97b17ec h1:zaZJpw2q0iMaJ8ijQKlN/FMKqqubC5AZXVYMS1ibfoU= +knative.dev/client-pkg v0.0.0-20230911133121-2bcbd97b17ec/go.mod h1:GRVZm1rKOy0lpPBGRM1ugK5joDbhXFEvULINHqPoA9U= +knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d h1:JOWFfjNkEqxWtgvTyGGrXuuE1vK3+tOk9JpgbuHYX/0= +knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d/go.mod h1:V81fCtozZsKFXTLix6y0BXEguzUo+FCcJGzNfjL7JHc= +knative.dev/hack v0.0.0-20230911131120-3af329f73ff3 h1:3vOdwAi/IjOTQvL2nP3RDRgPuYIbSRqEgaIgAgDFC08= +knative.dev/hack v0.0.0-20230911131120-3af329f73ff3/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8= +knative.dev/networking v0.0.0-20230911132222-48042038ea3d h1:4ja2C3Azc3N7mOypo2efX3j5OalvBU3FwGGxHM8GDo0= +knative.dev/networking v0.0.0-20230911132222-48042038ea3d/go.mod h1:+QuFm3aotxR+gM69XilYuJiu5JOyGf1Mlw42IfSaCkk= +knative.dev/pkg v0.0.0-20230911130819-09df2b681efd h1:p73TV5lMulQpFpa7FBMSGORaL9MFzENu+IVhMv/ELMs= +knative.dev/pkg v0.0.0-20230911130819-09df2b681efd/go.mod h1:KOCW7iby+PL0aSDG2Ta7Vf1kCn+VAqL7QaTyK0c4fuk= +knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d h1:QiE3llHJVKeUi/R79jfobuH5h4vNAzerW/u4s4XEq30= +knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d/go.mod h1:v3lJx+0X60fxa+0yu6DY94ez1qbf6bt1vp7iXglHipU= 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= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/github.com/go-logr/logr/.golangci.yaml b/vendor/github.com/go-logr/logr/.golangci.yaml index 94ff801df1..0cffafa7bf 100644 --- a/vendor/github.com/go-logr/logr/.golangci.yaml +++ b/vendor/github.com/go-logr/logr/.golangci.yaml @@ -6,7 +6,6 @@ linters: disable-all: true enable: - asciicheck - - deadcode - errcheck - forcetypeassert - gocritic @@ -18,10 +17,8 @@ linters: - misspell - revive - staticcheck - - structcheck - typecheck - unused - - varcheck issues: exclude-use-default: false diff --git a/vendor/github.com/go-logr/logr/discard.go b/vendor/github.com/go-logr/logr/discard.go index 9d92a38f1d..99fe8be93c 100644 --- a/vendor/github.com/go-logr/logr/discard.go +++ b/vendor/github.com/go-logr/logr/discard.go @@ -20,35 +20,5 @@ package logr // used whenever the caller is not interested in the logs. Logger instances // produced by this function always compare as equal. func Discard() Logger { - return Logger{ - level: 0, - sink: discardLogSink{}, - } -} - -// discardLogSink is a LogSink that discards all messages. -type discardLogSink struct{} - -// Verify that it actually implements the interface -var _ LogSink = discardLogSink{} - -func (l discardLogSink) Init(RuntimeInfo) { -} - -func (l discardLogSink) Enabled(int) bool { - return false -} - -func (l discardLogSink) Info(int, string, ...interface{}) { -} - -func (l discardLogSink) Error(error, string, ...interface{}) { -} - -func (l discardLogSink) WithValues(...interface{}) LogSink { - return l -} - -func (l discardLogSink) WithName(string) LogSink { - return l + return New(nil) } diff --git a/vendor/github.com/go-logr/logr/logr.go b/vendor/github.com/go-logr/logr/logr.go index c3b56b3d2c..e027aea3fd 100644 --- a/vendor/github.com/go-logr/logr/logr.go +++ b/vendor/github.com/go-logr/logr/logr.go @@ -21,7 +21,7 @@ limitations under the License. // to back that API. Packages in the Go ecosystem can depend on this package, // while callers can implement logging with whatever backend is appropriate. // -// Usage +// # Usage // // Logging is done using a Logger instance. Logger is a concrete type with // methods, which defers the actual logging to a LogSink interface. The main @@ -30,16 +30,20 @@ limitations under the License. // "structured logging". // // With Go's standard log package, we might write: -// log.Printf("setting target value %s", targetValue) +// +// log.Printf("setting target value %s", targetValue) // // With logr's structured logging, we'd write: -// logger.Info("setting target", "value", targetValue) +// +// logger.Info("setting target", "value", targetValue) // // Errors are much the same. Instead of: -// log.Printf("failed to open the pod bay door for user %s: %v", user, err) +// +// log.Printf("failed to open the pod bay door for user %s: %v", user, err) // // We'd write: -// logger.Error(err, "failed to open the pod bay door", "user", user) +// +// logger.Error(err, "failed to open the pod bay door", "user", user) // // Info() and Error() are very similar, but they are separate methods so that // LogSink implementations can choose to do things like attach additional @@ -47,7 +51,7 @@ limitations under the License. // always logged, regardless of the current verbosity. If there is no error // instance available, passing nil is valid. // -// Verbosity +// # Verbosity // // Often we want to log information only when the application in "verbose // mode". To write log lines that are more verbose, Logger has a V() method. @@ -58,20 +62,22 @@ limitations under the License. // Error messages do not have a verbosity level and are always logged. // // Where we might have written: -// if flVerbose >= 2 { -// log.Printf("an unusual thing happened") -// } +// +// if flVerbose >= 2 { +// log.Printf("an unusual thing happened") +// } // // We can write: -// logger.V(2).Info("an unusual thing happened") // -// Logger Names +// logger.V(2).Info("an unusual thing happened") +// +// # Logger Names // // Logger instances can have name strings so that all messages logged through // that instance have additional context. For example, you might want to add // a subsystem name: // -// logger.WithName("compactor").Info("started", "time", time.Now()) +// logger.WithName("compactor").Info("started", "time", time.Now()) // // The WithName() method returns a new Logger, which can be passed to // constructors or other functions for further use. Repeated use of WithName() @@ -82,25 +88,27 @@ limitations under the License. // joining operation (e.g. whitespace, commas, periods, slashes, brackets, // quotes, etc). // -// Saved Values +// # Saved Values // // Logger instances can store any number of key/value pairs, which will be // logged alongside all messages logged through that instance. For example, // you might want to create a Logger instance per managed object: // // With the standard log package, we might write: -// log.Printf("decided to set field foo to value %q for object %s/%s", -// targetValue, object.Namespace, object.Name) +// +// log.Printf("decided to set field foo to value %q for object %s/%s", +// targetValue, object.Namespace, object.Name) // // With logr we'd write: -// // Elsewhere: set up the logger to log the object name. -// obj.logger = mainLogger.WithValues( -// "name", obj.name, "namespace", obj.namespace) // -// // later on... -// obj.logger.Info("setting foo", "value", targetValue) +// // Elsewhere: set up the logger to log the object name. +// obj.logger = mainLogger.WithValues( +// "name", obj.name, "namespace", obj.namespace) +// +// // later on... +// obj.logger.Info("setting foo", "value", targetValue) // -// Best Practices +// # Best Practices // // Logger has very few hard rules, with the goal that LogSink implementations // might have a lot of freedom to differentiate. There are, however, some @@ -124,15 +132,15 @@ limitations under the License. // around. For cases where passing a logger is optional, a pointer to Logger // should be used. // -// Key Naming Conventions +// # Key Naming Conventions // // Keys are not strictly required to conform to any specification or regex, but // it is recommended that they: -// * be human-readable and meaningful (not auto-generated or simple ordinals) -// * be constant (not dependent on input data) -// * contain only printable characters -// * not contain whitespace or punctuation -// * use lower case for simple keys and lowerCamelCase for more complex ones +// - be human-readable and meaningful (not auto-generated or simple ordinals) +// - be constant (not dependent on input data) +// - contain only printable characters +// - not contain whitespace or punctuation +// - use lower case for simple keys and lowerCamelCase for more complex ones // // These guidelines help ensure that log data is processed properly regardless // of the log implementation. For example, log implementations will try to @@ -141,51 +149,54 @@ limitations under the License. // While users are generally free to use key names of their choice, it's // generally best to avoid using the following keys, as they're frequently used // by implementations: -// * "caller": the calling information (file/line) of a particular log line -// * "error": the underlying error value in the `Error` method -// * "level": the log level -// * "logger": the name of the associated logger -// * "msg": the log message -// * "stacktrace": the stack trace associated with a particular log line or -// error (often from the `Error` message) -// * "ts": the timestamp for a log line +// - "caller": the calling information (file/line) of a particular log line +// - "error": the underlying error value in the `Error` method +// - "level": the log level +// - "logger": the name of the associated logger +// - "msg": the log message +// - "stacktrace": the stack trace associated with a particular log line or +// error (often from the `Error` message) +// - "ts": the timestamp for a log line // // Implementations are encouraged to make use of these keys to represent the // above concepts, when necessary (for example, in a pure-JSON output form, it // would be necessary to represent at least message and timestamp as ordinary // named values). // -// Break Glass +// # Break Glass // // Implementations may choose to give callers access to the underlying // logging implementation. The recommended pattern for this is: -// // Underlier exposes access to the underlying logging implementation. -// // Since callers only have a logr.Logger, they have to know which -// // implementation is in use, so this interface is less of an abstraction -// // and more of way to test type conversion. -// type Underlier interface { -// GetUnderlying() -// } +// +// // Underlier exposes access to the underlying logging implementation. +// // Since callers only have a logr.Logger, they have to know which +// // implementation is in use, so this interface is less of an abstraction +// // and more of way to test type conversion. +// type Underlier interface { +// GetUnderlying() +// } // // Logger grants access to the sink to enable type assertions like this: -// func DoSomethingWithImpl(log logr.Logger) { -// if underlier, ok := log.GetSink()(impl.Underlier) { -// implLogger := underlier.GetUnderlying() -// ... -// } -// } +// +// func DoSomethingWithImpl(log logr.Logger) { +// if underlier, ok := log.GetSink().(impl.Underlier); ok { +// implLogger := underlier.GetUnderlying() +// ... +// } +// } // // Custom `With*` functions can be implemented by copying the complete // Logger struct and replacing the sink in the copy: -// // WithFooBar changes the foobar parameter in the log sink and returns a -// // new logger with that modified sink. It does nothing for loggers where -// // the sink doesn't support that parameter. -// func WithFoobar(log logr.Logger, foobar int) logr.Logger { -// if foobarLogSink, ok := log.GetSink()(FoobarSink); ok { -// log = log.WithSink(foobarLogSink.WithFooBar(foobar)) -// } -// return log -// } +// +// // WithFooBar changes the foobar parameter in the log sink and returns a +// // new logger with that modified sink. It does nothing for loggers where +// // the sink doesn't support that parameter. +// func WithFoobar(log logr.Logger, foobar int) logr.Logger { +// if foobarLogSink, ok := log.GetSink().(FoobarSink); ok { +// log = log.WithSink(foobarLogSink.WithFooBar(foobar)) +// } +// return log +// } // // Don't use New to construct a new Logger with a LogSink retrieved from an // existing Logger. Source code attribution might not work correctly and @@ -201,11 +212,14 @@ import ( ) // New returns a new Logger instance. This is primarily used by libraries -// implementing LogSink, rather than end users. +// implementing LogSink, rather than end users. Passing a nil sink will create +// a Logger which discards all log lines. func New(sink LogSink) Logger { logger := Logger{} logger.setSink(sink) - sink.Init(runtimeInfo) + if sink != nil { + sink.Init(runtimeInfo) + } return logger } @@ -244,7 +258,7 @@ type Logger struct { // Enabled tests whether this Logger is enabled. For example, commandline // flags might be used to set the logging verbosity and disable some info logs. func (l Logger) Enabled() bool { - return l.sink.Enabled(l.level) + return l.sink != nil && l.sink.Enabled(l.level) } // Info logs a non-error message with the given key/value pairs as context. @@ -254,6 +268,9 @@ func (l Logger) Enabled() bool { // information. The key/value pairs must alternate string keys and arbitrary // values. func (l Logger) Info(msg string, keysAndValues ...interface{}) { + if l.sink == nil { + return + } if l.Enabled() { if withHelper, ok := l.sink.(CallStackHelperLogSink); ok { withHelper.GetCallStackHelper()() @@ -273,6 +290,9 @@ func (l Logger) Info(msg string, keysAndValues ...interface{}) { // triggered this log line, if present. The err parameter is optional // and nil may be passed instead of an error instance. func (l Logger) Error(err error, msg string, keysAndValues ...interface{}) { + if l.sink == nil { + return + } if withHelper, ok := l.sink.(CallStackHelperLogSink); ok { withHelper.GetCallStackHelper()() } @@ -284,6 +304,9 @@ func (l Logger) Error(err error, msg string, keysAndValues ...interface{}) { // level means a log message is less important. Negative V-levels are treated // as 0. func (l Logger) V(level int) Logger { + if l.sink == nil { + return l + } if level < 0 { level = 0 } @@ -294,6 +317,9 @@ func (l Logger) V(level int) Logger { // WithValues returns a new Logger instance with additional key/value pairs. // See Info for documentation on how key/value pairs work. func (l Logger) WithValues(keysAndValues ...interface{}) Logger { + if l.sink == nil { + return l + } l.setSink(l.sink.WithValues(keysAndValues...)) return l } @@ -304,6 +330,9 @@ func (l Logger) WithValues(keysAndValues ...interface{}) Logger { // contain only letters, digits, and hyphens (see the package documentation for // more information). func (l Logger) WithName(name string) Logger { + if l.sink == nil { + return l + } l.setSink(l.sink.WithName(name)) return l } @@ -324,6 +353,9 @@ func (l Logger) WithName(name string) Logger { // WithCallDepth(1) because it works with implementions that support the // CallDepthLogSink and/or CallStackHelperLogSink interfaces. func (l Logger) WithCallDepth(depth int) Logger { + if l.sink == nil { + return l + } if withCallDepth, ok := l.sink.(CallDepthLogSink); ok { l.setSink(withCallDepth.WithCallDepth(depth)) } @@ -345,6 +377,9 @@ func (l Logger) WithCallDepth(depth int) Logger { // implementation does not support either of these, the original Logger will be // returned. func (l Logger) WithCallStackHelper() (func(), Logger) { + if l.sink == nil { + return func() {}, l + } var helper func() if withCallDepth, ok := l.sink.(CallDepthLogSink); ok { l.setSink(withCallDepth.WithCallDepth(1)) @@ -357,6 +392,11 @@ func (l Logger) WithCallStackHelper() (func(), Logger) { return helper, l } +// IsZero returns true if this logger is an uninitialized zero value +func (l Logger) IsZero() bool { + return l.sink == nil +} + // contextKey is how we find Loggers in a context.Context. type contextKey struct{} @@ -442,7 +482,7 @@ type LogSink interface { WithName(name string) LogSink } -// CallDepthLogSink represents a Logger that knows how to climb the call stack +// CallDepthLogSink represents a LogSink that knows how to climb the call stack // to identify the original call site and can offset the depth by a specified // number of frames. This is useful for users who have helper functions // between the "real" call site and the actual calls to Logger methods. @@ -467,7 +507,7 @@ type CallDepthLogSink interface { WithCallDepth(depth int) LogSink } -// CallStackHelperLogSink represents a Logger that knows how to climb +// CallStackHelperLogSink represents a LogSink that knows how to climb // the call stack to identify the original call site and can skip // intermediate helper functions if they mark themselves as // helper. Go's testing package uses that approach. diff --git a/vendor/github.com/google/uuid/.travis.yml b/vendor/github.com/google/uuid/.travis.yml deleted file mode 100644 index d8156a60ba..0000000000 --- a/vendor/github.com/google/uuid/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: go - -go: - - 1.4.3 - - 1.5.3 - - tip - -script: - - go test -v ./... diff --git a/vendor/github.com/google/uuid/CHANGELOG.md b/vendor/github.com/google/uuid/CHANGELOG.md new file mode 100644 index 0000000000..2bd78667af --- /dev/null +++ b/vendor/github.com/google/uuid/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +## [1.3.1](https://github.com/google/uuid/compare/v1.3.0...v1.3.1) (2023-08-18) + + +### Bug Fixes + +* Use .EqualFold() to parse urn prefixed UUIDs ([#118](https://github.com/google/uuid/issues/118)) ([574e687](https://github.com/google/uuid/commit/574e6874943741fb99d41764c705173ada5293f0)) + +## Changelog diff --git a/vendor/github.com/google/uuid/CONTRIBUTING.md b/vendor/github.com/google/uuid/CONTRIBUTING.md index 04fdf09f13..5566888726 100644 --- a/vendor/github.com/google/uuid/CONTRIBUTING.md +++ b/vendor/github.com/google/uuid/CONTRIBUTING.md @@ -2,6 +2,22 @@ We definitely welcome patches and contribution to this project! +### Tips + +Commits must be formatted according to the [Conventional Commits Specification](https://www.conventionalcommits.org). + +Always try to include a test case! If it is not possible or not necessary, +please explain why in the pull request description. + +### Releasing + +Commits that would precipitate a SemVer change, as desrcibed in the Conventional +Commits Specification, will trigger [`release-please`](https://github.com/google-github-actions/release-please-action) +to create a release candidate pull request. Once submitted, `release-please` +will create a release. + +For tips on how to work with `release-please`, see its documentation. + ### Legal requirements In order to protect both you and ourselves, you will need to sign the diff --git a/vendor/github.com/google/uuid/README.md b/vendor/github.com/google/uuid/README.md index f765a46f91..3e9a61889d 100644 --- a/vendor/github.com/google/uuid/README.md +++ b/vendor/github.com/google/uuid/README.md @@ -1,6 +1,6 @@ -# uuid ![build status](https://travis-ci.org/google/uuid.svg?branch=master) +# uuid The uuid package generates and inspects UUIDs based on -[RFC 4122](http://tools.ietf.org/html/rfc4122) +[RFC 4122](https://datatracker.ietf.org/doc/html/rfc4122) and DCE 1.1: Authentication and Security Services. This package is based on the github.com/pborman/uuid package (previously named @@ -9,10 +9,12 @@ a UUID is a 16 byte array rather than a byte slice. One loss due to this change is the ability to represent an invalid UUID (vs a NIL UUID). ###### Install -`go get github.com/google/uuid` +```sh +go get github.com/google/uuid +``` ###### Documentation -[![GoDoc](https://godoc.org/github.com/google/uuid?status.svg)](http://godoc.org/github.com/google/uuid) +[![Go Reference](https://pkg.go.dev/badge/github.com/google/uuid.svg)](https://pkg.go.dev/github.com/google/uuid) Full `go doc` style documentation for the package can be viewed online without installing this package by using the GoDoc site here: diff --git a/vendor/github.com/google/uuid/node_js.go b/vendor/github.com/google/uuid/node_js.go index 24b78edc90..b2a0bc8711 100644 --- a/vendor/github.com/google/uuid/node_js.go +++ b/vendor/github.com/google/uuid/node_js.go @@ -7,6 +7,6 @@ package uuid // getHardwareInterface returns nil values for the JS version of the code. -// This remvoves the "net" dependency, because it is not used in the browser. +// This removes the "net" dependency, because it is not used in the browser. // Using the "net" library inflates the size of the transpiled JS code by 673k bytes. func getHardwareInterface(name string) (string, []byte) { return "", nil } diff --git a/vendor/github.com/google/uuid/uuid.go b/vendor/github.com/google/uuid/uuid.go index a57207aeb6..a56138cc4b 100644 --- a/vendor/github.com/google/uuid/uuid.go +++ b/vendor/github.com/google/uuid/uuid.go @@ -69,7 +69,7 @@ func Parse(s string) (UUID, error) { // urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx case 36 + 9: - if strings.ToLower(s[:9]) != "urn:uuid:" { + if !strings.EqualFold(s[:9], "urn:uuid:") { return uuid, fmt.Errorf("invalid urn prefix: %q", s[:9]) } s = s[9:] @@ -101,7 +101,8 @@ func Parse(s string) (UUID, error) { 9, 11, 14, 16, 19, 21, - 24, 26, 28, 30, 32, 34} { + 24, 26, 28, 30, 32, 34, + } { v, ok := xtob(s[x], s[x+1]) if !ok { return uuid, errors.New("invalid UUID format") @@ -117,7 +118,7 @@ func ParseBytes(b []byte) (UUID, error) { switch len(b) { case 36: // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx case 36 + 9: // urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - if !bytes.Equal(bytes.ToLower(b[:9]), []byte("urn:uuid:")) { + if !bytes.EqualFold(b[:9], []byte("urn:uuid:")) { return uuid, fmt.Errorf("invalid urn prefix: %q", b[:9]) } b = b[9:] @@ -145,7 +146,8 @@ func ParseBytes(b []byte) (UUID, error) { 9, 11, 14, 16, 19, 21, - 24, 26, 28, 30, 32, 34} { + 24, 26, 28, 30, 32, 34, + } { v, ok := xtob(b[x], b[x+1]) if !ok { return uuid, errors.New("invalid UUID format") diff --git a/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go b/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go index a411d542c6..0d7823b3cd 100644 --- a/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go +++ b/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go @@ -1,6 +1,7 @@ package jsonpatch import ( + "bytes" "encoding/json" "fmt" "reflect" @@ -64,6 +65,9 @@ func NewOperation(op, path string, value interface{}) Operation { // // An error will be returned if any of the two documents are invalid. func CreatePatch(a, b []byte) ([]Operation, error) { + if bytes.Equal(a, b) { + return []Operation{}, nil + } var aI interface{} var bI interface{} err := json.Unmarshal(a, &aI) diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go index ebe569271e..9bc846e89e 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go @@ -74,16 +74,14 @@ func (bs *BrokerStatus) GetTopLevelCondition() *apis.Condition { // SetAddress makes this Broker addressable by setting the URI. It also // sets the BrokerConditionAddressable to true. -func (bs *BrokerStatus) SetAddress(url *apis.URL) { +func (bs *BrokerStatus) SetAddress(address *v1.Addressable) { bs.AddressStatus = v1.AddressStatus{ - Address: &v1.Addressable{ - URL: url, - }, + Address: address, } - if url != nil { + if address != nil && address.URL != nil { bs.GetConditionSet().Manage(bs).MarkTrue(BrokerConditionAddressable) - bs.AddressStatus.Address.Name = &url.Scheme + bs.AddressStatus.Address.Name = &address.URL.Scheme } else { bs.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionAddressable, "nil URL", "URL is nil") } diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go index 80b2510009..31c2c51c87 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go @@ -61,7 +61,9 @@ func (t testHelper) ReadyBrokerStatus() *BrokerStatus { bs.PropagateIngressAvailability(t.AvailableEndpoints()) bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus()) bs.PropagateFilterAvailability(t.AvailableEndpoints()) - bs.SetAddress(apis.HTTP("example.com")) + bs.SetAddress(&duckv1.Addressable{ + URL: apis.HTTP("example.com"), + }) bs.MarkDeadLetterSinkResolvedSucceeded(eventingduckv1.DeliveryStatus{}) return bs } @@ -71,7 +73,9 @@ func (t testHelper) ReadyBrokerStatusWithoutDLS() *BrokerStatus { bs.PropagateIngressAvailability(t.AvailableEndpoints()) bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus()) bs.PropagateFilterAvailability(t.AvailableEndpoints()) - bs.SetAddress(apis.HTTP("example.com")) + bs.SetAddress(&duckv1.Addressable{ + URL: apis.HTTP("example.com"), + }) bs.MarkDeadLetterSinkNotConfigured() return bs } diff --git a/vendor/knative.dev/hack/hack.go b/vendor/knative.dev/hack/embed.go similarity index 74% rename from vendor/knative.dev/hack/hack.go rename to vendor/knative.dev/hack/embed.go index 25603fc68e..4e39c21a30 100644 --- a/vendor/knative.dev/hack/hack.go +++ b/vendor/knative.dev/hack/embed.go @@ -1,8 +1,5 @@ -//go:build hack -// +build hack - /* -Copyright 2020 The Knative Authors +Copyright 2022 The Knative Authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -// package hack is a collection of scripts used to bootstrap CI processes and -// other vital entrypoint functionality. - package hack + +import "embed" + +//go:embed *.sh +var Scripts embed.FS diff --git a/vendor/knative.dev/hack/go.work b/vendor/knative.dev/hack/go.work index d9a0de87fd..b6265ad9e2 100644 --- a/vendor/knative.dev/hack/go.work +++ b/vendor/knative.dev/hack/go.work @@ -4,4 +4,5 @@ use ( . schema test + test/vendorproj ) diff --git a/vendor/knative.dev/hack/go.work.sum b/vendor/knative.dev/hack/go.work.sum index cd1e58259c..d709822f8c 100644 --- a/vendor/knative.dev/hack/go.work.sum +++ b/vendor/knative.dev/hack/go.work.sum @@ -1,12 +1,2 @@ -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -k8s.io/apimachinery v0.20.6 h1:R5p3SlhaABYShQSO6LpPsYHjV05Q+79eBUR0Ut/f4tk= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU= -sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= diff --git a/vendor/knative.dev/hack/infra-library.sh b/vendor/knative.dev/hack/infra-library.sh index 4782d09a4c..adc37efe3e 100644 --- a/vendor/knative.dev/hack/infra-library.sh +++ b/vendor/knative.dev/hack/infra-library.sh @@ -157,7 +157,7 @@ function create_gke_test_cluster() { --v=1 \ --network=e2e-network \ --boskos-acquire-timeout-seconds=1200 \ - --region="${E2E_CLUSTER_REGION},us-east1,us-west1" \ + --region="${E2E_CLUSTER_REGION:-us-central1},us-east1,us-west1" \ --gcloud-extra-flags="${_extra_gcloud_flags[*]}" \ --retryable-error-patterns='.*does not have enough resources available to fulfill.*,.*only \\d+ nodes out of \\d+ have registered; this is likely due to Nodes failing to start correctly.*,.*All cluster resources were brought up.+ but: component .+ from endpoint .+ is unhealthy.*' \ --test=exec \ diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 5eab6a8d24..a5490e0842 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -718,18 +718,23 @@ function __go_update_deps_for_module() { fi fi - group "Go mod tidy and vendor" + group "Go mod tidy" # Prune modules. - local orig_pipefail_opt=$(shopt -p -o pipefail) + local orig_pipefail_opt + orig_pipefail_opt=$(shopt -p -o pipefail) set -o pipefail go mod tidy 2>&1 | grep -v "ignoring symlink" || true - go mod vendor 2>&1 | grep -v "ignoring symlink" || true + if [[ "${FORCE_VENDOR:-false}" == "true" ]] || [ -d vendor ]; then + group "Go mod vendor" + go mod vendor 2>&1 | grep -v "ignoring symlink" || true + fi eval "$orig_pipefail_opt" - if ! [ -d vendor ]; then + if ! [[ "${FORCE_VENDOR:-false}" == "true" ]] && ! [ -d vendor ]; then return 0 fi + group "Removing unwanted vendor files" # Remove unwanted vendor files diff --git a/vendor/knative.dev/networking/pkg/config/config.go b/vendor/knative.dev/networking/pkg/config/config.go index a4534fc51d..f27c7865e4 100644 --- a/vendor/knative.dev/networking/pkg/config/config.go +++ b/vendor/knative.dev/networking/pkg/config/config.go @@ -134,7 +134,7 @@ const ( // hostname for a Route's tag. TagTemplateKey = "tag-template" - // InternalEncryptionKey is deprecated and replaced by InternalDataplaneTrustKey and internal-controlplane-trust + // InternalEncryptionKey is deprecated and replaced by InternalDataplaneTrustKey and ControlplaneTrustKey. // InternalEncryptionKey is the name of the configuration whether // internal traffic is encrypted or not. InternalEncryptionKey = "internal-encryption" @@ -445,9 +445,17 @@ func NewConfigFromMap(data map[string]string) (*Config, error) { return nc, nil } -// InternalTLSEnabled returns whether or not dataplane-trust is disabled +// InternalTLSEnabled returns whether or not InternalEncyrption is enabled. +// Currently only DataplaneTrust is considered. func (c *Config) InternalTLSEnabled() bool { - return c.DataplaneTrust != TrustDisabled + return tlsEnabled(c.DataplaneTrust) +} + +func tlsEnabled(trust Trust) bool { + return trust == TrustMinimal || + trust == TrustEnabled || + trust == TrustMutual || + trust == TrustIdentity } // GetDomainTemplate returns the golang Template from the config map diff --git a/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go b/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go index bdcb994fac..a855c38571 100644 --- a/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go @@ -48,6 +48,10 @@ type Addressable struct { // according to https://www.rfc-editor.org/rfc/rfc7468. // +optional CACerts *string `json:"CACerts,omitempty"` + + // Audience is the OIDC audience for this address. + // +optional + Audience *string `json:"audience,omitempty"` } var ( diff --git a/vendor/knative.dev/pkg/apis/duck/v1/destination.go b/vendor/knative.dev/pkg/apis/duck/v1/destination.go index 8e067a99b5..720d406776 100644 --- a/vendor/knative.dev/pkg/apis/duck/v1/destination.go +++ b/vendor/knative.dev/pkg/apis/duck/v1/destination.go @@ -40,6 +40,14 @@ type Destination struct { // by the Addressable target, if any. // +optional CACerts *string `json:"CACerts,omitempty"` + + // Audience is the OIDC audience. + // This need only be set, if the target is not an Addressable + // and thus the Audience can't be received from the Addressable itself. + // In case the Addressable specifies an Audience too, the Destinations + // Audience takes preference. + // +optional + Audience *string `json:"audience,omitempty"` } // Validate the Destination has all the necessary fields and check the diff --git a/vendor/knative.dev/pkg/apis/duck/v1/zz_generated.deepcopy.go b/vendor/knative.dev/pkg/apis/duck/v1/zz_generated.deepcopy.go index 744a38bb08..46cc838574 100644 --- a/vendor/knative.dev/pkg/apis/duck/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/pkg/apis/duck/v1/zz_generated.deepcopy.go @@ -72,6 +72,11 @@ func (in *Addressable) DeepCopyInto(out *Addressable) { *out = new(string) **out = **in } + if in.Audience != nil { + in, out := &in.Audience, &out.Audience + *out = new(string) + **out = **in + } return } @@ -361,6 +366,11 @@ func (in *Destination) DeepCopyInto(out *Destination) { *out = new(string) **out = **in } + if in.Audience != nil { + in, out := &in.Audience, &out.Audience + *out = new(string) + **out = **in + } return } diff --git a/vendor/knative.dev/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh index d432f659cb..3d0945344f 100644 --- a/vendor/knative.dev/pkg/hack/update-codegen.sh +++ b/vendor/knative.dev/pkg/hack/update-codegen.sh @@ -51,7 +51,7 @@ EXTERNAL_INFORMER_PKG="k8s.io/client-go/informers" \ k8s.io/api \ "${K8S_TYPES}" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \ - --force-genreconciler-kinds "Namespace,ConfigMap,Deployment,Secret,Pod,CronJob,NetworkPolicy,Node,ValidatingWebhookConfiguration,MutatingWebhookConfiguration" + --force-genreconciler-kinds "Namespace,ConfigMap,Deployment,Secret,Pod,CronJob,NetworkPolicy,Node,ValidatingWebhookConfiguration,MutatingWebhookConfiguration,ServiceAccount" OUTPUT_PKG="knative.dev/pkg/client/injection/apiextensions" \ VERSIONED_CLIENTSET_PKG="k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" \ diff --git a/vendor/knative.dev/serving/AUTHORS b/vendor/knative.dev/serving/AUTHORS deleted file mode 100644 index f42714c4ec..0000000000 --- a/vendor/knative.dev/serving/AUTHORS +++ /dev/null @@ -1,11 +0,0 @@ -# This is the list of Knative authors for copyright purposes. -# -# This does not necessarily list everyone who has contributed code, since in -# some cases, their employer may be the copyright holder. To see the full list -# of contributors, see the revision history in source control. -Google LLC -Pivotal Software, Inc. -IBM Corp -Red Hat, Inc. -Cisco Systems, Inc. -VMware, Inc. diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go b/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go index ba2908cd19..fe2a43223b 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go @@ -193,7 +193,7 @@ const ( // AutoTLSNotEnabledMessage is the message which is set on the // RouteConditionCertificateProvisioned condition when it is set to True // because AutoTLS was not enabled. - AutoTLSNotEnabledMessage = "autoTLS is not enabled" + AutoTLSNotEnabledMessage = "auto-tls is not enabled" // TLSNotEnabledForClusterLocalMessage is the message which is set on the // RouteConditionCertificateProvisioned condition when it is set to True @@ -202,7 +202,7 @@ const ( ) // MarkTLSNotEnabled sets RouteConditionCertificateProvisioned to true when -// certificate config such as autoTLS is not enabled or private cluster-local service. +// certificate config such as auto-tls is not enabled or private cluster-local service. func (rs *RouteStatus) MarkTLSNotEnabled(msg string) { routeCondSet.Manage(rs).MarkTrueWithReason(RouteConditionCertificateProvisioned, "TLSNotEnabled", msg) diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go b/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go index 80fed9d336..830a65c964 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go @@ -62,7 +62,7 @@ const ( // AutoTLSNotEnabledMessage is the message which is set on the // DomainMappingConditionCertificateProvisioned condition when it is set to True // because AutoTLS was not enabled. - AutoTLSNotEnabledMessage = "autoTLS is not enabled" + AutoTLSNotEnabledMessage = "auto-tls is not enabled" // TLSCertificateProvidedExternally indicates that a TLS secret won't be created or managed // instead a reference to an existing TLS secret should have been provided in the DomainMapping spec TLSCertificateProvidedExternally = "TLS certificate was provided externally" diff --git a/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh b/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh index c8f3f1c874..143976a80e 100644 --- a/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh +++ b/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh @@ -67,15 +67,15 @@ function setup_auto_tls_common() { setup_custom_domain - toggle_feature autoTLS Enabled config-network - toggle_feature autocreateClusterDomainClaims true config-network + toggle_feature auto-tls Enabled config-network + toggle_feature autocreate-cluster-domain-claims true config-network } function cleanup_auto_tls_common() { cleanup_custom_domain - toggle_feature autoTLS Disabled config-network - toggle_feature autocreateClusterDomainClaims false config-network + toggle_feature auto-tls Disabled config-network + toggle_feature autocreate-cluster-domain-claims false config-network toggle_feature namespace-wildcard-cert-selector "" config-network kubectl delete kcert --all -n "${TLS_TEST_NAMESPACE}" } diff --git a/vendor/knative.dev/serving/test/e2e-common.sh b/vendor/knative.dev/serving/test/e2e-common.sh index 242d984b69..4054ff6a64 100644 --- a/vendor/knative.dev/serving/test/e2e-common.sh +++ b/vendor/knative.dev/serving/test/e2e-common.sh @@ -19,44 +19,44 @@ source "$(dirname "${BASH_SOURCE[0]}")/../vendor/knative.dev/hack/e2e-tests.sh" source "$(dirname "${BASH_SOURCE[0]}")/e2e-networking-library.sh" -export CERT_MANAGER_VERSION="latest" +export CERT_MANAGER_VERSION=${CERT_MANAGER_VERSION:-"latest"} # Since default is istio, make default ingress as istio 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="" +export ISTIO_VERSION=${ISTIO_VERSION:-"latest"} +export KOURIER_VERSION=${KOURIER_VERSION:-""} +export CONTOUR_VERSION=${CONTOUR_VERSION:-""} +export GATEWAY_API_VERSION=${GATEWAY_API_VERSION:-""} +export CERTIFICATE_CLASS=${CERTIFICATE_CLASS:-""} # Only build linux/amd64 bit images export KO_FLAGS="${KO_FLAGS:---platform=linux/amd64}" -export RUN_HTTP01_AUTO_TLS_TESTS=0 -export HTTPS=0 -export SHORT=0 -export ENABLE_HA=0 +export RUN_HTTP01_AUTO_TLS_TESTS=${RUN_HTTP01_AUTO_TLS_TESTS:-0} +export HTTPS=${HTTPS:-0} +export SHORT=${SHORT:-0} +export ENABLE_HA=${ENABLE_HA:-0} export ENABLE_TLS=${ENABLE_TLS:-0} -export MESH=0 +export MESH=${MESH:-0} export AMBIENT=${AMBIENT:-0} -export PERF=0 +export PERF=${PERF:-0} export KIND=${KIND:-0} export CLUSTER_DOMAIN=${CLUSTER_DOMAIN:-cluster.local} # List of custom YAMLs to install, if specified (space-separated). -export INSTALL_CUSTOM_YAMLS="" -export INSTALL_SERVING_VERSION="HEAD" -export INSTALL_ISTIO_VERSION="HEAD" +export INSTALL_CUSTOM_YAMLS=${INSTALL_CUSTOM_YAMLS:-""} +export INSTALL_SERVING_VERSION=${INSTALL_SERVING_VERSION:-"HEAD"} +export INSTALL_ISTIO_VERSION=${INSTALL_ISTIO_VERSION:-"HEAD"} export YTT_FILES=() export TMP_DIR="${TMP_DIR:-$(mktemp -d -t ci-$(date +%Y-%m-%d-%H-%M-%S)-XXXXXXXXXX)}" -readonly E2E_YAML_DIR="${TMP_DIR}/e2e-yaml" +readonly E2E_YAML_DIR=${E2E_YAML_DIR:-"${TMP_DIR}/e2e-yaml"} # This the namespace used to install Knative Serving. Use generated UUID as namespace. export SYSTEM_NAMESPACE="${SYSTEM_NAMESPACE:-$(uuidgen | tr 'A-Z' 'a-z')}" # Keep this in sync with test/ha/ha.go -readonly REPLICAS=3 -readonly BUCKETS=10 +readonly REPLICAS=${REPLICAS:-3} +readonly BUCKETS=${BUCKETS:-10} export PVC=${PVC:-1} export QUOTA=${QUOTA:-1} @@ -385,7 +385,7 @@ function install() { if (( ENABLE_TLS )); then echo "Patch to config-network to enable internal encryption" - toggle_feature internal-encryption true config-network + toggle_feature dataplane-trust minimal config-network if [[ "$INGRESS_CLASS" == "kourier.ingress.networking.knative.dev" ]]; then echo "Point Kourier local gateway to custom server certificates" toggle_feature cluster-cert-secret server-certs config-kourier diff --git a/vendor/knative.dev/serving/test/e2e-tests.sh b/vendor/knative.dev/serving/test/e2e-tests.sh index e534ffef6b..9966af0c13 100644 --- a/vendor/knative.dev/serving/test/e2e-tests.sh +++ b/vendor/knative.dev/serving/test/e2e-tests.sh @@ -36,69 +36,59 @@ header "Running tests" failed=0 # Run tests serially in the mesh and https scenarios. -parallelism="" -use_https="" -if (( MESH )); then - parallelism="-parallel 1" +GO_TEST_FLAGS="" +E2E_TEST_FLAGS="${TEST_OPTIONS}" + +if [ -z "${E2E_TEST_FLAGS}" ]; then + E2E_TEST_FLAGS="-resolvabledomain=$(use_resolvable_domain) -ingress-class=${INGRESS_CLASS}" + + # Drop testing alpha and beta features with the Gateway API + if [[ "${INGRESS_CLASS}" != *"gateway-api"* ]]; then + E2E_TEST_FLAGS+=" -enable-alpha -enable-beta" + fi fi if (( HTTPS )); then - use_https="--https" - toggle_feature autoTLS Enabled config-network + E2E_TEST_FLAGS+=" -https" + toggle_feature auto-tls Enabled config-network kubectl apply -f "${E2E_YAML_DIR}"/test/config/autotls/certmanager/caissuer/ add_trap "kubectl delete -f ${E2E_YAML_DIR}/test/config/autotls/certmanager/caissuer/ --ignore-not-found" SIGKILL SIGTERM SIGQUIT fi -# Run conformance and e2e tests. - -# Currently only Istio, Contour and Kourier implement the alpha features. -alpha="" -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 - alpha="--enable-alpha" -fi - -# 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" +if (( MESH )); then + GO_TEST_FLAGS+=" -parallel 1" fi -TEST_OPTIONS="${TEST_OPTIONS:-${alpha} ${beta} --resolvabledomain=$(use_resolvable_domain) ${use_https} --ingress-class=${INGRESS_CLASS}}" if (( SHORT )); then - TEST_OPTIONS+=" -short" + GO_TEST_FLAGS+=" -short" fi -toggle_feature autocreateClusterDomainClaims true config-network || fail_test + +toggle_feature autocreate-cluster-domain-claims true config-network || fail_test go_test_e2e -timeout=30m \ + ${GO_TEST_FLAGS} \ ./test/conformance/api/... \ ./test/conformance/runtime/... \ ./test/e2e \ - "${parallelism}" \ - ${TEST_OPTIONS} || failed=1 -toggle_feature autocreateClusterDomainClaims false config-network || fail_test + ${E2E_TEST_FLAGS} || failed=1 +toggle_feature autocreate-cluster-domain-claims false config-network || fail_test toggle_feature tag-header-based-routing Enabled -go_test_e2e -timeout=2m ./test/e2e/tagheader ${TEST_OPTIONS} || failed=1 +go_test_e2e -timeout=2m ./test/e2e/tagheader ${E2E_TEST_FLAGS} || failed=1 toggle_feature tag-header-based-routing Disabled toggle_feature allow-zero-initial-scale true config-autoscaler || fail_test -go_test_e2e -timeout=2m ./test/e2e/initscale ${TEST_OPTIONS} || failed=1 +go_test_e2e -timeout=2m ./test/e2e/initscale ${E2E_TEST_FLAGS} || failed=1 toggle_feature allow-zero-initial-scale false config-autoscaler || fail_test -toggle_feature autocreateClusterDomainClaims true config-network || fail_test -go_test_e2e -timeout=2m ./test/e2e/domainmapping ${TEST_OPTIONS} || failed=1 -toggle_feature autocreateClusterDomainClaims false config-network || fail_test +toggle_feature autocreate-cluster-domain-claims true config-network || fail_test +go_test_e2e -timeout=2m ./test/e2e/domainmapping ${E2E_TEST_FLAGS} || failed=1 +toggle_feature autocreate-cluster-domain-claims false config-network || fail_test kubectl get cm "config-gc" -n "${SYSTEM_NAMESPACE}" -o yaml > "${TMP_DIR}"/config-gc.yaml add_trap "kubectl replace cm 'config-gc' -n ${SYSTEM_NAMESPACE} -f ${TMP_DIR}/config-gc.yaml" SIGKILL SIGTERM SIGQUIT immediate_gc -go_test_e2e -timeout=2m ./test/e2e/gc ${TEST_OPTIONS} || failed=1 +go_test_e2e -timeout=2m ./test/e2e/gc ${E2E_TEST_FLAGS} || failed=1 kubectl replace cm "config-gc" -n ${SYSTEM_NAMESPACE} -f "${TMP_DIR}"/config-gc.yaml # Run scale tests. @@ -106,44 +96,44 @@ kubectl replace cm "config-gc" -n ${SYSTEM_NAMESPACE} -f "${TMP_DIR}"/config-gc. # sub-test. If this is not larger than the maximum scale tested then the test # simply cannot pass. # TODO - Renable once we get this reliably passing on GKE 1.21 -# go_test_e2e -timeout=20m -parallel=300 ./test/scale ${TEST_OPTIONS} || failed=1 +# go_test_e2e -timeout=20m -parallel=300 ./test/scale ${E2E_TEST_FLAGS} || failed=1 # Run HPA tests -go_test_e2e -timeout=30m -tags=hpa ./test/e2e ${TEST_OPTIONS} || failed=1 +go_test_e2e -timeout=30m -tags=hpa ./test/e2e ${E2E_TEST_FLAGS} || failed=1 # Run initContainers tests with alpha enabled avoiding any issues with the testing options guard above # InitContainers test uses emptyDir. toggle_feature kubernetes.podspec-init-containers Enabled -go_test_e2e -timeout=2m ./test/e2e/initcontainers ${TEST_OPTIONS} || failed=1 +go_test_e2e -timeout=2m ./test/e2e/initcontainers ${E2E_TEST_FLAGS} || failed=1 toggle_feature kubernetes.podspec-init-containers 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 +go_test_e2e -timeout=5m ./test/e2e/pvc ${E2E_TEST_FLAGS} || 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 secure pod defaults test in a separate install. toggle_feature secure-pod-defaults Enabled -go_test_e2e -timeout=3m ./test/e2e/securedefaults ${TEST_OPTIONS} || failed=1 +go_test_e2e -timeout=3m ./test/e2e/securedefaults ${E2E_TEST_FLAGS} || failed=1 toggle_feature secure-pod-defaults 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 +toggle_feature autocreate-cluster-domain-claims true config-network || fail_test go_test_e2e -timeout=25m -failfast -parallel=1 ./test/ha \ - ${TEST_OPTIONS} \ + ${E2E_TEST_FLAGS} \ -replicas="${REPLICAS:-1}" \ -buckets="${BUCKETS:-1}" \ -spoofinterval="10ms" || failed=1 -toggle_feature autocreateClusterDomainClaims false config-network || fail_test +toggle_feature autocreate-cluster-domain-claims false config-network || fail_test if (( HTTPS )); then kubectl delete -f ${E2E_YAML_DIR}/test/config/autotls/certmanager/caissuer/ --ignore-not-found - toggle_feature autoTLS Disabled config-network + toggle_feature auto-tls Disabled config-network fi (( failed )) && fail_test diff --git a/vendor/modules.txt b/vendor/modules.txt index c406507fba..8283a2496a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -78,7 +78,7 @@ github.com/go-kit/log/level # github.com/go-logfmt/logfmt v0.5.1 ## explicit; go 1.17 github.com/go-logfmt/logfmt -# github.com/go-logr/logr v1.2.3 +# github.com/go-logr/logr v1.2.4 ## explicit; go 1.16 github.com/go-logr/logr # github.com/go-openapi/jsonpointer v0.19.5 @@ -134,7 +134,7 @@ github.com/google/gofuzz/bytesource # github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 ## explicit; go 1.13 github.com/google/shlex -# github.com/google/uuid v1.3.0 +# github.com/google/uuid v1.3.1 ## explicit github.com/google/uuid # github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 @@ -211,7 +211,7 @@ github.com/munnerz/goautoneg # github.com/opencontainers/go-digest v1.0.0 ## explicit; go 1.13 github.com/opencontainers/go-digest -# github.com/openzipkin/zipkin-go v0.4.1 +# github.com/openzipkin/zipkin-go v0.4.2 ## explicit; go 1.18 github.com/openzipkin/zipkin-go/model # github.com/pelletier/go-toml/v2 v2.0.9 @@ -406,7 +406,7 @@ golang.org/x/tools/internal/gocommand golang.org/x/tools/internal/gopathwalk golang.org/x/tools/internal/imports golang.org/x/tools/internal/typeparams -# gomodules.xyz/jsonpatch/v2 v2.3.0 +# gomodules.xyz/jsonpatch/v2 v2.4.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2 # google.golang.org/api v0.138.0 @@ -938,10 +938,10 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b +# knative.dev/client-pkg v0.0.0-20230911133121-2bcbd97b17ec ## explicit; go 1.18 knative.dev/client-pkg/pkg/kn/plugin -# knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d +# knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d ## explicit; go 1.19 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -970,10 +970,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-20230818155117-9cc05a31e8c0 +# knative.dev/hack v0.0.0-20230911131120-3af329f73ff3 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e +# knative.dev/networking v0.0.0-20230911132222-48042038ea3d ## explicit; go 1.18 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -988,7 +988,7 @@ knative.dev/networking/pkg/http/probe knative.dev/networking/pkg/http/proxy knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/k8s -# knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 +# knative.dev/pkg v0.0.0-20230911130819-09df2b681efd ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1038,7 +1038,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.38.1-0.20230823024257-eaff0b39b99e +# knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1