From 946f160491bb996e7613457619bb60d6d1d73ecb Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 4 Jun 2024 10:03:45 -0400 Subject: [PATCH] upgrade to latest dependencies (#529) bumping google.golang.org/genproto/googleapis/api b8a5c65...0867130: > 0867130 chore(all): auto-regenerate .pb.go files (# 1125) > 024948a chore(all): update all (# 1126) > 6275950 chore(all): auto-regenerate .pb.go files (# 1124) bumping google.golang.org/api 4b79cc4...b49e3b9: > b49e3b9 chore(main): release 0.182.0 (# 2591) > b6f615b chore(all): update all (# 2607) > c4c51ce feat(all): auto-regenerate discovery clients (# 2609) > 0e58f74 feat(all): auto-regenerate discovery clients (# 2608) > ceaeabf feat(all): auto-regenerate discovery clients (# 2606) > f474c8f feat(all): auto-regenerate discovery clients (# 2604) > ece7727 feat(all): auto-regenerate discovery clients (# 2603) > a86c4b6 feat(all): auto-regenerate discovery clients (# 2602) > 2e7cc39 feat(all): auto-regenerate discovery clients (# 2600) > 677f53d feat(all): auto-regenerate discovery clients (# 2599) > 7d46b4d feat(all): auto-regenerate discovery clients (# 2597) > 07e7104 feat(all): auto-regenerate discovery clients (# 2595) > 21295a5 feat(all): auto-regenerate discovery clients (# 2594) > e95bd57 feat(all): auto-regenerate discovery clients (# 2590) bumping knative.dev/eventing a58c135...3ee2400: > 3ee2400 fix: sequence updates subscription where possible, instead of recreating it (# 7948) > 96e0f09 Bump rekt to main (# 7958) > e3604b8 [main] Upgrade to latest dependencies (# 7957) > 08b0813 [main] Upgrade to latest dependencies (# 7956) > c53b44d [main] Format Go code (# 7953) bumping knative.dev/pkg 7d52a43...fce44ea: > fce44ea Maybe fix controller ha (# 3046) > 1709961 Bump google.golang.org/api from 0.181.0 to 0.182.0 (# 3048) > 229e527 fix: downstream tests assume release branch was cut (# 3047) bumping google.golang.org/genproto/googleapis/rpc 0867130...d264139: > d264139 chore(all): update all (# 1128) > dc85e6b chore(all): auto-regenerate .pb.go files (# 1129) > fc5f0ca chore: min Go version to 1.20 (# 1127) bumping knative.dev/serving 0ddd15e...bb51203: > bb51203 upgrade to latest dependencies (# 15297) > 2fd8465 [Automated] Update net-gateway-api nightly (# 15292) > 8cf5aba Set controller reconcillers to the correct number in tests (# 15290) > 92c6a63 upgrade to latest dependencies (# 15294) > d1781c5 Update net-contour nightly (# 15291) > 4538823 if revision is inactive, scale to zero instead of waiting for last pod retention (# 15161) > b0dfed2 Update net-istio nightly (# 15287) bumping knative.dev/networking 1b470c4...41aa208: > 41aa208 upgrade to latest dependencies (# 987) Signed-off-by: Knative Automation --- go.mod | 14 +++++----- go.sum | 28 +++++++++---------- .../googleapis/api/httpbody/httpbody.pb.go | 4 +-- .../serving/pkg/networking/util.go | 6 ++++ vendor/modules.txt | 16 +++++------ 5 files changed, 37 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index 6dce8b3b3..25180e1fc 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( k8s.io/api v0.29.2 k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 - knative.dev/eventing v0.41.1-0.20240530202412-a58c1352db05 + knative.dev/eventing v0.41.1-0.20240603163018-3ee2400189c1 knative.dev/hack v0.0.0-20240529131459-3b6d6441e7ea - knative.dev/pkg v0.0.0-20240529181700-7d52a43448b2 - knative.dev/serving v0.41.1-0.20240531084853-0ddd15e2ba1a + knative.dev/pkg v0.0.0-20240603145758-fce44ead15bd + knative.dev/serving v0.41.1-0.20240604061953-bb512037075c ) require ( @@ -88,9 +88,9 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/api v0.181.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect + google.golang.org/api v0.182.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -102,7 +102,7 @@ require ( k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect - knative.dev/networking v0.0.0-20240530052748-1b470c4f662c // indirect + knative.dev/networking v0.0.0-20240603133819-41aa2087242d // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index 808d2d7ba..67dd5c828 100644 --- a/go.sum +++ b/go.sum @@ -597,8 +597,8 @@ google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.181.0 h1:rPdjwnWgiPPOJx3IcSAQ2III5aX5tCer6wMpa/xmZi4= -google.golang.org/api v0.181.0/go.mod h1:MnQ+M0CFsfUwA5beZ+g/vCBCPXvtmZwRz2qzZk8ih1k= +google.golang.org/api v0.182.0 h1:if5fPvudRQ78GeRx3RayIoiuV7modtErPIZC/T2bIvE= +google.golang.org/api v0.182.0/go.mod h1:cGhjy4caqA5yXRzEhkHI8Y9mfyC2VLTlER2l08xaqtM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -636,10 +636,10 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae h1:AH34z6WAGVNkllnKs5raNq3yRq93VnjBG6rpfub/jYk= -google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae/go.mod h1:FfiGhwUm6CJviekPrc0oJ+7h29e+DmWU6UtjX0ZvI7Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 h1:mxSlqyb8ZAHsYDCfiXN1EDdNTdvjUJSLY+OnAUtYNYA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= +google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 h1:W5Xj/70xIA4x60O/IFyXivR5MGqblAb8R3w26pnD6No= +google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.mod h1:vPrPUTsDCYxXWjP7clS81mZ6/803D8K4iM9Ma27VKas= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e h1:Elxv5MwEkCI9f5SkoL6afed6NTdxaGoAo39eANBwHL8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -721,16 +721,16 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.41.1-0.20240530202412-a58c1352db05 h1:OltA5F33cPH/q88XGlqUn6Ip2p2QgTSm0SJ2cNDqXzU= -knative.dev/eventing v0.41.1-0.20240530202412-a58c1352db05/go.mod h1:toAuiWQiMPHgWcXNYocPhMNx8xYFbjQsupEiQdPT83o= +knative.dev/eventing v0.41.1-0.20240603163018-3ee2400189c1 h1:udSFPuiXYxyRErU4hs7EJ2G6MmR+OW1uKbniILcIkJQ= +knative.dev/eventing v0.41.1-0.20240603163018-3ee2400189c1/go.mod h1:FO0xttJnXLgKrAGdkEvEqL7hBpmnUKGu2wMqKUC4p78= knative.dev/hack v0.0.0-20240529131459-3b6d6441e7ea h1:iWW6SNMrVd2hI5Y+ltKIEzXVedoQLL86b23dS5fkvXs= knative.dev/hack v0.0.0-20240529131459-3b6d6441e7ea/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20240530052748-1b470c4f662c h1:YeufB6la68PjSPO8xoVnVEkqIRNfLlh9DN5SmdWHRVA= -knative.dev/networking v0.0.0-20240530052748-1b470c4f662c/go.mod h1:wJvCa9TRBYi+Wrdh8fgmVeWPuwdxtCfWnnKwXVg9h1M= -knative.dev/pkg v0.0.0-20240529181700-7d52a43448b2 h1:Q4xHp1Y4maNrCJQ1bATmW0LyXSsMG9KlyrDgdKHCNT8= -knative.dev/pkg v0.0.0-20240529181700-7d52a43448b2/go.mod h1:GHFUP1wtD/bR/c02QADqaAK3odDJh1ddBMvXhq/goy8= -knative.dev/serving v0.41.1-0.20240531084853-0ddd15e2ba1a h1:NdIf+9E9oSlz4NLFvSE5DVfiMb6GglFVhS/YoV70WAM= -knative.dev/serving v0.41.1-0.20240531084853-0ddd15e2ba1a/go.mod h1:Wh/DH5JHAH9Jdm8cHQPEWJ4hZSB2IS3nFEtAEqElBig= +knative.dev/networking v0.0.0-20240603133819-41aa2087242d h1:B0psbCJrgnQLE8fibEga8NHE04Ay6L8CctdG4a+1CaY= +knative.dev/networking v0.0.0-20240603133819-41aa2087242d/go.mod h1:WS5A291Vy2unZ1L54ZSKBkz/gVzVmIy15cCcdA6PRN4= +knative.dev/pkg v0.0.0-20240603145758-fce44ead15bd h1:SxwfJkmXwxl2PT5xZjtKKHO7URgHuigOoyzelaIGb2g= +knative.dev/pkg v0.0.0-20240603145758-fce44ead15bd/go.mod h1:E5OxJHFsQiW7pL0lVJ02XEVm2QUc0ZVdSUHiarUJHrU= +knative.dev/serving v0.41.1-0.20240604061953-bb512037075c h1:22POMSdeS1m9zn3Zo6X9gu6J8qRMbZHXgz4uVXhXVTg= +knative.dev/serving v0.41.1-0.20240604061953-bb512037075c/go.mod h1:ASoO3laJpfhnxe5ofk9SOK6Pg/rZ8JWwRilmvg0RxMA= 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/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go b/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go index 3543268f8..e7d3805e3 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.9 +// protoc v4.24.4 // source: google/api/httpbody.proto package httpbody diff --git a/vendor/knative.dev/serving/pkg/networking/util.go b/vendor/knative.dev/serving/pkg/networking/util.go index ec9707d02..643fb1b06 100644 --- a/vendor/knative.dev/serving/pkg/networking/util.go +++ b/vendor/knative.dev/serving/pkg/networking/util.go @@ -44,3 +44,9 @@ func GetHTTPOption(ctx context.Context, networkConfig *netcfg.Config, annotation return "", nil } } + +// IsNetCertManagerControllerRequired returns true if we need the netCertManagerController running +func IsNetCertManagerControllerRequired(netCfg *netcfg.Config) bool { + return netCfg.ExternalDomainTLS || netCfg.SystemInternalTLSEnabled() || (netCfg.ClusterLocalDomainTLS == netcfg.EncryptionEnabled) || + netCfg.NamespaceWildcardCertSelector != nil +} diff --git a/vendor/modules.txt b/vendor/modules.txt index a3160078b..f635d0bb7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -347,14 +347,14 @@ golang.org/x/tools/internal/stdlib # gomodules.xyz/jsonpatch/v2 v2.4.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2 -# google.golang.org/api v0.181.0 +# google.golang.org/api v0.182.0 ## explicit; go 1.20 google.golang.org/api/support/bundler -# google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae +# google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 ## explicit; go 1.19 google.golang.org/genproto/googleapis/api/httpbody -# google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 -## explicit; go 1.19 +# google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e +## explicit; go 1.20 google.golang.org/genproto/googleapis/rpc/status # google.golang.org/grpc v1.64.0 ## explicit; go 1.19 @@ -966,7 +966,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.41.1-0.20240530202412-a58c1352db05 +# knative.dev/eventing v0.41.1-0.20240603163018-3ee2400189c1 ## explicit; go 1.21 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/test @@ -1021,12 +1021,12 @@ knative.dev/eventing/pkg/observability/client # knative.dev/hack v0.0.0-20240529131459-3b6d6441e7ea ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20240530052748-1b470c4f662c +# knative.dev/networking v0.0.0-20240603133819-41aa2087242d ## explicit; go 1.21 knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 knative.dev/networking/pkg/config -# knative.dev/pkg v0.0.0-20240529181700-7d52a43448b2 +# knative.dev/pkg v0.0.0-20240603145758-fce44ead15bd ## explicit; go 1.21 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1090,7 +1090,7 @@ knative.dev/pkg/webhook/psbinding knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/serving v0.41.1-0.20240531084853-0ddd15e2ba1a +# knative.dev/serving v0.41.1-0.20240604061953-bb512037075c ## explicit; go 1.21 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1