From 0dad3b74737a80aba006c06b4b6417fe3f01afd1 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 22 Oct 2024 01:38:19 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/caching ccfb189...41bbaf9: > 41bbaf9 upgrade to latest dependencies (# 899) bumping knative.dev/pkg 4af9a0d...9b9d535: > 9b9d535 Fix `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3108) bumping knative.dev/networking a3d4663...60e29ff: > 60e29ff upgrade to latest dependencies (# 1015) Signed-off-by: Knative Automation --- go.mod | 6 +++--- go.sum | 12 ++++++------ .../knative.dev/pkg/webhook/configmaps/controller.go | 6 ++++++ .../resourcesemantics/defaulting/controller.go | 6 ++++++ .../resourcesemantics/validation/controller.go | 6 ++++++ vendor/knative.dev/pkg/webhook/webhook.go | 6 ------ vendor/modules.txt | 6 +++--- 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 937889cced12..2a8520a578d9 100644 --- a/go.mod +++ b/go.mod @@ -34,10 +34,10 @@ require ( k8s.io/code-generator v0.30.3 k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - knative.dev/caching v0.0.0-20241015090132-ccfb189fed8e + knative.dev/caching v0.0.0-20241022012359-41bbaf964d16 knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d - knative.dev/networking v0.0.0-20241015085032-a3d46633cfb3 - knative.dev/pkg v0.0.0-20241021053726-4af9a0d3f8b5 + knative.dev/networking v0.0.0-20241022012959-60e29ff520dc + knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 1f32d45a74ad..e82c4dd1652d 100644 --- a/go.sum +++ b/go.sum @@ -946,14 +946,14 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/caching v0.0.0-20241015090132-ccfb189fed8e h1:SFUaPsSwBOLnrakXCoOi+iGe74xGW3TRDwDXmD29xyo= -knative.dev/caching v0.0.0-20241015090132-ccfb189fed8e/go.mod h1:Gdarh0MOPnzYhT7/f5FFFClwRbbp0bJGK8J2Viu1g54= +knative.dev/caching v0.0.0-20241022012359-41bbaf964d16 h1:vQ0y0mO1ALdOd/FPiw7gf1415mf41aWnLOVOtTr2/jQ= +knative.dev/caching v0.0.0-20241022012359-41bbaf964d16/go.mod h1:qOvjasSUI+GyF4hsqJmIomblcgjkLzJhng8/zk0B9J4= knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d h1:aCfX7kwkvgGxXXGbso5tLqdwQmzBkJ9d+EIRwksKTvk= knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/networking v0.0.0-20241015085032-a3d46633cfb3 h1:pnCWTaxtOdiqtjJC0kGw+4qC7ChH3DkchReSSSBtLQ8= -knative.dev/networking v0.0.0-20241015085032-a3d46633cfb3/go.mod h1:xaOhZH277o5f7VTWOBeDQNrGGXeNV2B9dxMn3bp26Ow= -knative.dev/pkg v0.0.0-20241021053726-4af9a0d3f8b5 h1:T+40/2nEh78mT31zYUMjL3ENrZSM6jNApGgz+tcDqwc= -knative.dev/pkg v0.0.0-20241021053726-4af9a0d3f8b5/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo= +knative.dev/networking v0.0.0-20241022012959-60e29ff520dc h1:0d9XXRLlyuHfINZLlYqo/BYe/+chqqNBMLKJldjTbtw= +knative.dev/networking v0.0.0-20241022012959-60e29ff520dc/go.mod h1:G56j6VCLzfaN9yZ4IqfNyN4c3U1czvhUmKeZX4UjQ8Q= +knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad h1:Nrjtr2H168rJeamH4QdyLMV1lEKHejNhaj1ymgQMfLk= +knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/knative.dev/pkg/webhook/configmaps/controller.go b/vendor/knative.dev/pkg/webhook/configmaps/controller.go index 80ab3cab1deb..277a47d08dc8 100644 --- a/vendor/knative.dev/pkg/webhook/configmaps/controller.go +++ b/vendor/knative.dev/pkg/webhook/configmaps/controller.go @@ -46,6 +46,12 @@ func NewAdmissionController( secretInformer := secretinformer.Get(ctx) options := webhook.GetOptions(ctx) + // if this environment variable is set, it overrides the value in the Options + disableNamespaceOwnership := webhook.DisableNamespaceOwnershipFromEnv() + if disableNamespaceOwnership != nil { + options.DisableNamespaceOwnership = *disableNamespaceOwnership + } + key := types.NamespacedName{Name: name} wh := &reconciler{ diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go index 4e509d7a2034..6a83b478452a 100644 --- a/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go +++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go @@ -84,6 +84,12 @@ func newController(ctx context.Context, name string, optsFunc ...OptionFunc) *co f(opts) } + // if this environment variable is set, it overrides the value in the Options + disableNamespaceOwnership := webhook.DisableNamespaceOwnershipFromEnv() + if disableNamespaceOwnership != nil { + wopts.DisableNamespaceOwnership = *disableNamespaceOwnership + } + key := types.NamespacedName{Name: name} wh := &reconciler{ diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go index c8afa5c1389d..dc72b69d26af 100644 --- a/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go +++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go @@ -70,6 +70,12 @@ func newController(ctx context.Context, name string, optsFunc ...OptionFunc) *co f(opts) } + // if this environment variable is set, it overrides the value in the Options + disableNamespaceOwnership := webhook.DisableNamespaceOwnershipFromEnv() + if disableNamespaceOwnership != nil { + woptions.DisableNamespaceOwnership = *disableNamespaceOwnership + } + wh := &reconciler{ LeaderAwareFuncs: pkgreconciler.LeaderAwareFuncs{ // Have this reconciler enqueue our singleton whenever it becomes leader. diff --git a/vendor/knative.dev/pkg/webhook/webhook.go b/vendor/knative.dev/pkg/webhook/webhook.go index dc198179692b..9dc736b40c3e 100644 --- a/vendor/knative.dev/pkg/webhook/webhook.go +++ b/vendor/knative.dev/pkg/webhook/webhook.go @@ -166,12 +166,6 @@ func New( return nil, fmt.Errorf("unsupported TLS version: %d", opts.TLSMinVersion) } - // if the environment variable is set, it overrides the value in the Options - disableNamespaceOwnership := DisableNamespaceOwnershipFromEnv() - if disableNamespaceOwnership != nil { - opts.DisableNamespaceOwnership = *disableNamespaceOwnership - } - syncCtx, cancel := context.WithCancel(context.Background()) webhook = &Webhook{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 2d83d3d0ab95..d8d98edf19fd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1337,7 +1337,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/caching v0.0.0-20241015090132-ccfb189fed8e +# knative.dev/caching v0.0.0-20241022012359-41bbaf964d16 ## explicit; go 1.22.0 knative.dev/caching/config knative.dev/caching/pkg/apis/caching @@ -1361,7 +1361,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1 # knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d ## explicit; go 1.21 knative.dev/hack -# knative.dev/networking v0.0.0-20241015085032-a3d46633cfb3 +# knative.dev/networking v0.0.0-20241022012959-60e29ff520dc ## explicit; go 1.22.0 knative.dev/networking/config knative.dev/networking/pkg @@ -1400,7 +1400,7 @@ knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/ingress knative.dev/networking/pkg/k8s knative.dev/networking/pkg/prober -# knative.dev/pkg v0.0.0-20241021053726-4af9a0d3f8b5 +# knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad ## explicit; go 1.22.0 knative.dev/pkg/apiextensions/storageversion knative.dev/pkg/apiextensions/storageversion/cmd/migrate