Skip to content

Commit 4dace1e

Browse files
upgrade to latest dependencies (#4142)
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 <automation@knative.team>
1 parent 5a94650 commit 4dace1e

File tree

7 files changed

+38
-10
lines changed

7 files changed

+38
-10
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ require (
3535
k8s.io/apiserver v0.30.3
3636
k8s.io/client-go v0.30.3
3737
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
38-
knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88
38+
knative.dev/eventing v0.43.0
3939
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
40-
knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5
40+
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad
4141
knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364
4242
sigs.k8s.io/controller-runtime v0.12.3
4343
sigs.k8s.io/yaml v1.4.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,12 +1214,12 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
12141214
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
12151215
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
12161216
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1217-
knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88 h1:Y50FB+2J5/DejNBre3klilKPmJFx31wv1OtTbpQUrjA=
1218-
knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88/go.mod h1:5+F5Htg4l8TMn2bb8sjCiFdojIFqrSPyUj81/VXIVdA=
1217+
knative.dev/eventing v0.43.0 h1:GELHZ0yYosMeV78l4alMsd7HJciEu6a3T2C5l7MPi3Y=
1218+
knative.dev/eventing v0.43.0/go.mod h1:pdrF+bEUfRkNn9ifWXS7DoVj5W31gA5KQVd8iwplXUo=
12191219
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d h1:aCfX7kwkvgGxXXGbso5tLqdwQmzBkJ9d+EIRwksKTvk=
12201220
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
1221-
knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5 h1:0ZKQVzST2Y3nSud1hNzTYM+UhTHKOJLjSfmZmzjwpN4=
1222-
knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo=
1221+
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad h1:Nrjtr2H168rJeamH4QdyLMV1lEKHejNhaj1ymgQMfLk=
1222+
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo=
12231223
knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364 h1:DIc+vbaFKOSGktPXJ1MaXIXoDjlmUIXQkHiZaPcYGbQ=
12241224
knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364/go.mod h1:PVRnK/YQo9s3foRtut00oAxvCPc9f/qV2PApZh/rMPw=
12251225
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

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

Lines changed: 14 additions & 0 deletions
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/resourcesemantics/defaulting/controller.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ func newController(ctx context.Context, name string, optsFunc ...OptionFunc) *co
8484
f(opts)
8585
}
8686

87+
// if this environment variable is set, it overrides the value in the Options
88+
disableNamespaceOwnership := webhook.DisableNamespaceOwnershipFromEnv()
89+
if disableNamespaceOwnership != nil {
90+
wopts.DisableNamespaceOwnership = *disableNamespaceOwnership
91+
}
92+
8793
key := types.NamespacedName{Name: name}
8894

8995
wh := &reconciler{

vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ func newController(ctx context.Context, name string, optsFunc ...OptionFunc) *co
7070
f(opts)
7171
}
7272

73+
// if this environment variable is set, it overrides the value in the Options
74+
disableNamespaceOwnership := webhook.DisableNamespaceOwnershipFromEnv()
75+
if disableNamespaceOwnership != nil {
76+
woptions.DisableNamespaceOwnership = *disableNamespaceOwnership
77+
}
78+
7379
wh := &reconciler{
7480
LeaderAwareFuncs: pkgreconciler.LeaderAwareFuncs{
7581
// Have this reconciler enqueue our singleton whenever it becomes leader.

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

Lines changed: 4 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ k8s.io/utils/pointer
11671167
k8s.io/utils/ptr
11681168
k8s.io/utils/strings/slices
11691169
k8s.io/utils/trace
1170-
# knative.dev/eventing v0.42.1-0.20241016013536-6aa49dc1db88
1170+
# knative.dev/eventing v0.43.0
11711171
## explicit; go 1.22.0
11721172
knative.dev/eventing/cmd/event_display
11731173
knative.dev/eventing/cmd/heartbeats
@@ -1356,7 +1356,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/sender
13561356
# knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
13571357
## explicit; go 1.21
13581358
knative.dev/hack
1359-
# knative.dev/pkg v0.0.0-20241015082832-95b4b97567b5
1359+
# knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad
13601360
## explicit; go 1.22.0
13611361
knative.dev/pkg/apiextensions/storageversion
13621362
knative.dev/pkg/apiextensions/storageversion/cmd/migrate

0 commit comments

Comments
 (0)