Skip to content

Commit 1754676

Browse files
pierDipipierDipi
authored
[release-1.14] Upgrade knative.dev/eventing to latest 1.14 (knative-extensions#4113)
* Upgrade knative.dev/eventing to latest 1.14 Signed-off-by: Pierangelo Di Pilato <[email protected]> * Pass PodLister as expected Signed-off-by: Pierangelo Di Pilato <[email protected]> * Migrate to library SchedulerFunc to use the new signature Signed-off-by: Pierangelo Di Pilato <[email protected]> --------- Signed-off-by: Pierangelo Di Pilato <[email protected]>
1 parent 456b2d7 commit 1754676

File tree

19 files changed

+275
-275
lines changed

19 files changed

+275
-275
lines changed

‎control-plane/pkg/reconciler/consumergroup/consumergroup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ func (r *Reconciler) schedule(ctx context.Context, cg *kafkainternals.ConsumerGr
446446
return cg.MarkScheduleConsumerFailed("Schedule", err)
447447
}
448448

449-
placements, err := statefulSetScheduler.Schedule(cg)
449+
placements, err := statefulSetScheduler.Schedule(ctx, cg)
450450
if err != nil {
451451
return cg.MarkScheduleConsumerFailed("Schedule", err)
452452
}

‎control-plane/pkg/reconciler/consumergroup/consumergroup_test.go‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ import (
6161
kedaclient "knative.dev/eventing-kafka-broker/third_party/pkg/client/injection/client/fake"
6262
)
6363

64-
type SchedulerFunc func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error)
65-
66-
func (f SchedulerFunc) Schedule(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
67-
return f(vpod)
68-
}
69-
7064
const (
7165
testSchedulerKey = "scheduler"
7266
noTestScheduler = "no-scheduler"
@@ -102,7 +96,7 @@ func TestReconcileKind(t *testing.T) {
10296
},
10397
Key: ConsumerGroupTestKey,
10498
OtherTestData: map[string]interface{}{
105-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
99+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
106100
return []eventingduckv1alpha1.Placement{
107101
{PodName: "p1", VReplicas: 1},
108102
{PodName: "p2", VReplicas: 1},
@@ -189,7 +183,7 @@ func TestReconcileKind(t *testing.T) {
189183
},
190184
Key: ConsumerGroupTestKey,
191185
OtherTestData: map[string]interface{}{
192-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
186+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
193187
return []eventingduckv1alpha1.Placement{
194188
{PodName: "p1", VReplicas: 1},
195189
{PodName: "p2", VReplicas: 1},
@@ -307,7 +301,7 @@ func TestReconcileKind(t *testing.T) {
307301
},
308302
Key: ConsumerGroupTestKey,
309303
OtherTestData: map[string]interface{}{
310-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
304+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
311305
return []eventingduckv1alpha1.Placement{
312306
{PodName: "p1", VReplicas: 1},
313307
{PodName: "p2", VReplicas: 1},
@@ -402,7 +396,7 @@ func TestReconcileKind(t *testing.T) {
402396
},
403397
Key: ConsumerGroupTestKey,
404398
OtherTestData: map[string]interface{}{
405-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
399+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
406400
return []eventingduckv1alpha1.Placement{
407401
{PodName: "p1", VReplicas: 1},
408402
{PodName: "p2", VReplicas: 1},
@@ -528,7 +522,7 @@ func TestReconcileKind(t *testing.T) {
528522
},
529523
Key: ConsumerGroupTestKey,
530524
OtherTestData: map[string]interface{}{
531-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
525+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
532526
return []eventingduckv1alpha1.Placement{
533527
{PodName: "p1", VReplicas: 1},
534528
{PodName: "p2", VReplicas: 1},
@@ -702,7 +696,7 @@ func TestReconcileKind(t *testing.T) {
702696
},
703697
Key: ConsumerGroupTestKey,
704698
OtherTestData: map[string]interface{}{
705-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
699+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
706700
return []eventingduckv1alpha1.Placement{
707701
{PodName: "p1", VReplicas: 1},
708702
{PodName: "p2", VReplicas: 1},
@@ -877,7 +871,7 @@ func TestReconcileKind(t *testing.T) {
877871
},
878872
Key: ConsumerGroupTestKey,
879873
OtherTestData: map[string]interface{}{
880-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
874+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
881875
return []eventingduckv1alpha1.Placement{
882876
{PodName: "p1", VReplicas: 1},
883877
{PodName: "p2", VReplicas: 1},
@@ -1034,7 +1028,7 @@ func TestReconcileKind(t *testing.T) {
10341028
},
10351029
Key: ConsumerGroupTestKey,
10361030
OtherTestData: map[string]interface{}{
1037-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1031+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
10381032
return []eventingduckv1alpha1.Placement{
10391033
{PodName: "p1", VReplicas: 1},
10401034
}, nil
@@ -1121,7 +1115,7 @@ func TestReconcileKind(t *testing.T) {
11211115
},
11221116
Key: ConsumerGroupTestKey,
11231117
OtherTestData: map[string]interface{}{
1124-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1118+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
11251119
return []eventingduckv1alpha1.Placement{
11261120
{PodName: "p1", VReplicas: 1},
11271121
{PodName: "p2", VReplicas: 1},
@@ -1208,7 +1202,7 @@ func TestReconcileKind(t *testing.T) {
12081202
},
12091203
Key: ConsumerGroupTestKey,
12101204
OtherTestData: map[string]interface{}{
1211-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1205+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
12121206
return []eventingduckv1alpha1.Placement{
12131207
{PodName: "p1", VReplicas: 1},
12141208
{PodName: "p2", VReplicas: 1},
@@ -1303,7 +1297,7 @@ func TestReconcileKind(t *testing.T) {
13031297
},
13041298
Key: ConsumerGroupTestKey,
13051299
OtherTestData: map[string]interface{}{
1306-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1300+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
13071301
return []eventingduckv1alpha1.Placement{
13081302
{PodName: "p1", VReplicas: 1},
13091303
{PodName: "p2", VReplicas: 2},
@@ -1426,7 +1420,7 @@ func TestReconcileKind(t *testing.T) {
14261420
},
14271421
Key: ConsumerGroupTestKey,
14281422
OtherTestData: map[string]interface{}{
1429-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1423+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
14301424
return []eventingduckv1alpha1.Placement{
14311425
{PodName: "p1", VReplicas: 1},
14321426
{PodName: "p2", VReplicas: 2},
@@ -1533,7 +1527,7 @@ func TestReconcileKind(t *testing.T) {
15331527
},
15341528
Key: ConsumerGroupTestKey,
15351529
OtherTestData: map[string]interface{}{
1536-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1530+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
15371531
return []eventingduckv1alpha1.Placement{
15381532
{PodName: "p1", VReplicas: 1},
15391533
{PodName: "p2", VReplicas: 1},
@@ -1630,7 +1624,7 @@ func TestReconcileKind(t *testing.T) {
16301624
},
16311625
Key: ConsumerGroupTestKey,
16321626
OtherTestData: map[string]interface{}{
1633-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1627+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
16341628
return nil, io.EOF
16351629
}),
16361630
},
@@ -1762,7 +1756,7 @@ func TestReconcileKindNoAutoscaler(t *testing.T) {
17621756
},
17631757
Key: ConsumerGroupTestKey,
17641758
OtherTestData: map[string]interface{}{
1765-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1759+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
17661760
return []eventingduckv1alpha1.Placement{
17671761
{PodName: "p1", VReplicas: 1},
17681762
{PodName: "p2", VReplicas: 1},
@@ -1926,7 +1920,7 @@ func TestFinalizeKind(t *testing.T) {
19261920
},
19271921
Key: testKey,
19281922
OtherTestData: map[string]interface{}{
1929-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1923+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
19301924
return nil, nil
19311925
}),
19321926
},
@@ -1995,7 +1989,7 @@ func TestFinalizeKind(t *testing.T) {
19951989
},
19961990
Key: testKey,
19971991
OtherTestData: map[string]interface{}{
1998-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
1992+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
19991993
return nil, nil
20001994
}),
20011995
},
@@ -2121,7 +2115,7 @@ func TestFinalizeKind(t *testing.T) {
21212115
},
21222116
Key: testKey,
21232117
OtherTestData: map[string]interface{}{
2124-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
2118+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
21252119
return nil, nil
21262120
}),
21272121
},
@@ -2167,7 +2161,7 @@ func TestFinalizeKind(t *testing.T) {
21672161
},
21682162
Key: testKey,
21692163
OtherTestData: map[string]interface{}{
2170-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
2164+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
21712165
return nil, nil
21722166
}),
21732167
kafkatesting.ErrorOnDeleteConsumerGroupTestKey: sarama.ErrUnknownTopicOrPartition,
@@ -2214,7 +2208,7 @@ func TestFinalizeKind(t *testing.T) {
22142208
},
22152209
Key: testKey,
22162210
OtherTestData: map[string]interface{}{
2217-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
2211+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
22182212
return nil, nil
22192213
}),
22202214
kafkatesting.ErrorOnDeleteConsumerGroupTestKey: sarama.ErrGroupIDNotFound,
@@ -2262,7 +2256,7 @@ func TestFinalizeKind(t *testing.T) {
22622256
WantErr: true,
22632257
Key: testKey,
22642258
OtherTestData: map[string]interface{}{
2265-
testSchedulerKey: SchedulerFunc(func(vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
2259+
testSchedulerKey: scheduler.SchedulerFunc(func(ctx context.Context, vpod scheduler.VPod) ([]eventingduckv1alpha1.Placement, error) {
22662260
return nil, nil
22672261
}),
22682262
kafkatesting.ErrorOnDeleteConsumerGroupTestKey: sarama.ErrClusterAuthorizationFailed,

‎control-plane/pkg/reconciler/consumergroup/controller.go‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/labels"
3333
"k8s.io/apimachinery/pkg/types"
3434
"k8s.io/apiserver/pkg/storage/names"
35+
corelisters "k8s.io/client-go/listers/core/v1"
3536
"k8s.io/client-go/tools/cache"
3637

3738
"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/internals/kafka/eventing"
@@ -106,6 +107,9 @@ func NewController(ctx context.Context, watcher configmap.Watcher) *controller.I
106107
logger.Panicf("unable to process required environment variables: %v", err)
107108
}
108109

110+
dispatcherPodInformer := podinformer.Get(ctx, eventing.DispatcherLabelSelectorStr)
111+
dispatcherPodLister := dispatcherPodInformer.Lister()
112+
109113
c := SchedulerConfig{
110114
RefreshPeriod: time.Duration(env.SchedulerRefreshPeriod) * time.Second,
111115
Capacity: env.PodCapacity,
@@ -114,13 +118,10 @@ func NewController(ctx context.Context, watcher configmap.Watcher) *controller.I
114118
}
115119

116120
schedulers := map[string]Scheduler{
117-
KafkaSourceScheduler: createKafkaScheduler(ctx, c, kafkainternals.SourceStatefulSetName),
118-
KafkaTriggerScheduler: createKafkaScheduler(ctx, c, kafkainternals.BrokerStatefulSetName),
119-
//KafkaChannelScheduler: createKafkaScheduler(ctx, c, kafkainternals.ChannelStatefulSetName), //To be added with channel/v2 reconciler version only
121+
KafkaSourceScheduler: createKafkaScheduler(ctx, c, dispatcherPodLister, kafkainternals.SourceStatefulSetName),
122+
KafkaTriggerScheduler: createKafkaScheduler(ctx, c, dispatcherPodLister, kafkainternals.BrokerStatefulSetName),
120123
}
121124

122-
dispatcherPodInformer := podinformer.Get(ctx, eventing.DispatcherLabelSelectorStr)
123-
124125
r := &Reconciler{
125126
SchedulerFunc: func(s string) (Scheduler, bool) { sched, ok := schedulers[strings.ToLower(s)]; return sched, ok },
126127
ConsumerLister: consumer.Get(ctx).Lister(),
@@ -299,10 +300,11 @@ func enqueueConsumerGroupFromConsumer(enqueue func(name types.NamespacedName)) f
299300
}
300301
}
301302

302-
func createKafkaScheduler(ctx context.Context, c SchedulerConfig, ssName string) Scheduler {
303+
func createKafkaScheduler(ctx context.Context, c SchedulerConfig, podLister corelisters.PodLister, ssName string) Scheduler {
303304
lister := consumergroup.Get(ctx).Lister()
304305
return createStatefulSetScheduler(
305306
ctx,
307+
podLister,
306308
SchedulerConfig{
307309
StatefulSetName: ssName,
308310
RefreshPeriod: c.RefreshPeriod,
@@ -344,7 +346,7 @@ func getSelectorLabel(ssName string) map[string]string {
344346
return selectorLabel
345347
}
346348

347-
func createStatefulSetScheduler(ctx context.Context, c SchedulerConfig, lister scheduler.VPodLister) Scheduler {
349+
func createStatefulSetScheduler(ctx context.Context, podLister corelisters.PodLister, c SchedulerConfig, lister scheduler.VPodLister) Scheduler {
348350
ss, _ := statefulsetscheduler.New(ctx, &statefulsetscheduler.Config{
349351
StatefulSetNamespace: system.Namespace(),
350352
StatefulSetName: c.StatefulSetName,
@@ -357,6 +359,7 @@ func createStatefulSetScheduler(ctx context.Context, c SchedulerConfig, lister s
357359
Evictor: newEvictor(ctx, zap.String("kafka.eventing.knative.dev/component", "evictor")).evict,
358360
VPodLister: lister,
359361
NodeLister: nodeinformer.Get(ctx).Lister(),
362+
PodLister: podLister.Pods(system.Namespace()),
360363
})
361364

362365
return Scheduler{

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
k8s.io/apiserver v0.29.2
3636
k8s.io/client-go v0.29.2
3737
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
38-
knative.dev/eventing v0.41.0
38+
knative.dev/eventing v0.41.7-0.20240923180940-09cb6334226f
3939
knative.dev/hack v0.0.0-20240404013450-1133b37da8d7
4040
knative.dev/pkg v0.0.0-20240416145024-0f34a8815650
4141
knative.dev/reconciler-test v0.0.0-20240417065737-ca905cbb09a9

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,8 +1270,8 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
12701270
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
12711271
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
12721272
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1273-
knative.dev/eventing v0.41.0 h1:e38nejJiwEpFQI5JgcaT8JRUGZsQn05h1vBWSwNkroY=
1274-
knative.dev/eventing v0.41.0/go.mod h1:/DjKZGRcZtBx8FOSvOy3mhxzm1Wem7H3aofb6kHq/68=
1273+
knative.dev/eventing v0.41.7-0.20240923180940-09cb6334226f h1:OEpj00D31CAlJTm8xfimpK1haCrDIzVP+3axlNgY4bE=
1274+
knative.dev/eventing v0.41.7-0.20240923180940-09cb6334226f/go.mod h1:JjZn90agmsqMIQOqZ4oToWRrcAIvlqn7hlharxcTv/w=
12751275
knative.dev/hack v0.0.0-20240404013450-1133b37da8d7 h1:fkWYWvdHm1mVHevKW2vVJnZtxH0NzOlux8imesweKwE=
12761276
knative.dev/hack v0.0.0-20240404013450-1133b37da8d7/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
12771277
knative.dev/pkg v0.0.0-20240416145024-0f34a8815650 h1:m2ahFUO0L2VrgGDYdyOUFdE6xBd3pLXAJozLJwqLRQM=

‎vendor/knative.dev/eventing/pkg/apis/feature/features.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package feature
1818

1919
import (
2020
"fmt"
21+
"log"
2122
"strings"
2223

2324
corev1 "k8s.io/api/core/v1"
@@ -148,7 +149,8 @@ func NewFlagsConfigFromMap(data map[string]string) (Flags, error) {
148149
} else if strings.Contains(k, NodeSelectorLabel) {
149150
flags[sanitizedKey] = Flag(v)
150151
} else {
151-
return flags, fmt.Errorf("cannot parse the feature flag '%s' = '%s'", k, v)
152+
flags[k] = Flag(v)
153+
log.Printf("Warning: unknown feature flag value %q=%q\n", k, v)
152154
}
153155
}
154156

‎vendor/knative.dev/eventing/pkg/apis/sources/v1/container_lifecycle.go‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,11 @@ const (
3131

3232
// ContainerSourceConditionReceiveAdapterReady has status True when the ContainerSource's ReceiveAdapter is ready.
3333
ContainerSourceConditionReceiveAdapterReady apis.ConditionType = "ReceiveAdapterReady"
34-
35-
ContainerConditionOIDCIdentityCreated apis.ConditionType = "OIDCIdentityCreated"
3634
)
3735

3836
var containerCondSet = apis.NewLivingConditionSet(
3937
ContainerSourceConditionSinkBindingReady,
4038
ContainerSourceConditionReceiveAdapterReady,
41-
ContainerConditionOIDCIdentityCreated,
4239
)
4340

4441
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
@@ -66,23 +63,7 @@ func (s *ContainerSourceStatus) InitializeConditions() {
6663
containerCondSet.Manage(s).InitializeConditions()
6764
}
6865

69-
func (s *ContainerSourceStatus) MarkOIDCIdentityCreatedSucceeded() {
70-
containerCondSet.Manage(s).MarkTrue(ContainerConditionOIDCIdentityCreated)
71-
}
72-
73-
func (s *ContainerSourceStatus) MarkOIDCIdentityCreatedSucceededWithReason(reason, messageFormat string, messageA ...interface{}) {
74-
containerCondSet.Manage(s).MarkTrueWithReason(ContainerConditionOIDCIdentityCreated, reason, messageFormat, messageA...)
75-
}
76-
77-
func (s *ContainerSourceStatus) MarkOIDCIdentityCreatedFailed(reason, messageFormat string, messageA ...interface{}) {
78-
containerCondSet.Manage(s).MarkFalse(ContainerConditionOIDCIdentityCreated, reason, messageFormat, messageA...)
79-
}
80-
81-
func (s *ContainerSourceStatus) MarkOIDCIdentityCreatedUnknown(reason, messageFormat string, messageA ...interface{}) {
82-
containerCondSet.Manage(s).MarkUnknown(ContainerConditionOIDCIdentityCreated, reason, messageFormat, messageA...)
83-
}
84-
85-
// PropagateSinkBindingStatus uses the availability of the provided Deployment to determine if
66+
// PropagateSinkBindingStatus uses the SinkBinding to determine if
8667
// ContainerSourceConditionSinkBindingReady should be marked as true, false or unknown.
8768
func (s *ContainerSourceStatus) PropagateSinkBindingStatus(status *SinkBindingStatus) {
8869
// Do not copy conditions nor observedGeneration
@@ -105,6 +86,9 @@ func (s *ContainerSourceStatus) PropagateSinkBindingStatus(status *SinkBindingSt
10586
default:
10687
containerCondSet.Manage(s).MarkUnknown(ContainerSourceConditionSinkBindingReady, cond.Reason, cond.Message)
10788
}
89+
90+
// Propagate SinkBindings AuthStatus to containersources AuthStatus
91+
s.Auth = status.Auth
10892
}
10993

11094
// PropagateReceiveAdapterStatus uses the availability of the provided Deployment to determine if

0 commit comments

Comments
 (0)