Skip to content

Update status.ObservedGeneration for sources resources when sources r… #1897

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

Merged
knative-prow-robot merged 2 commits into from
Sep 16, 2019
Merged

Update status.ObservedGeneration for sources resources when sources r… #1897

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
7d8a2f2
Update status.ObservedGeneration for sources resources when sources r…
capri-xiyue Sep 16, 2019
7176f0d
update Status.ObservedGeneration at the beginning of the reconcile loop
capri-xiyue Sep 16, 2019
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: 2 additions & 0 deletions pkg/reconciler/apiserversource/apiserversource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ func (r *Reconciler) Reconcile(ctx context.Context, key string) error {
}

func (r *Reconciler) reconcile(ctx context.Context, source *v1alpha1.ApiServerSource) error {
source.Status.ObservedGeneration = source.Generation

source.Status.InitializeConditions()

track := r.resourceTracker.TrackInNamespace(source)
Expand Down
29 changes: 29 additions & 0 deletions pkg/reconciler/apiserversource/apiserversource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ const (

sinkName = "testsink"
source = "apiserveraddr"

generation = 1
)

func init() {
Expand All @@ -89,6 +91,7 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
},
Key: testNS + "/" + sourceName,
Expand All @@ -99,8 +102,10 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceStatusObservedGeneration(generation),
WithApiServerSourceSinkNotFound,
),
}},
Expand All @@ -119,6 +124,7 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewChannel(sinkName, testNS,
WithInitChannelConditions,
Expand All @@ -143,11 +149,13 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceDeployed,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
},
Expand All @@ -165,6 +173,7 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewChannel(sinkName, testNS,
WithInitChannelConditions,
Expand All @@ -189,11 +198,13 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceDeploymentUnavailable,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Expand All @@ -215,6 +226,7 @@ func TestReconcile(t *testing.T) {
ServiceAccountName: "malin",
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewChannel(sinkName, testNS,
WithInitChannelConditions,
Expand All @@ -240,11 +252,13 @@ func TestReconcile(t *testing.T) {
ServiceAccountName: "malin",
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceDeploymentUnavailable,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Expand All @@ -265,6 +279,7 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewChannel(sinkName, testNS,
WithInitChannelConditions,
Expand All @@ -289,11 +304,13 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceDeploymentUnavailable,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Expand All @@ -314,6 +331,7 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewChannel(sinkName, testNS,
WithInitChannelConditions,
Expand All @@ -339,11 +357,13 @@ func TestReconcile(t *testing.T) {
Sink: &sinkRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceDeployed,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
WantDeletes: []clientgotesting.DeleteActionImpl{
Expand All @@ -364,6 +384,7 @@ func TestReconcile(t *testing.T) {
Sink: &brokerRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewBroker(sinkName, testNS,
WithInitBrokerConditions,
Expand All @@ -388,11 +409,13 @@ func TestReconcile(t *testing.T) {
Sink: &brokerRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceDeployed,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
WantCreates: []runtime.Object{
Expand All @@ -418,6 +441,7 @@ func TestReconcile(t *testing.T) {
Sink: &brokerRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewBroker(sinkName, testNS,
WithInitBrokerConditions,
Expand Down Expand Up @@ -445,11 +469,13 @@ func TestReconcile(t *testing.T) {
Sink: &brokerRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceDeployed,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
WantCreates: []runtime.Object{
Expand All @@ -472,6 +498,7 @@ func TestReconcile(t *testing.T) {
Sink: &brokerRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
),
NewBroker(sinkName, testNS,
WithInitBrokerConditions,
Expand Down Expand Up @@ -502,11 +529,13 @@ func TestReconcile(t *testing.T) {
Sink: &brokerRef,
}),
WithApiServerSourceUID(sourceUID),
WithApiServerSourceObjectMetaGeneration(generation),
// Status Update:
WithInitApiServerSourceConditions,
WithApiServerSourceDeployed,
WithApiServerSourceSink(sinkURI),
WithApiServerSourceEventTypes,
WithApiServerSourceStatusObservedGeneration(generation),
),
}},
WantDeletes: []clientgotesting.DeleteActionImpl{
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/containersource/containersource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ func (r *Reconciler) reconcile(ctx context.Context, source *v1alpha1.ContainerSo
return nil
}

source.Status.ObservedGeneration = source.Generation
source.Status.InitializeConditions()

annotations := make(map[string]string)
Expand Down Expand Up @@ -157,7 +158,6 @@ func (r *Reconciler) reconcile(ctx context.Context, source *v1alpha1.ContainerSo
source.Status.MarkDeployed()
r.Recorder.Eventf(source, corev1.EventTypeNormal, "DeploymentReady", "Deployment %q has %d ready replicas", ra.Name, ra.Status.ReadyReplicas)
}

return nil
}

Expand Down
Loading