grab the latest eventing without ChannelBroker

go.mod

@@ -37,10 +37,10 @@ require (
 	k8s.io/api v0.17.6
 	k8s.io/apimachinery v0.17.6
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
-	knative.dev/eventing v0.15.1-0.20200528004559-c607c293b2a5
-	knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82
-	knative.dev/serving v0.15.1-0.20200528080059-a1de2b9fa410
-	knative.dev/test-infra v0.0.0-20200527191759-5ba38edc41ae
+	knative.dev/eventing v0.15.1-0.20200529161002-7b930d1b5057
+	knative.dev/pkg v0.0.0-20200528190300-08a86da47d28
+	knative.dev/serving v0.15.1-0.20200529155502-1b878b36836e
+	knative.dev/test-infra v0.0.0-20200528222301-350178ab2a0e
 )
 
 replace (

go.sum

@@ -1559,8 +1559,8 @@ k8s.io/utils v0.0.0-20200124190032-861946025e34 h1:HjlUD6M0K3P8nRXmr2B9o4F9dUy9T
 k8s.io/utils v0.0.0-20200124190032-861946025e34/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
 knative.dev/caching v0.0.0-20200521155757-e78d17bc250e/go.mod h1:bsKPIG2XZFYL8uw5BAxg7EMBLp0vNpu9jZIGus8HUPU=
-knative.dev/eventing v0.15.1-0.20200528004559-c607c293b2a5 h1:E+TFONz3UFQGEduwcUDGN619c4Se7LeUi/FogeU5wfE=
-knative.dev/eventing v0.15.1-0.20200528004559-c607c293b2a5/go.mod h1:q2XG7081UX1xW1AEGmKz2PUdhB8t00PjBEdhAuO/IE0=
+knative.dev/eventing v0.15.1-0.20200529161002-7b930d1b5057 h1:U0Ry/j8uGRHDxcqpsM7f5S0O/08tHy7TDnE6nsvgwZA=
+knative.dev/eventing v0.15.1-0.20200529161002-7b930d1b5057/go.mod h1:q2XG7081UX1xW1AEGmKz2PUdhB8t00PjBEdhAuO/IE0=
 knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
 knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
 knative.dev/pkg v0.0.0-20191111150521-6d806b998379/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
@@ -1574,8 +1574,10 @@ knative.dev/pkg v0.0.0-20200520073958-94316e20e860/go.mod h1:QgNZTxnwpB/oSpNcfnL
 knative.dev/pkg v0.0.0-20200527024749-495174c96651/go.mod h1:4ipprwHqpqiyYHbrEjSf1kNwL+sJOqHhj1ujO2WxvpE=
 knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82 h1:uC65bOUmC5UsVJgUI28QWis/oiqnZrU49wLM828ioJM=
 knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM=
-knative.dev/serving v0.15.1-0.20200528080059-a1de2b9fa410 h1:f4FmbgnyFyXGfBPB2ARIMJ77W3hgNqWwIA7M6Gbcq+s=
-knative.dev/serving v0.15.1-0.20200528080059-a1de2b9fa410/go.mod h1:R4ajt2UAbNCdXrQPj1l8DcpJMtDKqS+Pc3H3cvL0TkU=
+knative.dev/pkg v0.0.0-20200528190300-08a86da47d28 h1:tLWWfrpGYT8vs/QLWYc7s0pqaw+ISz4UmM9AhrWBc8o=
+knative.dev/pkg v0.0.0-20200528190300-08a86da47d28/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM=
+knative.dev/serving v0.15.1-0.20200529155502-1b878b36836e h1:mhFy2oNaBq3vS9EzrCtigw67m40QN8E0dyEITx20pdQ=
+knative.dev/serving v0.15.1-0.20200529155502-1b878b36836e/go.mod h1:ebxxoSXTWJjCBdyb3P6KU0kNuVEAUMi22OI2E7mAxxY=
 knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5 h1:BEfxItc0hPeQmojxoiOwbCbmdVz0+L2SYWKUSQeFF8g=
 knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
 knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
@@ -1586,8 +1588,8 @@ knative.dev/test-infra v0.0.0-20200519161858-554a95a37986/go.mod h1:LeNa1Wvn47ef
 knative.dev/test-infra v0.0.0-20200522180958-6a0a9b9d893a/go.mod h1:n9eQkzmSNj8BiqNFl1lzoz68D09uMeJfyOjc132Gbik=
 knative.dev/test-infra v0.0.0-20200527185659-fc87694eb879 h1:3spi67ya78+ofPZLHpJkZlBSj6pBowXa8/1Zdha6MCY=
 knative.dev/test-infra v0.0.0-20200527185659-fc87694eb879/go.mod h1:7JtOmoYiYxh2oFO23nwGanuJ6qT6mFrRlZV1LL6gomY=
-knative.dev/test-infra v0.0.0-20200527191759-5ba38edc41ae h1:6K0AMdNnrSrRqFaBJGbE/xRBPC5n9I9DXTV/hMyCK3k=
-knative.dev/test-infra v0.0.0-20200527191759-5ba38edc41ae/go.mod h1:7JtOmoYiYxh2oFO23nwGanuJ6qT6mFrRlZV1LL6gomY=
+knative.dev/test-infra v0.0.0-20200528222301-350178ab2a0e h1:ZzmzPgCKdrFg2MA2sGtd9HrlIQ7XidnmMJB8RDEduO0=
+knative.dev/test-infra v0.0.0-20200528222301-350178ab2a0e/go.mod h1:7JtOmoYiYxh2oFO23nwGanuJ6qT6mFrRlZV1LL6gomY=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=

vendor/knative.dev/eventing/pkg/apis/eventing/register.go

@@ -29,11 +29,6 @@ const (
 	// which Controller is responsible for them.
 	BrokerClassKey = GroupName + "/broker.class"
 
-	// ChannelBrokerClassValue is the value we use to specify the
-	// Broker using channels. As in Broker from this repository
-	// pkg/reconciler/broker
-	ChannelBrokerClassValue = "ChannelBasedBroker"
-
 	// MTChannelBrokerClassValue is the value we use to specify the
 	// Broker using channels, but the resources (ingress,filter) run
 	// in the system namespace. As in Broker from this repository

vendor/knative.dev/eventing/pkg/apis/messaging/v1beta1/channel_lifecycle.go

@@ -38,8 +38,13 @@ const (
 	ChannelConditionAddressable apis.ConditionType = "Addressable"
 )
 
+// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
+func (*Channel) GetConditionSet() apis.ConditionSet {
+	return chCondSet
+}
+
 // GetGroupVersionKind returns GroupVersionKind for Channels.
-func (dc *Channel) GetGroupVersionKind() schema.GroupVersionKind {
+func (*Channel) GetGroupVersionKind() schema.GroupVersionKind {
 	return SchemeGroupVersion.WithKind("Channel")
 }
 

vendor/knative.dev/eventing/pkg/apis/messaging/v1beta1/channel_types.go

@@ -56,6 +56,9 @@ var (
 
 	// Check that we can create OwnerReferences to a Channel.
 	_ kmeta.OwnerRefable = (*Channel)(nil)
+
+	// Check that the type conforms to the duck Knative Resource shape.
+	_ duckv1.KRShaped = (*Channel)(nil)
 )
 
 // ChannelSpec defines which subscribers have expressed interest in receiving events from this Channel.
@@ -87,3 +90,8 @@ type ChannelList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Channel `json:"items"`
 }
+
+// GetStatus retrieves the status of the Channel. Implements the KRShaped interface.
+func (t *Channel) GetStatus() *duckv1.Status {
+	return &t.Status.Status
+}

vendor/knative.dev/eventing/pkg/apis/messaging/v1beta1/in_memory_channel_lifecycle.go

@@ -53,8 +53,13 @@ const (
 	InMemoryChannelConditionChannelServiceReady apis.ConditionType = "ChannelServiceReady"
 )
 
+// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
+func (*InMemoryChannel) GetConditionSet() apis.ConditionSet {
+	return imcCondSet
+}
+
 // GetGroupVersionKind returns GroupVersionKind for InMemoryChannels
-func (imc *InMemoryChannel) GetGroupVersionKind() schema.GroupVersionKind {
+func (*InMemoryChannel) GetGroupVersionKind() schema.GroupVersionKind {
 	return SchemeGroupVersion.WithKind("InMemoryChannel")
 }
 

vendor/knative.dev/eventing/pkg/apis/messaging/v1beta1/in_memory_channel_types.go

@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	eventingduckv1beta1 "knative.dev/eventing/pkg/apis/duck/v1beta1"
 	"knative.dev/pkg/apis"
+	duckv1 "knative.dev/pkg/apis/duck/v1"
 	"knative.dev/pkg/kmeta"
 )
 
@@ -55,6 +56,9 @@ var (
 
 	// Check that we can create OwnerReferences to an InMemoryChannel.
 	_ kmeta.OwnerRefable = (*InMemoryChannel)(nil)
+
+	// Check that the type conforms to the duck Knative Resource shape.
+	_ duckv1.KRShaped = (*InMemoryChannel)(nil)
 )
 
 // InMemoryChannelSpec defines which subscribers have expressed interest in
@@ -80,3 +84,8 @@ type InMemoryChannelList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []InMemoryChannel `json:"items"`
 }
+
+// GetStatus retrieves the status of the InMemoryChannel. Implements the KRShaped interface.
+func (t *InMemoryChannel) GetStatus() *duckv1.Status {
+	return &t.Status.Status
+}

vendor/knative.dev/eventing/pkg/apis/messaging/v1beta1/subscription_lifecycle.go

@@ -20,7 +20,7 @@ import (
 	"knative.dev/pkg/apis"
 )
 
-// subCondSet is a condition set with Ready as the happy condition and
+// SubCondSet is a condition set with Ready as the happy condition and
 // ReferencesResolved and ChannelReady as the dependent conditions.
 var SubCondSet = apis.NewLivingConditionSet(SubscriptionConditionReferencesResolved, SubscriptionConditionAddedToChannel, SubscriptionConditionChannelReady)
 
@@ -39,6 +39,11 @@ const (
 	SubscriptionConditionChannelReady apis.ConditionType = "ChannelReady"
 )
 
+// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
+func (*Subscription) GetConditionSet() apis.ConditionSet {
+	return SubCondSet
+}
+
 // GetCondition returns the condition currently associated with the given type, or nil.
 func (ss *SubscriptionStatus) GetCondition(t apis.ConditionType) *apis.Condition {
 	return SubCondSet.Manage(ss).GetCondition(t)

vendor/knative.dev/eventing/pkg/apis/messaging/v1beta1/subscription_types.go

@@ -54,6 +54,9 @@ var (
 
 	// Check that we can create OwnerReferences to a Subscription.
 	_ kmeta.OwnerRefable = (*Subscription)(nil)
+
+	// Check that the type conforms to the duck Knative Resource shape.
+	_ duckv1.KRShaped = (*Subscription)(nil)
 )
 
 // SubscriptionSpec specifies the Channel for incoming events, a Subscriber target
@@ -138,11 +141,16 @@ type SubscriptionList struct {
 }
 
 // GetGroupVersionKind returns GroupVersionKind for Subscriptions
-func (t *Subscription) GetGroupVersionKind() schema.GroupVersionKind {
+func (*Subscription) GetGroupVersionKind() schema.GroupVersionKind {
 	return SchemeGroupVersion.WithKind("Subscription")
 }
 
 // GetUntypedSpec returns the spec of the Subscription.
 func (s *Subscription) GetUntypedSpec() interface{} {
 	return s.Spec
 }
+
+// GetStatus retrieves the status of the Subscription. Implements the KRShaped interface.
+func (s *Subscription) GetStatus() *duckv1.Status {
+	return &s.Status.Status
+}