From 405cbd8c61b864847425ba93f11cd503df9d3e73 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 22 Oct 2024 01:55:00 -0400 Subject: [PATCH] [main] Upgrade to latest dependencies (#70) upgrade to latest dependencies bumping knative.dev/serving 782b6a8...c93d8c4: > c93d8c4 upgrade to latest dependencies (# 15581) > 77c7e1d Update net-contour nightly (# 15578) > 5ebf2c7 Update net-kourier nightly (# 15577) > b474b3e Update net-gateway-api nightly (# 15576) > cb2a9c6 Update net-istio nightly (# 15579) > 6544bfe Update community files (# 15574) > 83b6695 Update net-gateway-api nightly (# 15573) > b98384c upgrade to latest dependencies (# 15572) bumping knative.dev/pkg 59c22a1...9b9d535: > 9b9d535 Fix `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3108) > 4af9a0d Add `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3106) > 95b4b97 upgrade to latest dependencies (# 3104) bumping knative.dev/caching c7654c4...ccfb189: > ccfb189 upgrade to latest dependencies (# 896) > f9d59e9 Update community files (# 895) bumping knative.dev/networking 0561079...60e29ff: > 60e29ff upgrade to latest dependencies (# 1015) > a3d4663 upgrade to latest dependencies (# 1012) Signed-off-by: Knative Automation --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- vendor/knative.dev/pkg/webhook/env.go | 14 ++++++++++++++ vendor/knative.dev/pkg/webhook/webhook.go | 6 ++++-- vendor/modules.txt | 8 ++++---- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index e8012291..1e422cf7 100644 --- a/go.mod +++ b/go.mod @@ -15,9 +15,9 @@ require ( k8s.io/client-go v0.30.3 k8s.io/code-generator v0.30.3 knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d - knative.dev/networking v0.0.0-20241014132131-0561079d4264 - knative.dev/pkg v0.0.0-20241014065030-59c22a189949 - knative.dev/serving v0.42.1-0.20241014083730-782b6a86173e + knative.dev/networking v0.0.0-20241022012959-60e29ff520dc + knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad + knative.dev/serving v0.42.1-0.20241021145327-c93d8c49a1b7 ) require ( @@ -95,7 +95,7 @@ require ( k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect - knative.dev/caching v0.0.0-20241010005702-c7654c4c7eba // indirect + knative.dev/caching v0.0.0-20241015090132-ccfb189fed8e // indirect sigs.k8s.io/controller-runtime v0.17.5 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index b47057c4..2258744f 100644 --- a/go.sum +++ b/go.sum @@ -707,16 +707,16 @@ 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-20241010005702-c7654c4c7eba h1:3cioIq3zI4SDq0HZfhcBcgRT6MRVNW0Yk3gy/coVX1U= -knative.dev/caching v0.0.0-20241010005702-c7654c4c7eba/go.mod h1:B3uuHl3nUBX8sB71j1pViZiuebRNFjEolHwJxeYDWG8= +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/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-20241014132131-0561079d4264 h1:wHk7kQ+qypQtO0AR18X2u4sZFoTqC4ljymV0WgPhTS0= -knative.dev/networking v0.0.0-20241014132131-0561079d4264/go.mod h1:0wgKY3Vn+tt80IFMs4aciY82H3hWgkNGEpxDAaEVCi4= -knative.dev/pkg v0.0.0-20241014065030-59c22a189949 h1:7ZH7J7mzyYqhbOMEEs5ipi0PL5/rgQo+ciyLDKvIuag= -knative.dev/pkg v0.0.0-20241014065030-59c22a189949/go.mod h1:HywcanTb6dH8j9AbDOVhHX65R+Dstdq+5pYHH64TcQs= -knative.dev/serving v0.42.1-0.20241014083730-782b6a86173e h1:bfB4yKLROHBLI2W71Hbil4HbKMkDhM2M1Ww23gIusGU= -knative.dev/serving v0.42.1-0.20241014083730-782b6a86173e/go.mod h1:j6hTb8ffWd0aUpAe9TTVBZktf6neLuVWXWcP6A1l+IA= +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= +knative.dev/serving v0.42.1-0.20241021145327-c93d8c49a1b7 h1:fydpJaCGILSagGqCNZExUyGuq2CaeT8dnuQjK9MykHs= +knative.dev/serving v0.42.1-0.20241021145327-c93d8c49a1b7/go.mod h1:1t1/B5Y4nrTprJGBLtkiz5ZgHy0AKgNjQdLsj5SfwDw= 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/env.go b/vendor/knative.dev/pkg/webhook/env.go index ffb75701..e622f5f9 100644 --- a/vendor/knative.dev/pkg/webhook/env.go +++ b/vendor/knative.dev/pkg/webhook/env.go @@ -32,6 +32,8 @@ const ( secretNameEnvKey = "WEBHOOK_SECRET_NAME" //nolint:gosec // This is not a hardcoded credential tlsMinVersionEnvKey = "WEBHOOK_TLS_MIN_VERSION" + + disableNamespaceOwnershipEnvKey = "WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP" ) // PortFromEnv returns the webhook port set by portEnvKey, or default port if env var is not set. @@ -82,3 +84,15 @@ func TLSMinVersionFromEnv(defaultTLSMinVersion uint16) uint16 { panic(fmt.Sprintf("the environment variable %q has to be either '1.2' or '1.3'", tlsMinVersionEnvKey)) } } + +func DisableNamespaceOwnershipFromEnv() *bool { + disableNamespaceOwnership := os.Getenv(disableNamespaceOwnershipEnvKey) + if disableNamespaceOwnership == "" { + return nil + } + disableNamespaceOwnershipBool, err := strconv.ParseBool(disableNamespaceOwnership) + if err != nil { + panic(fmt.Sprintf("failed to convert the environment variable %q : %v", disableNamespaceOwnershipEnvKey, err)) + } + return &disableNamespaceOwnershipBool +} diff --git a/vendor/knative.dev/pkg/webhook/webhook.go b/vendor/knative.dev/pkg/webhook/webhook.go index 1b90e75f..9dc736b4 100644 --- a/vendor/knative.dev/pkg/webhook/webhook.go +++ b/vendor/knative.dev/pkg/webhook/webhook.go @@ -81,8 +81,10 @@ type Options struct { // before shutting down. GracePeriod time.Duration - // DisableNamespaceOwnership configures whether the webhook adds an owner reference for the SYSTEM_NAMESPACE - // Disabling this is useful when you expect the webhook configuration to be managed by something other than knative + // DisableNamespaceOwnership configures if the SYSTEM_NAMESPACE is added as an owner reference to the + // webhook configuration resources. Overridden by the WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP environment variable. + // Disabling can be useful to avoid breaking systems that expect ownership to indicate a true controller + // relationship: https://github.com/knative/serving/issues/15483 DisableNamespaceOwnership bool // ControllerOptions encapsulates options for creating a new controller, diff --git a/vendor/modules.txt b/vendor/modules.txt index c7eefe24..106d9a88 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -955,7 +955,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/caching v0.0.0-20241010005702-c7654c4c7eba +# knative.dev/caching v0.0.0-20241015090132-ccfb189fed8e ## explicit; go 1.22.0 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 @@ -970,7 +970,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-20241014132131-0561079d4264 +# knative.dev/networking v0.0.0-20241022012959-60e29ff520dc ## explicit; go 1.22.0 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -1000,7 +1000,7 @@ knative.dev/networking/pkg/http/proxy knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/ingress knative.dev/networking/pkg/k8s -# knative.dev/pkg v0.0.0-20241014065030-59c22a189949 +# knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad ## explicit; go 1.22.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1066,7 +1066,7 @@ knative.dev/pkg/tracker knative.dev/pkg/version knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates/resources -# knative.dev/serving v0.42.1-0.20241014083730-782b6a86173e +# knative.dev/serving v0.42.1-0.20241021145327-c93d8c49a1b7 ## explicit; go 1.22.0 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1