diff --git a/go.mod b/go.mod index 96af0f66cc43..575e5451255a 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 knative.dev/caching v0.0.0-20230822003854-eb3243f87fff knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 - knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e + knative.dev/networking v0.0.0-20230828082700-1e4e18318353 knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index edbc29afcfcc..eeb63335f8ed 100644 --- a/go.sum +++ b/go.sum @@ -946,8 +946,8 @@ knative.dev/caching v0.0.0-20230822003854-eb3243f87fff h1:E8dIWlwdmZa9d2MPMy5fDk knative.dev/caching v0.0.0-20230822003854-eb3243f87fff/go.mod h1:dStsclg7LcnG3Laz3RRpmIn/dzClF+NStbrFSywQxr8= 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= pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4= diff --git a/vendor/knative.dev/networking/pkg/config/config.go b/vendor/knative.dev/networking/pkg/config/config.go index a4534fc51d95..f27c7865e4b8 100644 --- a/vendor/knative.dev/networking/pkg/config/config.go +++ b/vendor/knative.dev/networking/pkg/config/config.go @@ -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" @@ -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 diff --git a/vendor/modules.txt b/vendor/modules.txt index d49980519f0e..957c691dad11 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1319,7 +1319,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1 ## 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/config knative.dev/networking/pkg