Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history 
bumping knative.dev/networking 1d7920d...1e4e183:
  > 1e4e183 Improve InternalTLSEnabled util function (# 847)
bumping knative.dev/eventing b5a4460...eacaac5:
  > eacaac5 deprecate kntest (# 7211)
bumping knative.dev/serving 43f7526...ae86b1d:
  > ae86b1d upgrade to latest dependencies (# 14302)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
@knative-automation
knative-automation committed Aug 29, 2023
1 parent c4e2316 commit 72b5f06
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 19 deletions.
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ require (
k8s.io/code-generator v0.26.5
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
knative.dev/caching v0.0.0-20230822003854-eb3243f87fff
knative.dev/eventing v0.38.1-0.20230828085900-b5a44606fae1
knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363
knative.dev/serving v0.38.1-0.20230828082601-43f752622190
knative.dev/serving v0.38.1-0.20230828144600-ae86b1df6b4c
sigs.k8s.io/yaml v1.3.0
)

Expand Down Expand Up @@ -139,7 +139,7 @@ require (
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e // indirect
knative.dev/networking v0.0.0-20230828082700-1e4e18318353 // indirect
sigs.k8s.io/controller-runtime v0.7.2 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1397,16 +1397,16 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJ
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/caching v0.0.0-20230822003854-eb3243f87fff h1:E8dIWlwdmZa9d2MPMy5fDkKGJBiCFanPMIkDJPlr7Mg=
knative.dev/caching v0.0.0-20230822003854-eb3243f87fff/go.mod h1:dStsclg7LcnG3Laz3RRpmIn/dzClF+NStbrFSywQxr8=
knative.dev/eventing v0.38.1-0.20230828085900-b5a44606fae1 h1:DGCRXjGvrgUGhHQSHS0kS8Xz+Z+PF8UZ8Lply/SG/Ho=
knative.dev/eventing v0.38.1-0.20230828085900-b5a44606fae1/go.mod h1:EZV0sqD7yF3Y667OqASDxTNxVuQqZygx2HG7F0oLayk=
knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8 h1:KPK1wM2DgoNIlVt37EYEIyVxH6D7bTUxTOODPcsYo6w=
knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8/go.mod h1:inFfD7WirG7ALHi7jpoYm3INeJpe1uMNo0cfvVpRxpg=
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 h1:n9YEGYuoj31pAkhGlNL+xTQAeXKYTLeMmIZLWA9fAeo=
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e h1:9CcYOXJKJSiZ5aeNm0AJZ1DjOlisadZhMSa/O/hOSmE=
knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e/go.mod h1:1voQlQD0tuot6U3Kldw+uch33mK2LV85fi3MfbV0CP8=
knative.dev/networking v0.0.0-20230828082700-1e4e18318353 h1:Ll5uB/h54ghuaWjoVAOUoar4dTSVpV26XOmnvKKevHQ=
knative.dev/networking v0.0.0-20230828082700-1e4e18318353/go.mod h1:1voQlQD0tuot6U3Kldw+uch33mK2LV85fi3MfbV0CP8=
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 h1:TI2hMwTM5Bl+yaWu1gN5bXAHSvc+FtH9cqm3NzmDBtY=
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363/go.mod h1:dA3TdhFTRm4KmmpvfknpGV43SbGNFkLHySjC8/+NczM=
knative.dev/serving v0.38.1-0.20230828082601-43f752622190 h1:25AdYY0FJPFMvVbe9q1soWI5cdkc2MuHkuz2eDPOk2w=
knative.dev/serving v0.38.1-0.20230828082601-43f752622190/go.mod h1:/q/HksDFhDiPdwOiyFdDE464YF+GjOYL22x7q57NPB0=
knative.dev/serving v0.38.1-0.20230828144600-ae86b1df6b4c h1:II/YJ+fNQOWgG95hFGigsB0vsSfhcc/lHOn+O4kyDrU=
knative.dev/serving v0.38.1-0.20230828144600-ae86b1df6b4c/go.mod h1:LhC5vH2hhy0EgfWg3dMFptE/JAqkdes6DooWb2NXEtQ=
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/eventing/test/e2e-conformance-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ source "$(dirname "$0")/e2e-common.sh"

# Script entry point.

initialize $@ --skip-istio-addon
initialize "$@"

echo "Running Conformance tests for: Multi Tenant Channel Based Broker (v1), Channel (v1), InMemoryChannel (v1) , ApiServerSource (v1), ContainerSource (v1) and PingSource (v1beta2)"
go_test_e2e -timeout=30m -parallel=12 ./test/conformance \
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/eventing/test/e2e-rekt-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ source "$(dirname "$0")/e2e-common.sh"

# Script entry point.

initialize $@ --skip-istio-addon --min-nodes=4 --max-nodes=4
initialize "$@" --num-nodes=4

export SKIP_UPLOAD_TEST_IMAGES="true"

Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/eventing/test/e2e-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ source "$(dirname "$0")/e2e-common.sh"

# Script entry point.

initialize $@ --skip-istio-addon
initialize "$@"

echo "Running E2E tests for: Multi Tenant Channel Based Broker, Channel (v1), InMemoryChannel (v1) , ApiServerSource (v1), ContainerSource (v1) and PingSource (v1beta2)"
go_test_e2e -timeout=1h -parallel=20 ./test/e2e \
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function uninstall_test_resources {
true
}

initialize "$@" --skip-istio-addon
initialize "$@"

TIMEOUT=${TIMEOUT:-60m}

Expand Down
14 changes: 11 additions & 3 deletions vendor/knative.dev/networking/pkg/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const (
// hostname for a Route's tag.
TagTemplateKey = "tag-template"

// InternalEncryptionKey is deprecated and replaced by InternalDataplaneTrustKey and internal-controlplane-trust
// InternalEncryptionKey is deprecated and replaced by InternalDataplaneTrustKey and ControlplaneTrustKey.
// InternalEncryptionKey is the name of the configuration whether
// internal traffic is encrypted or not.
InternalEncryptionKey = "internal-encryption"
Expand Down Expand Up @@ -445,9 +445,17 @@ func NewConfigFromMap(data map[string]string) (*Config, error) {
return nc, nil
}

// InternalTLSEnabled returns whether or not dataplane-trust is disabled
// InternalTLSEnabled returns whether or not InternalEncyrption is enabled.
// Currently only DataplaneTrust is considered.
func (c *Config) InternalTLSEnabled() bool {
return c.DataplaneTrust != TrustDisabled
return tlsEnabled(c.DataplaneTrust)
}

func tlsEnabled(trust Trust) bool {
return trust == TrustMinimal ||
trust == TrustEnabled ||
trust == TrustMutual ||
trust == TrustIdentity
}

// GetDomainTemplate returns the golang Template from the config map
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@ k8s.io/utils/trace
## explicit; go 1.18
knative.dev/caching/pkg/apis/caching
knative.dev/caching/pkg/apis/caching/v1alpha1
# knative.dev/eventing v0.38.1-0.20230828085900-b5a44606fae1
# knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8
## explicit; go 1.19
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
Expand Down Expand Up @@ -1353,7 +1353,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/sender
## explicit; go 1.18
knative.dev/hack
knative.dev/hack/shell
# knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e
# knative.dev/networking v0.0.0-20230828082700-1e4e18318353
## explicit; go 1.18
knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking
Expand Down Expand Up @@ -1448,7 +1448,7 @@ knative.dev/pkg/webhook
knative.dev/pkg/webhook/certificates
knative.dev/pkg/webhook/certificates/resources
knative.dev/pkg/webhook/resourcesemantics/conversion
# knative.dev/serving v0.38.1-0.20230828082601-43f752622190
# knative.dev/serving v0.38.1-0.20230828144600-ae86b1df6b4c
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit 72b5f06

Please sign in to comment.