diff --git a/go.mod b/go.mod index 78250a1ff..269ef13ae 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( k8s.io/api v0.27.6 k8s.io/apimachinery v0.27.6 k8s.io/client-go v0.27.6 - knative.dev/eventing v0.38.1-0.20231019170735-4d14c2126a20 + knative.dev/eventing v0.38.1-0.20231020133954-16a398695622 knative.dev/hack v0.0.0-20231016131700-2c938d4918da knative.dev/pkg v0.0.0-20231017113806-d6ab72900ea5 - knative.dev/serving v0.38.1-0.20231019102212-98960793b828 + knative.dev/serving v0.38.1-0.20231020173818-6b844deb81fc ) require ( diff --git a/go.sum b/go.sum index e30bdb2d8..404367a0b 100644 --- a/go.sum +++ b/go.sum @@ -779,16 +779,16 @@ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5F k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.38.1-0.20231019170735-4d14c2126a20 h1:j6jW2x0lWlEvQ84mal81dvA6skA085LSFTGfLEdo9U8= -knative.dev/eventing v0.38.1-0.20231019170735-4d14c2126a20/go.mod h1:swWS48qpCQbBkj+2iS0rVa7PbQBWLD9YAy3CSHfevaU= +knative.dev/eventing v0.38.1-0.20231020133954-16a398695622 h1:0zVa3WIigc9Le/K1MVPNLjFo3lOs4ADj30EbNrRO820= +knative.dev/eventing v0.38.1-0.20231020133954-16a398695622/go.mod h1:swWS48qpCQbBkj+2iS0rVa7PbQBWLD9YAy3CSHfevaU= knative.dev/hack v0.0.0-20231016131700-2c938d4918da h1:xy+fvuz2LDOMsZ5UwXRaMF70NYUs9fsG+EF5/ierYBg= knative.dev/hack v0.0.0-20231016131700-2c938d4918da/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= knative.dev/networking v0.0.0-20231012062439-c0863403c83b h1:yGtVPNHek3rmKb50k7G9fG/NuuC4FRzESVrWmPFU9AM= knative.dev/networking v0.0.0-20231012062439-c0863403c83b/go.mod h1:uEvP4spV82HGB8loxo8nH/LGmwsd9jUGWvDVC+tH4O4= knative.dev/pkg v0.0.0-20231017113806-d6ab72900ea5 h1:9AvFZdEtuwKWDcTV1VSwmrgrRR9f38wbIAm+sNwLivQ= knative.dev/pkg v0.0.0-20231017113806-d6ab72900ea5/go.mod h1:HHRXEd7ZlFpthgE+rwAZ6MUVnuJOAeolnaFSthXloUQ= -knative.dev/serving v0.38.1-0.20231019102212-98960793b828 h1:sNOLMY9JEeWpHOEp/7C1qdoSUM+meff1Qpl27H6yWPg= -knative.dev/serving v0.38.1-0.20231019102212-98960793b828/go.mod h1:cuia3pUQNF4sa3g3KsPFgqpLnF1pf9iquDLgk71iLfo= +knative.dev/serving v0.38.1-0.20231020173818-6b844deb81fc h1:lNU0wJatgHEbMBde9VOiWOGENUMZSun30CN4glH7YRc= +knative.dev/serving v0.38.1-0.20231020173818-6b844deb81fc/go.mod h1:cuia3pUQNF4sa3g3KsPFgqpLnF1pf9iquDLgk71iLfo= 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= diff --git a/vendor/knative.dev/eventing/pkg/apis/feature/features.go b/vendor/knative.dev/eventing/pkg/apis/feature/features.go index add52ff96..a93a9a8d1 100644 --- a/vendor/knative.dev/eventing/pkg/apis/feature/features.go +++ b/vendor/knative.dev/eventing/pkg/apis/feature/features.go @@ -51,11 +51,29 @@ const ( // Missing entry in the map means feature is equal to feature not enabled. type Flags map[string]Flag +func newDefaults() Flags { + return map[string]Flag{ + KReferenceGroup: Disabled, + DeliveryRetryAfter: Disabled, + DeliveryTimeout: Enabled, + KReferenceMapping: Disabled, + NewTriggerFilters: Enabled, + TransportEncryption: Disabled, + OIDCAuthentication: Disabled, + EvenTypeAutoCreate: Disabled, + } +} + // IsEnabled returns true if the feature is enabled func (e Flags) IsEnabled(featureName string) bool { return e != nil && e[featureName] == Enabled } +// IsDisabled returns true if the feature is disabled +func (e Flags) IsDisabled(featureName string) bool { + return e != nil && e[featureName] == Disabled +} + // IsAllowed returns true if the feature is enabled or allowed func (e Flags) IsAllowed(featureName string) bool { return e.IsEnabled(featureName) || (e != nil && e[featureName] == Allowed) @@ -86,7 +104,7 @@ func (e Flags) String() string { // NewFlagsConfigFromMap creates a Flags from the supplied Map func NewFlagsConfigFromMap(data map[string]string) (Flags, error) { - flags := Flags{} + flags := newDefaults() for k, v := range data { if strings.HasPrefix(k, "_") { @@ -100,12 +118,12 @@ func NewFlagsConfigFromMap(data map[string]string) (Flags, error) { flags[sanitizedKey] = Disabled } else if strings.EqualFold(v, string(Enabled)) { flags[sanitizedKey] = Enabled - } else if strings.EqualFold(v, string(Permissive)) { + } else if k == TransportEncryption && strings.EqualFold(v, string(Permissive)) { flags[sanitizedKey] = Permissive - } else if strings.EqualFold(v, string(Strict)) { + } else if k == TransportEncryption && strings.EqualFold(v, string(Strict)) { flags[sanitizedKey] = Strict } else { - return Flags{}, fmt.Errorf("cannot parse the boolean flag '%s' = '%s'. Allowed values: [true, false]", k, v) + return flags, fmt.Errorf("cannot parse the feature flag '%s' = '%s'", k, v) } } diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go b/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go index fe2a43223..5a75031eb 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go @@ -174,10 +174,11 @@ func (rs *RouteStatus) MarkCertificateReady(name string) { // MarkCertificateNotReady marks the RouteConditionCertificateProvisioned // condition to indicate that the Certificate is not ready. -func (rs *RouteStatus) MarkCertificateNotReady(name string) { +func (rs *RouteStatus) MarkCertificateNotReady(c *v1alpha1.Certificate) { + certificateCondition := c.Status.GetCondition("Ready") routeCondSet.Manage(rs).MarkUnknown(RouteConditionCertificateProvisioned, "CertificateNotReady", - "Certificate %s is not ready.", name) + "Certificate %s is not ready: %s", c.Name, certificateCondition.GetReason()) } // MarkCertificateNotOwned changes the RouteConditionCertificateProvisioned @@ -190,10 +191,10 @@ func (rs *RouteStatus) MarkCertificateNotOwned(name string) { } const ( - // AutoTLSNotEnabledMessage is the message which is set on the + // ExternalDomainTLSNotEnabledMessage is the message which is set on the // RouteConditionCertificateProvisioned condition when it is set to True - // because AutoTLS was not enabled. - AutoTLSNotEnabledMessage = "auto-tls is not enabled" + // because external-domain-tls was not enabled. + ExternalDomainTLSNotEnabledMessage = "external-domain-tls is not enabled" // TLSNotEnabledForClusterLocalMessage is the message which is set on the // RouteConditionCertificateProvisioned condition when it is set to True @@ -202,7 +203,7 @@ const ( ) // MarkTLSNotEnabled sets RouteConditionCertificateProvisioned to true when -// certificate config such as auto-tls is not enabled or private cluster-local service. +// certificate config such as external-domain-tls is not enabled or private cluster-local service. func (rs *RouteStatus) MarkTLSNotEnabled(msg string) { routeCondSet.Manage(rs).MarkTrueWithReason(RouteConditionCertificateProvisioned, "TLSNotEnabled", msg) diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go b/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go index 830a65c96..06ede3d31 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go @@ -59,10 +59,10 @@ func (dms *DomainMappingStatus) InitializeConditions() { } const ( - // AutoTLSNotEnabledMessage is the message which is set on the + // ExternalDomainTLSNotEnabledMessage is the message which is set on the // DomainMappingConditionCertificateProvisioned condition when it is set to True - // because AutoTLS was not enabled. - AutoTLSNotEnabledMessage = "auto-tls is not enabled" + // because external-domain-tls was not enabled. + ExternalDomainTLSNotEnabledMessage = "external-domain-tls is not enabled" // TLSCertificateProvidedExternally indicates that a TLS secret won't be created or managed // instead a reference to an existing TLS secret should have been provided in the DomainMapping spec TLSCertificateProvidedExternally = "TLS certificate was provided externally" diff --git a/vendor/modules.txt b/vendor/modules.txt index d8aadb719..1e9c32558 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -963,7 +963,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.38.1-0.20231019170735-4d14c2126a20 +# knative.dev/eventing v0.38.1-0.20231020133954-16a398695622 ## explicit; go 1.19 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent @@ -1070,7 +1070,7 @@ knative.dev/pkg/tracker knative.dev/pkg/version knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates/resources -# knative.dev/serving v0.38.1-0.20231019102212-98960793b828 +# knative.dev/serving v0.38.1-0.20231020173818-6b844deb81fc ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1