Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic generation bump for apis/messaging #3243

Merged
merged 2 commits into from
Jun 2, 2020
+15 −6
Merged

Automatic generation bump for apis/messaging #3243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0520746
Add common logic tag and generate
whaught Jun 1, 2020
195e80c
Remove generation bump from reconciler
whaught Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/apis/messaging/v1beta1/channel_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/messaging/v1beta1/in_memory_channel_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/messaging/v1beta1/subscription_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
)

// +genclient
// +genreconciler
// +genreconciler:krshapedlogic=true
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +k8s:defaulter-gen=true

Expand Down
4 changes: 4 additions & 0 deletions pkg/client/injection/reconciler/messaging/v1beta1/channel/reconciler.go
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions pkg/client/injection/reconciler/messaging/v1beta1/inmemorychannel/reconciler.go
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions pkg/client/injection/reconciler/messaging/v1beta1/subscription/reconciler.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion pkg/reconciler/channel/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion pkg/reconciler/inmemorychannel/controller/inmemorychannel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion pkg/reconciler/subscription/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down