Automatic generation bump for apis/messaging (#3243)

* Add common logic tag and generate * Remove generation bump from reconciler
knative · Jun 2, 2020 · 84bc12a · 84bc12a
1 parent f53778b
commit 84bc12a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 6 deletions.
diff --git a/pkg/apis/messaging/v1beta1/channel_types.go b/pkg/apis/messaging/v1beta1/channel_types.go
@@ -26,7 +26,7 @@ import (
 )
 
 // +genclient
-// +genreconciler
+// +genreconciler:krshapedlogic=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Channel represents a generic Channel. It is normally used when we want a Channel, but don't need a specific Channel implementation.

diff --git a/pkg/apis/messaging/v1beta1/in_memory_channel_types.go b/pkg/apis/messaging/v1beta1/in_memory_channel_types.go
@@ -26,7 +26,7 @@ import (
 )
 
 // +genclient
-// +genreconciler
+// +genreconciler:krshapedlogic=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // InMemoryChannel is a resource representing an in memory channel

diff --git a/pkg/apis/messaging/v1beta1/subscription_types.go b/pkg/apis/messaging/v1beta1/subscription_types.go
@@ -29,7 +29,7 @@ import (
 )
 
 // +genclient
-// +genreconciler
+// +genreconciler:krshapedlogic=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +k8s:defaulter-gen=true
 

diff --git a/pkg/client/injection/reconciler/messaging/v1beta1/channel/reconciler.go b/pkg/client/injection/reconciler/messaging/v1beta1/channel/reconciler.go
diff --git a/pkg/client/injection/reconciler/messaging/v1beta1/inmemorychannel/reconciler.go b/pkg/client/injection/reconciler/messaging/v1beta1/inmemorychannel/reconciler.go
diff --git a/pkg/client/injection/reconciler/messaging/v1beta1/subscription/reconciler.go b/pkg/client/injection/reconciler/messaging/v1beta1/subscription/reconciler.go
diff --git a/pkg/reconciler/channel/channel.go b/pkg/reconciler/channel/channel.go
@@ -61,7 +61,6 @@ var _ channelreconciler.Interface = (*Reconciler)(nil)
 // ReconcileKind implements Interface.ReconcileKind.
 func (r *Reconciler) ReconcileKind(ctx context.Context, c *v1beta1.Channel) pkgreconciler.Event {
 	c.Status.InitializeConditions()
-	c.Status.ObservedGeneration = c.Generation
 
 	// 1. Create the backing Channel CRD, if it doesn't exist.
 	// 2. Propagate the backing Channel CRD Status, Address, and SubscribableStatus into this Channel.

diff --git a/pkg/reconciler/inmemorychannel/controller/inmemorychannel.go b/pkg/reconciler/inmemorychannel/controller/inmemorychannel.go
@@ -97,7 +97,6 @@ var _ inmemorychannelreconciler.Interface = (*Reconciler)(nil)
 
 func (r *Reconciler) ReconcileKind(ctx context.Context, imc *v1beta1.InMemoryChannel) pkgreconciler.Event {
 	imc.Status.InitializeConditions()
-	imc.Status.ObservedGeneration = imc.Generation
 
 	// We reconcile the status of the Channel by looking at:
 	// 1. Dispatcher Deployment for it's readiness.

diff --git a/pkg/reconciler/subscription/subscription.go b/pkg/reconciler/subscription/subscription.go
@@ -91,7 +91,6 @@ var _ subscriptionreconciler.Finalizer = (*Reconciler)(nil)
 // ReconcileKind implements Interface.ReconcileKind.
 func (r *Reconciler) ReconcileKind(ctx context.Context, subscription *v1beta1.Subscription) pkgreconciler.Event {
 	subscription.Status.InitializeConditions()
-	subscription.Status.ObservedGeneration = subscription.Generation
 
 	// Find the channel for this subscription.
 	channel, err := r.getChannel(ctx, subscription)