Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/eventing df08b49...3267b1a:%0A  > 3267b1a test SinkBinding with eventshub TLS receiver as sink (# 6979)%0A  > aad53f4 Updated eventingtls test certs to support IP addresses (# 7006)%0A  > 57d78e0 [main] Update community files (# 7004)%0A  > dfb2243 Support TLS in Trigger and Channel reconciler (# 6988)%0Abumping knative.dev/serving 349b2d6...5a90438:%0A  > 5a90438 Update net-istio nightly (# 14091)%0A  > dc0692a Update net-istio nightly (# 14088)%0A  > 0fbd780 Update net-certmanager nightly (# 14087)%0A  > 6f63c98 Update net-kourier nightly (# 14086)%0A  > e74f5f4 Update net-gateway-api nightly (# 14085)%0A  > 1587070 Update net-kourier nightly (# 14081)%0A  > 2e00e9f Update net-certmanager nightly (# 14080)%0A  > a3c7864 Update net-istio nightly (# 14078)%0A  > 384b889 Update net-gateway-api nightly (# 14077)%0A  > 7d0f963 Change storage version of DomainMapping to v1beta1 (# 14058)%0A  > e8b6f05 Update net-gateway-api nightly (# 14068)%0A  > 41e4212 Get certificate reconciler from `networking` instead of `control-protocol` (# 14072)%0A  > e71b933 Update net-certmanager nightly (# 14070)%0A  > 8f516b6 Update net-kourier nightly (# 14069)%0A  > a2bb4aa upgrade to latest dependencies (# 14071)%0A  > c95f17b Update community files (# 14067)%0A  > bf48e64 Remove deprecated internalEncryption dependency (# 14064)%0A  > 6b87d67 Update net-istio nightly (# 14065)%0A  > fbecf34 refactor throttler_test.go (# 14055)%0Abumping knative.dev/hack 5b7907f...a861c8e:%0A  > a861c8e Update community files (# 294)%0Abumping knative.dev/pkg 5671699...94b81fc:%0A  > 94b81fc Update community files (# 2752)%0Abumping knative.dev/client-pkg 83c91f4...b93ceb0:%0A  > b93ceb0 Update community files (# 105)%0Abumping knative.dev/networking 2a2f7d2...14a2bd4:%0A  > 14a2bd4 Move `pkg/certificates` from `control-protocol` to `networking` (# 802)%0A  > 2daa483 Update community files (# 813)%0A  > 0dbe4f9 upgrade to latest dependencies (# 812)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
knative-automation committed Jun 12, 2023
1 parent 529957e commit 4badd38
Show file tree
Hide file tree
Showing 17 changed files with 116 additions and 43 deletions.
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ require (
k8s.io/api v0.26.5
k8s.io/apimachinery v0.26.5
k8s.io/client-go v1.5.2
knative.dev/client-pkg v0.0.0-20230524014834-83c91f47f64f
knative.dev/eventing v0.37.1-0.20230601130337-df08b49b7477
knative.dev/hack v0.0.0-20230530201435-5b7907fbe350
knative.dev/pkg v0.0.0-20230531073936-5671699f23d9
knative.dev/serving v0.37.1-0.20230603021539-349b2d61b0e8
knative.dev/client-pkg v0.0.0-20230606015531-b93ceb0dd4f1
knative.dev/eventing v0.37.1-0.20230609122959-3267b1aae34f
knative.dev/hack v0.0.0-20230606014732-a861c8e9da08
knative.dev/pkg v0.0.0-20230606013829-94b81fcefb58
knative.dev/serving v0.37.1-0.20230609130759-5a90438bbd9d
)

require (
Expand Down Expand Up @@ -243,7 +243,7 @@ require (
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
knative.dev/networking v0.0.0-20230524170920-2a2f7d2d7c60 // indirect
knative.dev/networking v0.0.0-20230606132626-14a2bd466ad6 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
Expand Down
40 changes: 40 additions & 0 deletions go.sum

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions vendor/knative.dev/eventing/pkg/apis/duck/v1/delivery_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,26 @@ type DeliveryStatus struct {
// where failed events are sent to.
// +optional
DeadLetterSinkURI *apis.URL `json:"deadLetterSinkUri,omitempty"`
// DeadLetterSinkCACerts are Certification Authority (CA) certificates in PEM format
// according to https://www.rfc-editor.org/rfc/rfc7468.
// +optional
DeadLetterSinkCACerts *string `json:"deadLetterSinkCACerts,omitempty"`
}

func (ds *DeliveryStatus) IsSet() bool {
return ds.DeadLetterSinkURI != nil
}

func NewDeliveryStatusFromAddressable(addr *duckv1.Addressable) DeliveryStatus {
return DeliveryStatus{
DeadLetterSinkURI: addr.URL,
DeadLetterSinkCACerts: addr.CACerts,
}
}

func NewDestinationFromDeliveryStatus(status DeliveryStatus) duckv1.Destination {
return duckv1.Destination{
URI: status.DeadLetterSinkURI,
CACerts: status.DeadLetterSinkCACerts,
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (

"knative.dev/pkg/apis"
v1 "knative.dev/pkg/apis/duck/v1"

eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
)

const (
Expand Down Expand Up @@ -104,17 +106,17 @@ func (bs *BrokerStatus) InitializeConditions() {
bs.GetConditionSet().Manage(bs).InitializeConditions()
}

func (bs *BrokerStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSinkURI *apis.URL) {
bs.DeadLetterSinkURI = deadLetterSinkURI
func (bs *BrokerStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSink eventingduck.DeliveryStatus) {
bs.DeliveryStatus = deadLetterSink
bs.GetConditionSet().Manage(bs).MarkTrue(BrokerConditionDeadLetterSinkResolved)
}

func (bs *BrokerStatus) MarkDeadLetterSinkNotConfigured() {
bs.DeadLetterSinkURI = nil
bs.DeliveryStatus = eventingduck.DeliveryStatus{}
bs.GetConditionSet().Manage(bs).MarkTrueWithReason(BrokerConditionDeadLetterSinkResolved, "DeadLetterSinkNotConfigured", "No dead letter sink is configured.")
}

func (bs *BrokerStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) {
bs.DeadLetterSinkURI = nil
bs.DeliveryStatus = eventingduck.DeliveryStatus{}
bs.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ package v1
import (
corev1 "k8s.io/api/core/v1"

eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"

eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
)

type testHelper struct{}
Expand Down Expand Up @@ -61,7 +62,7 @@ func (t testHelper) ReadyBrokerStatus() *BrokerStatus {
bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus())
bs.PropagateFilterAvailability(t.AvailableEndpoints())
bs.SetAddress(apis.HTTP("example.com"))
bs.MarkDeadLetterSinkResolvedSucceeded(nil)
bs.MarkDeadLetterSinkResolvedSucceeded(eventingduckv1.DeliveryStatus{})
return bs
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package v1
import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"

eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
)

var chCondSet = apis.NewLivingConditionSet(
Expand Down Expand Up @@ -131,17 +132,17 @@ func (cs *ChannelStatus) PropagateStatuses(chs *eventingduck.ChannelableStatus)
cs.SubscribableStatus = chs.SubscribableStatus
}

func (cs *ChannelStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSinkURI *apis.URL) {
cs.DeliveryStatus.DeadLetterSinkURI = deadLetterSinkURI
func (cs *ChannelStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSink eventingduck.DeliveryStatus) {
cs.DeliveryStatus = deadLetterSink
chCondSet.Manage(cs).MarkTrue(ChannelConditionDeadLetterSinkResolved)
}

func (cs *ChannelStatus) MarkDeadLetterSinkNotConfigured() {
cs.DeadLetterSinkURI = nil
cs.DeliveryStatus = eventingduck.DeliveryStatus{}
chCondSet.Manage(cs).MarkTrueWithReason(ChannelConditionDeadLetterSinkResolved, "DeadLetterSinkNotConfigured", "No dead letter sink is configured.")
}

func (cs *ChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) {
cs.DeadLetterSinkURI = nil
cs.DeliveryStatus = eventingduck.DeliveryStatus{}
chCondSet.Manage(cs).MarkFalse(ChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
"k8s.io/utils/pointer"
"knative.dev/pkg/apis"
v1 "knative.dev/pkg/apis/duck/v1"

eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
)

var imcCondSet = apis.NewLivingConditionSet(
Expand Down Expand Up @@ -97,10 +99,10 @@ func (imcs *InMemoryChannelStatus) InitializeConditions() {
imcCondSet.Manage(imcs).InitializeConditions()
}

func (imcs *InMemoryChannelStatus) SetAddress(url *apis.URL) {
imcs.Address = &v1.Addressable{URL: url}
if url != nil {
imcs.Address.Name = pointer.String(url.Scheme)
func (imcs *InMemoryChannelStatus) SetAddress(addr *v1.Addressable) {
imcs.Address = addr
if addr != nil && addr.URL != nil {
imcs.Address.Name = pointer.String(addr.URL.Scheme)
imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionAddressable)
} else {
imcCondSet.Manage(imcs).MarkFalse(InMemoryChannelConditionAddressable, "emptyHostname", "hostname is the empty string")
Expand Down Expand Up @@ -166,17 +168,17 @@ func (imcs *InMemoryChannelStatus) MarkEndpointsTrue() {
imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionEndpointsReady)
}

func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedSucceeded(deadLetterSinkURI *apis.URL) {
imcs.DeliveryStatus.DeadLetterSinkURI = deadLetterSinkURI
func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedSucceeded(ds eventingduck.DeliveryStatus) {
imcs.DeliveryStatus = ds
imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionDeadLetterSinkResolved)
}

func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkNotConfigured() {
imcs.DeadLetterSinkURI = nil
imcs.DeliveryStatus = eventingduck.DeliveryStatus{}
imcCondSet.Manage(imcs).MarkTrueWithReason(InMemoryChannelConditionDeadLetterSinkResolved, "DeadLetterSinkNotConfigured", "No dead letter sink is configured.")
}

func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) {
imcs.DeadLetterSinkURI = nil
imcs.DeliveryStatus = eventingduck.DeliveryStatus{}
imcCondSet.Manage(imcs).MarkFalse(InMemoryChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (c *Certificate) Validate(ctx context.Context) *apis.FieldError {
}

// Validate inspects and validates CertificateSpec object.
func (spec *CertificateSpec) Validate(ctx context.Context) (all *apis.FieldError) {
func (spec *CertificateSpec) Validate(_ context.Context) (all *apis.FieldError) {
// Spec must have at least one DNS Name.
if len(spec.DNSNames) == 0 {
all = all.Also(apis.ErrMissingField("dnsNames"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ func (d *Domain) SetDefaults(ctx context.Context) {
}

// SetDefaults populates default values in DomainSpec
func (*DomainSpec) SetDefaults(ctx context.Context) {
func (*DomainSpec) SetDefaults(_ context.Context) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ func (ds *DomainSpec) Validate(ctx context.Context) *apis.FieldError {
return all
}

func (lb *LoadBalancerIngressSpec) Validate(ctx context.Context) *apis.FieldError {
func (lb *LoadBalancerIngressSpec) Validate(_ context.Context) *apis.FieldError {
var all *apis.FieldError
if lb.Domain == "" && lb.DomainInternal == "" && lb.IP == "" && !lb.MeshOnly {
return all.Also(apis.ErrMissingOneOf("domain", "domainInternal", "ip", "meshOnly"))
}
return all
}

func (cfg *IngressConfig) Validate(ctx context.Context) *apis.FieldError {
func (cfg *IngressConfig) Validate(_ context.Context) *apis.FieldError {
var all *apis.FieldError
if cfg.Name == "" {
all = all.Also(apis.ErrMissingField("name"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (is *IngressSpec) SetDefaults(ctx context.Context) {
}

// SetDefaults populates default values in IngressTLS
func (t *IngressTLS) SetDefaults(ctx context.Context) {}
func (t *IngressTLS) SetDefaults(_ context.Context) {}

// SetDefaults populates default values in IngressRule
func (r *IngressRule) SetDefaults(ctx context.Context) {
Expand All @@ -56,7 +56,7 @@ func (h *HTTPIngressRuleValue) SetDefaults(ctx context.Context) {
}

// SetDefaults populates default values in HTTPIngressPath
func (h *HTTPIngressPath) SetDefaults(ctx context.Context) {
func (h *HTTPIngressPath) SetDefaults(_ context.Context) {
// If only one split is specified, we default to 100.
if len(h.Splits) == 1 && h.Splits[0].Percent == 0 {
h.Splits[0].Percent = 100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (b IngressBackend) Validate(ctx context.Context) *apis.FieldError {
}

// Validate inspects and validates IngressTLS object.
func (t *IngressTLS) Validate(ctx context.Context) *apis.FieldError {
func (t *IngressTLS) Validate(_ context.Context) *apis.FieldError {
// Provided TLS setting must not be empty.
if equality.Semantic.DeepEqual(t, &IngressTLS{}) {
return apis.ErrMissingField(apis.CurrentField)
Expand All @@ -168,7 +168,7 @@ func (t *IngressTLS) Validate(ctx context.Context) *apis.FieldError {
return all
}

func (t HTTPOption) Validate(ctx context.Context) (all *apis.FieldError) {
func (t HTTPOption) Validate(_ context.Context) (all *apis.FieldError) {
switch t {
case "", HTTPOptionEnabled, HTTPOptionRedirected:
break
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ func (r *Realm) SetDefaults(ctx context.Context) {
}

// SetDefaults populates default values in RealmSpec
func (*RealmSpec) SetDefaults(ctx context.Context) {
func (*RealmSpec) SetDefaults(_ context.Context) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (r *Realm) Validate(ctx context.Context) *apis.FieldError {
}

// Validate inspects and validates RealmSpec object.
func (rs *RealmSpec) Validate(ctx context.Context) *apis.FieldError {
func (rs *RealmSpec) Validate(_ context.Context) *apis.FieldError {
var all *apis.FieldError
if rs.External == "" && rs.Internal == "" {
all = all.Also(apis.ErrMissingOneOf("external", "internal"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ func (ss *ServerlessService) SetDefaults(ctx context.Context) {
}

// SetDefaults sets default values on the ServerlessServiceSpec.
func (*ServerlessServiceSpec) SetDefaults(ctx context.Context) {
func (*ServerlessServiceSpec) SetDefaults(_ context.Context) {
// Nothing is defaultable so far.
}
12 changes: 6 additions & 6 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/client-pkg v0.0.0-20230524014834-83c91f47f64f
# knative.dev/client-pkg v0.0.0-20230606015531-b93ceb0dd4f1
## explicit; go 1.18
knative.dev/client-pkg/pkg/apis/client
knative.dev/client-pkg/pkg/apis/client/v1alpha1
Expand All @@ -1707,7 +1707,7 @@ knative.dev/client-pkg/pkg/serving/v1
knative.dev/client-pkg/pkg/util
knative.dev/client-pkg/pkg/util/test
knative.dev/client-pkg/pkg/wait
# knative.dev/eventing v0.37.1-0.20230601130337-df08b49b7477
# knative.dev/eventing v0.37.1-0.20230609122959-3267b1aae34f
## explicit; go 1.19
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
Expand All @@ -1728,10 +1728,10 @@ knative.dev/eventing/pkg/apis/sources/v1
knative.dev/eventing/pkg/apis/sources/v1beta2
knative.dev/eventing/pkg/client/clientset/versioned/scheme
knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1
# knative.dev/hack v0.0.0-20230530201435-5b7907fbe350
# knative.dev/hack v0.0.0-20230606014732-a861c8e9da08
## explicit; go 1.18
knative.dev/hack
# knative.dev/networking v0.0.0-20230524170920-2a2f7d2d7c60
# knative.dev/networking v0.0.0-20230606132626-14a2bd466ad6
## explicit; go 1.18
knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking
Expand All @@ -1743,7 +1743,7 @@ knative.dev/networking/pkg/http/probe
knative.dev/networking/pkg/http/proxy
knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/k8s
# knative.dev/pkg v0.0.0-20230531073936-5671699f23d9
# knative.dev/pkg v0.0.0-20230606013829-94b81fcefb58
## explicit; go 1.18
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down Expand Up @@ -1786,7 +1786,7 @@ knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker
knative.dev/pkg/webhook/resourcesemantics
# knative.dev/serving v0.37.1-0.20230603021539-349b2d61b0e8
# knative.dev/serving v0.37.1-0.20230609130759-5a90438bbd9d
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit 4badd38

Please sign in to comment.