Skip to content

Commit ea12f50

Browse files
[main] Upgrade to latest dependencies (#539)
upgrade to latest dependencies bumping knative.dev/pkg 95b4b97...9b9d535: > 9b9d535 Fix `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3108) > 4af9a0d Add `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3106) bumping knative.dev/eventing 6aa49dc...291c0a8: > 291c0a8 [main] Upgrade to latest dependencies (# 8262) Signed-off-by: Knative Automation <[email protected]>
1 parent 15080b9 commit ea12f50

File tree

7 files changed

+28
-12
lines changed

7 files changed

+28
-12
lines changed

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
k8s.io/apimachinery v0.30.3
1414
k8s.io/client-go v0.30.3
1515
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
16-
knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88
16+
knative.dev/eventing v0.43.0
1717
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
18-
knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5
18+
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad
1919
)
2020

2121
require (

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -684,12 +684,12 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf
684684
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA=
685685
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
686686
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
687-
knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88 h1:Y50FB+2J5/DejNBre3klilKPmJFx31wv1OtTbpQUrjA=
688-
knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88/go.mod h1:5+F5Htg4l8TMn2bb8sjCiFdojIFqrSPyUj81/VXIVdA=
687+
knative.dev/eventing v0.43.0 h1:GELHZ0yYosMeV78l4alMsd7HJciEu6a3T2C5l7MPi3Y=
688+
knative.dev/eventing v0.43.0/go.mod h1:pdrF+bEUfRkNn9ifWXS7DoVj5W31gA5KQVd8iwplXUo=
689689
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d h1:aCfX7kwkvgGxXXGbso5tLqdwQmzBkJ9d+EIRwksKTvk=
690690
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
691-
knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5 h1:0ZKQVzST2Y3nSud1hNzTYM+UhTHKOJLjSfmZmzjwpN4=
692-
knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo=
691+
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad h1:Nrjtr2H168rJeamH4QdyLMV1lEKHejNhaj1ymgQMfLk=
692+
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo=
693693
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
694694
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
695695
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/knative.dev/pkg/webhook/env.go

+14
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ const (
3232
secretNameEnvKey = "WEBHOOK_SECRET_NAME" //nolint:gosec // This is not a hardcoded credential
3333

3434
tlsMinVersionEnvKey = "WEBHOOK_TLS_MIN_VERSION"
35+
36+
disableNamespaceOwnershipEnvKey = "WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP"
3537
)
3638

3739
// 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 {
8284
panic(fmt.Sprintf("the environment variable %q has to be either '1.2' or '1.3'", tlsMinVersionEnvKey))
8385
}
8486
}
87+
88+
func DisableNamespaceOwnershipFromEnv() *bool {
89+
disableNamespaceOwnership := os.Getenv(disableNamespaceOwnershipEnvKey)
90+
if disableNamespaceOwnership == "" {
91+
return nil
92+
}
93+
disableNamespaceOwnershipBool, err := strconv.ParseBool(disableNamespaceOwnership)
94+
if err != nil {
95+
panic(fmt.Sprintf("failed to convert the environment variable %q : %v", disableNamespaceOwnershipEnvKey, err))
96+
}
97+
return &disableNamespaceOwnershipBool
98+
}

vendor/knative.dev/pkg/webhook/webhook.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ type Options struct {
8181
// before shutting down.
8282
GracePeriod time.Duration
8383

84-
// DisableNamespaceOwnership configures whether the webhook adds an owner reference for the SYSTEM_NAMESPACE
85-
// Disabling this is useful when you expect the webhook configuration to be managed by something other than knative
84+
// DisableNamespaceOwnership configures if the SYSTEM_NAMESPACE is added as an owner reference to the
85+
// webhook configuration resources. Overridden by the WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP environment variable.
86+
// Disabling can be useful to avoid breaking systems that expect ownership to indicate a true controller
87+
// relationship: https://github.com/knative/serving/issues/15483
8688
DisableNamespaceOwnership bool
8789

8890
// ControllerOptions encapsulates options for creating a new controller,

vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -900,13 +900,13 @@ k8s.io/utils/pointer
900900
k8s.io/utils/ptr
901901
k8s.io/utils/strings/slices
902902
k8s.io/utils/trace
903-
# knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88
903+
# knative.dev/eventing v0.43.0
904904
## explicit; go 1.22.0
905905
knative.dev/eventing/pkg/apis/feature
906906
# knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
907907
## explicit; go 1.21
908908
knative.dev/hack
909-
# knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5
909+
# knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad
910910
## explicit; go 1.22.0
911911
knative.dev/pkg/apis
912912
knative.dev/pkg/apis/duck

0 commit comments

Comments
 (0)