Skip to content
This repository has been archived by the owner on May 28, 2024. It is now read-only.

Commit

Permalink
upgrade to latest dependencies (#525)
Browse files Browse the repository at this point in the history
bumping knative.dev/networking 4bfcc9f...1e4e183:
  > 1e4e183 Improve InternalTLSEnabled util function (# 847)
  > 1d7920d upgrade to latest dependencies (# 845)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation authored Aug 28, 2023
1 parent bb5343e commit a97aac9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
k8s.io/apimachinery v0.26.5
k8s.io/client-go v0.26.5
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
knative.dev/networking v0.0.0-20230817140742-4bfcc9fb6012
knative.dev/networking v0.0.0-20230828082700-1e4e18318353
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,8 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJ
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
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-20230817140742-4bfcc9fb6012 h1:eaeZPgJzsJMnJaekbG8TYAfF/PUX8Xmdb8Oqnb+QO1k=
knative.dev/networking v0.0.0-20230817140742-4bfcc9fb6012/go.mod h1:iGxfnvUJ3gGqtKnoOXhLzNCZeGxVnH4xdClYuh5vB4o=
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=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
14 changes: 11 additions & 3 deletions vendor/knative.dev/networking/pkg/config/config.go
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
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ k8s.io/utils/trace
# knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
## explicit; go 1.18
knative.dev/hack
# knative.dev/networking v0.0.0-20230817140742-4bfcc9fb6012
# knative.dev/networking v0.0.0-20230828082700-1e4e18318353
## explicit; go 1.18
knative.dev/networking/config
knative.dev/networking/pkg/apis/networking
Expand Down

0 comments on commit a97aac9

Please sign in to comment.