Skip to content

Commit

Permalink
[main] Upgrade to latest dependencies (#243)
Browse files Browse the repository at this point in the history 
upgrade to latest dependencies

bumping knative.dev/caching f9d59e9...ccfb189:
  > ccfb189 upgrade to latest dependencies (# 896)
bumping knative.dev/pkg 59c22a1...4af9a0d:
  > 4af9a0d Add `WEBHOOK_DISABLE_NAMESPACE_OWNERSHIP` env-var (# 3106)
  > 95b4b97 upgrade to latest dependencies (# 3104)
bumping knative.dev/networking 0561079...a3d4663:
  > a3d4663 upgrade to latest dependencies (# 1012)
bumping knative.dev/serving b98384c...77c7e1d:
  > 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)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
@knative-automation
knative-automation authored Oct 21, 2024
1 parent fa435b6 commit c10f6c2
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 18 deletions.
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ require (
k8s.io/client-go v0.30.3
k8s.io/code-generator v0.30.3
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8
knative.dev/caching v0.0.0-20241010131930-f9d59e934f7a
knative.dev/caching v0.0.0-20241015090132-ccfb189fed8e
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.20241014143032-b98384c54d73
knative.dev/networking v0.0.0-20241015085032-a3d46633cfb3
knative.dev/pkg v0.0.0-20241021053726-4af9a0d3f8b5
knative.dev/serving v0.42.1-0.20241016153129-77c7e1df0cd1
)

require (
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,16 +802,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-20241010131930-f9d59e934f7a h1:z0O6pA3Vn9Ni7Amw7yWgyhbS3Pu9ddY/WM4BWCFQzfY=
knative.dev/caching v0.0.0-20241010131930-f9d59e934f7a/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.20241014143032-b98384c54d73 h1:/x0dn118pfEQ4S11yg76buSOldb798jM0iXfIL2PI54=
knative.dev/serving v0.42.1-0.20241014143032-b98384c54d73/go.mod h1:/exlE2+mo78cVXz/Xws1OjxzOJGTBqDCO3gjVf8E0MA=
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/serving v0.42.1-0.20241016153129-77c7e1df0cd1 h1:TqrfLWy75MFJiYN3JnoYThFqTAtN9D7pdqx2aumpa70=
knative.dev/serving v0.42.1-0.20241016153129-77c7e1df0cd1/go.mod h1:/exlE2+mo78cVXz/Xws1OjxzOJGTBqDCO3gjVf8E0MA=
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=
Expand Down
14 changes: 14 additions & 0 deletions vendor/knative.dev/pkg/webhook/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
}
12 changes: 10 additions & 2 deletions vendor/knative.dev/pkg/webhook/webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -164,6 +166,12 @@ 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{
Expand Down
8 changes: 4 additions & 4 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/caching v0.0.0-20241010131930-f9d59e934f7a
# 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
Expand All @@ -1144,7 +1144,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-20241015085032-a3d46633cfb3
## explicit; go 1.22.0
knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking
Expand Down Expand Up @@ -1179,7 +1179,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-20241014065030-59c22a189949
# knative.dev/pkg v0.0.0-20241021053726-4af9a0d3f8b5
## explicit; go 1.22.0
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down Expand Up @@ -1246,7 +1246,7 @@ knative.dev/pkg/version
knative.dev/pkg/webhook
knative.dev/pkg/webhook/certificates/resources
knative.dev/pkg/websocket
# knative.dev/serving v0.42.1-0.20241014143032-b98384c54d73
# knative.dev/serving v0.42.1-0.20241016153129-77c7e1df0cd1
## explicit; go 1.22.0
knative.dev/serving/pkg/activator
knative.dev/serving/pkg/apis/autoscaling
Expand Down

0 comments on commit c10f6c2

Please sign in to comment.