Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/hack 815cd31...47ac3b0:
  > 47ac3b0 Split build tags that are in a comma separated list (# 83)
  > 8687668 [# 50] Add error message when Bash < 4 (# 79)
  > 8d79600 Fixes # 81 (# 82)
  > 51582ce fix misspelling functionallity -> functionality (# 78)
  > 675e1fd Correctly specify the user when creating clusterrolebinding for kind (# 80)
bumping knative.dev/pkg fa2f8f1...a34efd6:
  > a34efd6 upgrade to latest dependencies (# 2317)
  > ecdde77 Update actions (# 2316)
  > 3463dd7 upgrade to latest dependencies (# 2315)
  > a5bb759 upgrade to latest dependencies (# 2314)
  > e61a20d Update actions (# 2313)
  > 0e24b49 Format go code (# 2312)
bumping knative.dev/eventing a6a819d...a34aaa0:
  > a34aaa0 💄 It's a deadLetterSink that we define. It is not a queue (# 5824)
  > eb87183 fixing COC doc (# 5774)
  > d98ae8c Fix broker status dlquri (# 5793)
  > 7ab2c01 upgrade to latest dependencies (# 5822)
  > 5f69768 upgrade to latest dependencies (# 5817)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation committed Oct 19, 2021
1 parent a7d8f8f commit af87067
Show file tree
Hide file tree
Showing 33 changed files with 135 additions and 26 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ require (
k8s.io/client-go v0.21.4
k8s.io/code-generator v0.21.4
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
knative.dev/eventing v0.26.1-0.20211014072442-a6a819dc71cf
knative.dev/hack v0.0.0-20210806075220-815cd312d65c
knative.dev/pkg v0.0.0-20211013152848-fa2f8f19557b
knative.dev/eventing v0.26.1-0.20211018174236-a34aaa09f7d2
knative.dev/hack v0.0.0-20211018110626-47ac3b032e60
knative.dev/pkg v0.0.0-20211018141937-a34efd6b409d
)

replace (
Expand Down
17 changes: 10 additions & 7 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1169,15 +1169,18 @@ k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7Br
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/eventing v0.26.1-0.20211014072442-a6a819dc71cf h1:p98Lp6JG++VkS5j/N4Z0dXikE0bWKKFVHd/CE8Coe/M=
knative.dev/eventing v0.26.1-0.20211014072442-a6a819dc71cf/go.mod h1:UnVWSe2+tDUOaGvAtPsszRp23p0zPw5vO/dpranR2mo=
knative.dev/hack v0.0.0-20210806075220-815cd312d65c h1:nOXoDWAAItwr4o0dp3nHr6skgpVD4IvME/UX84YNl5k=
knative.dev/eventing v0.26.1-0.20211018174236-a34aaa09f7d2 h1:swssIAfHq5JFc3DE9H/q1DPWuNfQeItvpTRqgQ/SosA=
knative.dev/eventing v0.26.1-0.20211018174236-a34aaa09f7d2/go.mod h1:1wNHd0x3B1xf9wRTsS8Rf2MKo+b2PJvRHIOY/Zro0y4=
knative.dev/hack v0.0.0-20210806075220-815cd312d65c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack/schema v0.0.0-20210806075220-815cd312d65c/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
knative.dev/hack v0.0.0-20211015200324-86876688e735/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211018110626-47ac3b032e60 h1:wLv7s/AGWmv4Y6GhsDNP62BYFfz/xgiM+JylTD201eo=
knative.dev/hack v0.0.0-20211018110626-47ac3b032e60/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack/schema v0.0.0-20211018110626-47ac3b032e60/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
knative.dev/pkg v0.0.0-20210914164111-4857ab6939e3/go.mod h1:jMSqkNMsrzuy+XR4Yr/BMy7SDVbUOl3KKB6+5MR+ZU8=
knative.dev/pkg v0.0.0-20211013152848-fa2f8f19557b h1:k7qT8TtdbyU4koLF745VoBaM5EpUQlV2f13syN8f5L0=
knative.dev/pkg v0.0.0-20211013152848-fa2f8f19557b/go.mod h1:r27D20afKNeK+9aNOg+0qMv8JgQcyeP+CAYQIR1jEQY=
knative.dev/reconciler-test v0.0.0-20210930064245-45904ca4383d/go.mod h1:6yDmb26SINSmgw6wVy9qQwgRMewiW8ddkkwGLR0ZvOY=
knative.dev/pkg v0.0.0-20211018071527-3463dd75659d/go.mod h1:KztVeIX2/Sp2PNRZmqjVe16bweUjLsCQKNKp36tAnSM=
knative.dev/pkg v0.0.0-20211018141937-a34efd6b409d h1:iF1JvghwOwpUbt+W1S5+hAnaXrU2jtkhMLmbpJ/lh6s=
knative.dev/pkg v0.0.0-20211018141937-a34efd6b409d/go.mod h1:/d1+Wklc8blR39M4oEBu+GeLav4vsiiJwq61tJay7mc=
knative.dev/reconciler-test v0.0.0-20211018075026-816dbd1c57f7/go.mod h1:6yDmb26SINSmgw6wVy9qQwgRMewiW8ddkkwGLR0ZvOY=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
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=
Expand Down

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

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 @@ -23,18 +23,20 @@ import (
)

const (
BrokerConditionReady = apis.ConditionReady
BrokerConditionIngress apis.ConditionType = "IngressReady"
BrokerConditionTriggerChannel apis.ConditionType = "TriggerChannelReady"
BrokerConditionFilter apis.ConditionType = "FilterReady"
BrokerConditionAddressable apis.ConditionType = "Addressable"
BrokerConditionReady = apis.ConditionReady
BrokerConditionIngress apis.ConditionType = "IngressReady"
BrokerConditionTriggerChannel apis.ConditionType = "TriggerChannelReady"
BrokerConditionFilter apis.ConditionType = "FilterReady"
BrokerConditionAddressable apis.ConditionType = "Addressable"
BrokerConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved"
)

var brokerCondSet = apis.NewLivingConditionSet(
BrokerConditionIngress,
BrokerConditionTriggerChannel,
BrokerConditionFilter,
BrokerConditionAddressable,
BrokerConditionDeadLetterSinkResolved,
)
var brokerCondSetLock = sync.RWMutex{}

Expand Down Expand Up @@ -94,3 +96,18 @@ func (b *Broker) IsReady() bool {
func (bs *BrokerStatus) InitializeConditions() {
bs.GetConditionSet().Manage(bs).InitializeConditions()
}

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

func (bs *BrokerStatus) MarkDeadLetterSinkNotConfigured() {
bs.DeadLetterSinkURI = nil
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.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ func (bs *BrokerStatus) PropagateTriggerChannelReadiness(cs *duckv1.ChannelableS
}
}

func (bs *BrokerStatus) MarkBrokerAddressableUnknown(reason, format string, args ...interface{}) {
bs.GetConditionSet().Manage(bs).MarkUnknown(BrokerConditionAddressable, reason, format, args...)
}

func (bs *BrokerStatus) MarkFilterFailed(reason, format string, args ...interface{}) {
bs.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionFilter, reason, format, args...)
}
Expand Down
11 changes: 11 additions & 0 deletions vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,17 @@ func (t testHelper) ReadyBrokerStatus() *BrokerStatus {
bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus())
bs.PropagateFilterAvailability(t.AvailableEndpoints())
bs.SetAddress(apis.HTTP("example.com"))
bs.MarkDeadLetterSinkResolvedSucceeded(nil)
return bs
}

func (t testHelper) ReadyBrokerStatusWithoutDLS() *BrokerStatus {
bs := &BrokerStatus{}
bs.PropagateIngressAvailability(t.AvailableEndpoints())
bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus())
bs.PropagateFilterAvailability(t.AvailableEndpoints())
bs.SetAddress(apis.HTTP("example.com"))
bs.MarkDeadLetterSinkNotConfigured()
return bs
}

Expand Down

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

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 @@ -96,7 +96,7 @@ type ParallelBranch struct {
Reply *duckv1.Destination `json:"reply,omitempty"`

// Delivery is the delivery specification for events to the subscriber
// This includes things like retries, DLQ, etc.
// This includes things like retries, DLS, etc.
// +optional
Delivery *eventingduckv1.DeliverySpec `json:"delivery,omitempty"`
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ type SequenceStep struct {
duckv1.Destination `json:",inline"`

// Delivery is the delivery specification for events to the subscriber
// This includes things like retries, DLQ, etc.
// This includes things like retries, DLS, etc.
// +optional
Delivery *eventingduckv1.DeliverySpec `json:"delivery,omitempty"`
}
Expand Down

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

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 @@ -24,7 +24,11 @@ import (
duckv1 "knative.dev/pkg/apis/duck/v1"
)

var chCondSet = apis.NewLivingConditionSet(ChannelConditionBackingChannelReady, ChannelConditionAddressable)
var chCondSet = apis.NewLivingConditionSet(
ChannelConditionBackingChannelReady,
ChannelConditionAddressable,
ChannelConditionDeadLetterSinkResolved,
)

const (
// ChannelConditionReady has status True when all subconditions below have been set to True.
Expand All @@ -36,6 +40,10 @@ const (
// ChannelConditionAddressable has status true when this Channel meets
// the Addressable contract and has a non-empty hostname.
ChannelConditionAddressable apis.ConditionType = "Addressable"

// ChannelConditionDeadLetterSinkResolved has status True when there is a Dead Letter Sink ref or URI
// defined in the Spec.Delivery, is a valid destination and its correctly resolved into a valid URI
ChannelConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved"
)

// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
Expand Down Expand Up @@ -122,3 +130,18 @@ func (cs *ChannelStatus) PropagateStatuses(chs *eventingduck.ChannelableStatus)
// Set the subscribable status.
cs.SubscribableStatus = chs.SubscribableStatus
}

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

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

func (cs *ChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) {
cs.DeadLetterSinkURI = nil
chCondSet.Manage(cs).MarkFalse(ChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ import (
v1 "knative.dev/pkg/apis/duck/v1"
)

var imcCondSet = apis.NewLivingConditionSet(InMemoryChannelConditionDispatcherReady, InMemoryChannelConditionServiceReady, InMemoryChannelConditionEndpointsReady, InMemoryChannelConditionAddressable, InMemoryChannelConditionChannelServiceReady)
var imcCondSet = apis.NewLivingConditionSet(
InMemoryChannelConditionDispatcherReady,
InMemoryChannelConditionServiceReady,
InMemoryChannelConditionEndpointsReady,
InMemoryChannelConditionAddressable,
InMemoryChannelConditionChannelServiceReady,
InMemoryChannelConditionDeadLetterSinkResolved,
)

const (
// InMemoryChannelConditionReady has status True when all subconditions below have been set to True.
Expand All @@ -51,6 +58,10 @@ const (
// InMemoryChannelConditionServiceReady has status True when a k8s Service representing the channel is ready.
// Because this uses ExternalName, there are no endpoints to check.
InMemoryChannelConditionChannelServiceReady apis.ConditionType = "ChannelServiceReady"

// InMemoryChannelConditionDeadLetterSinkResolved has status True when there is a Dead Letter Sink ref or URI
// defined in the Spec.Delivery, is a valid destination and its correctly resolved into a valid URI
InMemoryChannelConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved"
)

// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
Expand Down Expand Up @@ -153,3 +164,18 @@ func (imcs *InMemoryChannelStatus) MarkEndpointsUnknown(reason, messageFormat st
func (imcs *InMemoryChannelStatus) MarkEndpointsTrue() {
imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionEndpointsReady)
}

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

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

func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) {
imcs.DeadLetterSinkURI = nil
imcCondSet.Manage(imcs).MarkFalse(InMemoryChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
}

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

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

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

2 changes: 1 addition & 1 deletion vendor/knative.dev/hack/hack.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ limitations under the License.
*/

// package hack is a collection of scripts used to bootstrap CI processes and
// other vital entrypoint functionallity.
// other vital entrypoint functionality.

package hack
2 changes: 1 addition & 1 deletion vendor/knative.dev/hack/infra-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function acquire_cluster_admin_role() {
--clusterrole=cluster-admin --user="$(gcloud config get-value core/account)"
else
kubectl create clusterrolebinding cluster-admin-binding \
--clusterrole=cluster-admin --user="${USER}"
--clusterrole=cluster-admin --user="prow"
fi
fi
}
Expand Down
6 changes: 6 additions & 0 deletions vendor/knative.dev/hack/library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
# to be used in test scripts and the like. It doesn't do anything when
# called from command line.

# Exit early with a message if Bash version is below 4
if [ "${BASH_VERSINFO:-0}" -le 4 ]; then
echo "library.sh script needs Bash version >=4 to run"
exit 1
fi

# GCP project where all tests related resources live
readonly KNATIVE_TESTS_PROJECT=knative-tests

Expand Down
4 changes: 2 additions & 2 deletions vendor/knative.dev/hack/presubmit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function default_build_test_runner() {
local tags
tags="$(grep -r '// +build' . \
| grep -v '^./vendor/' | grep -v '^./hack/' | grep -v '^./third_party' \
| cut -f3 -d' ' | sort | uniq | tr '\n' ' ')"
| cut -f3 -d' ' | tr ',' '\n' | sort | uniq | tr '\n' ' ')"
local tagged_pkgs
tagged_pkgs="$(grep -r '// +build' . \
| grep -v '^./vendor/' | grep -v '^./hack/' | grep -v '^./third_party' \
Expand Down Expand Up @@ -307,7 +307,7 @@ function main() {
fi
fi

[[ -z $1 ]] && set -- "--all-tests"
[[ -z ${1:-} ]] && set -- "--all-tests"

local TESTS_TO_RUN=()

Expand Down

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

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

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

1 change: 1 addition & 0 deletions vendor/knative.dev/pkg/apis/zz_generated.deepcopy.go

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

1 change: 1 addition & 0 deletions vendor/knative.dev/pkg/hack/tools.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build tools
// +build tools

/*
Expand Down
1 change: 1 addition & 0 deletions vendor/knative.dev/pkg/logging/zz_generated.deepcopy.go

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

1 change: 1 addition & 0 deletions vendor/knative.dev/pkg/metrics/zz_generated.deepcopy.go

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

1 change: 1 addition & 0 deletions vendor/knative.dev/pkg/signals/signal_posix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down

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

1 change: 1 addition & 0 deletions vendor/knative.dev/pkg/tracker/zz_generated.deepcopy.go

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

6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ k8s.io/utils/buffer
k8s.io/utils/integer
k8s.io/utils/pointer
k8s.io/utils/trace
# knative.dev/eventing v0.26.1-0.20211014072442-a6a819dc71cf
# knative.dev/eventing v0.26.1-0.20211018174236-a34aaa09f7d2
## explicit
knative.dev/eventing/pkg/adapter/v2
knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
Expand Down Expand Up @@ -1035,10 +1035,10 @@ knative.dev/eventing/pkg/client/injection/client
knative.dev/eventing/pkg/kncloudevents
knative.dev/eventing/pkg/metrics
knative.dev/eventing/pkg/metrics/source
# knative.dev/hack v0.0.0-20210806075220-815cd312d65c
# knative.dev/hack v0.0.0-20211018110626-47ac3b032e60
## explicit
knative.dev/hack
# knative.dev/pkg v0.0.0-20211013152848-fa2f8f19557b
# knative.dev/pkg v0.0.0-20211018141937-a34efd6b409d
## explicit
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down

0 comments on commit af87067

Please sign in to comment.