From 6ccaa08dd7975fbde21936e1c0e8c7193669785d Mon Sep 17 00:00:00 2001
From: Knative Prow Robot <automation+prow-robot@knative.team>
Date: Mon, 4 Nov 2024 10:35:55 +0000
Subject: [PATCH] [release-1.15] Add observedGeneration in JobSink OpenAPI
 schema (#8299)

Add observedGeneration in JobSink OpenAPI schema

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Co-authored-by: Pierangelo Di Pilato <pierdipi@redhat.com>
---
 config/core/resources/jobsink.yaml     |  4 +++
 pkg/reconciler/jobsink/jobsink_test.go | 40 +++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/config/core/resources/jobsink.yaml b/config/core/resources/jobsink.yaml
index a707bcd5264..981b4d5d90a 100644
--- a/config/core/resources/jobsink.yaml
+++ b/config/core/resources/jobsink.yaml
@@ -94,6 +94,10 @@ spec:
                       name:
                         description: The name of the applied EventPolicy
                         type: string
+                observedGeneration:
+                  description: ObservedGeneration is the 'Generation' of the Service that was last processed by the controller.
+                  type: integer
+                  format: int64
                 conditions:
                   description: Conditions the latest available observations of a resource's current state.
                   type: array
diff --git a/pkg/reconciler/jobsink/jobsink_test.go b/pkg/reconciler/jobsink/jobsink_test.go
index d5433032611..fba76c2ef10 100644
--- a/pkg/reconciler/jobsink/jobsink_test.go
+++ b/pkg/reconciler/jobsink/jobsink_test.go
@@ -28,10 +28,6 @@ import (
 	utilrand "k8s.io/apimachinery/pkg/util/rand"
 	clientgotesting "k8s.io/client-go/testing"
 	"k8s.io/utils/ptr"
-	fakeeventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
-	jobsinkreconciler "knative.dev/eventing/pkg/client/injection/reconciler/sinks/v1alpha1/jobsink"
-	. "knative.dev/eventing/pkg/reconciler/testing/v1"
-	. "knative.dev/eventing/pkg/reconciler/testing/v1alpha1"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	v1 "knative.dev/pkg/client/injection/ducks/duck/v1/addressable"
@@ -40,6 +36,12 @@ import (
 	logtesting "knative.dev/pkg/logging/testing"
 	"knative.dev/pkg/network"
 	. "knative.dev/pkg/reconciler/testing"
+
+	"knative.dev/eventing/pkg/apis/sinks/v1alpha1"
+	fakeeventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
+	jobsinkreconciler "knative.dev/eventing/pkg/client/injection/reconciler/sinks/v1alpha1/jobsink"
+	. "knative.dev/eventing/pkg/reconciler/testing/v1"
+	. "knative.dev/eventing/pkg/reconciler/testing/v1alpha1"
 )
 
 const (
@@ -198,6 +200,36 @@ func TestReconcile(t *testing.T) {
 				},
 			},
 		},
+		{
+			Name: "Successful reconciliation, observed generation",
+			Key:  testKey,
+			Objects: []runtime.Object{
+				NewJobSink(jobSinkName, testNamespace,
+					func(sink *v1alpha1.JobSink) {
+						sink.Generation = 4242
+					},
+					WithJobSinkJob(testJob("")),
+					WithInitJobSinkConditions),
+			},
+			WantErr: false,
+			WantCreates: []runtime.Object{
+				testJob("test-jobSinkml6mm"),
+			},
+			WantStatusUpdates: []clientgotesting.UpdateActionImpl{
+				{
+					Object: NewJobSink(jobSinkName, testNamespace,
+						WithJobSinkJob(testJob("")),
+						WithJobSinkAddressableReady(),
+						WithJobSinkJobStatusSelector(),
+						WithJobSinkAddress(&jobSinkAddressable),
+						func(sink *v1alpha1.JobSink) {
+							sink.Generation = 4242
+							sink.Status.ObservedGeneration = 4242
+						},
+						WithJobSinkEventPoliciesReadyBecauseOIDCDisabled()),
+				},
+			},
+		},
 	}
 
 	logger := logtesting.TestLogger(t)