From 26213879b5ce095910ca6a30f60d8e0e5e45bdb5 Mon Sep 17 00:00:00 2001
From: Matthias Wessendorf <mwessend@redhat.com>
Date: Tue, 7 May 2024 21:11:22 +0200
Subject: [PATCH] Adding missing vendor patches and adding them to 'apply list'
 on release generation (#1080)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
---
 openshift/patches/backport_1056.patch         | 74 +++++++++++++++++++
 .../patches/disable-ko-publish-rekt.patch     | 38 ----------
 openshift/release/generate-release.sh         |  1 +
 3 files changed, 75 insertions(+), 38 deletions(-)
 create mode 100644 openshift/patches/backport_1056.patch
 delete mode 100644 openshift/patches/disable-ko-publish-rekt.patch

diff --git a/openshift/patches/backport_1056.patch b/openshift/patches/backport_1056.patch
new file mode 100644
index 0000000000..84e8fef0a7
--- /dev/null
+++ b/openshift/patches/backport_1056.patch
@@ -0,0 +1,74 @@
+From 8668bbe21ccd155d86fb37da523722b9b3c59153 Mon Sep 17 00:00:00 2001
+From: Marek Schmidt <maschmid@redhat.com>
+Date: Mon, 15 Apr 2024 10:44:35 +0200
+Subject: [PATCH] backport fix ManyTriggers possible starvation of Setup
+ features
+
+---
+ .../test/rekt/features/broker/feature.go      | 46 +++++++++++--------
+ 1 file changed, 27 insertions(+), 19 deletions(-)
+
+diff --git a/vendor/knative.dev/eventing/test/rekt/features/broker/feature.go b/vendor/knative.dev/eventing/test/rekt/features/broker/feature.go
+index 80063a5670..5651422af9 100644
+--- a/vendor/knative.dev/eventing/test/rekt/features/broker/feature.go
++++ b/vendor/knative.dev/eventing/test/rekt/features/broker/feature.go
+@@ -118,32 +118,40 @@ func ManyTriggers() *feature.FeatureSet {
+ 
+ 	for _, testcase := range tests {
+ 
++		testcase := testcase // capture variable
+ 		f := feature.NewFeatureNamed(testcase.name)
+ 
+ 		// Create the broker
+ 		brokerName := feature.MakeRandomK8sName("broker")
+-		f.Setup("install broker", broker.Install(brokerName, broker.WithEnvConfig()...))
+-		f.Setup("broker is ready", broker.IsReady(brokerName))
+-		f.Setup("broker is addressable", broker.IsAddressable(brokerName))
+-
+-		for sink, eventFilter := range testcase.eventFilters {
+-			f.Setup("install sink", eventshub.Install(sink, eventshub.StartReceiver))
+-			filter := eventingv1.TriggerFilterAttributes{
+-				"type":   eventFilter.Type,
+-				"source": eventFilter.Source,
+-			}
+ 
+-			// Point the Trigger subscriber to the sink svc.
+-			cfg := []manifest.CfgFn{
+-				trigger.WithSubscriber(service.AsKReference(sink), ""),
+-				trigger.WithFilter(filter),
+-				trigger.WithExtensions(eventFilter.Extensions),
++		f.Setup("install broker, sinks and triggers", func(ctx context.Context, t feature.T) {
++			broker.Install(brokerName, broker.WithEnvConfig()...)(ctx, t)
++
++			for sink, eventFilter := range testcase.eventFilters {
++				eventshub.Install(sink, eventshub.StartReceiver)(ctx, t)
++
++				filter := eventingv1.TriggerFilterAttributes{
++					"type":   eventFilter.Type,
++					"source": eventFilter.Source,
++				}
++
++				// Point the Trigger subscriber to the sink svc.
++				cfg := []manifest.CfgFn{
++					trigger.WithSubscriber(service.AsKReference(sink), ""),
++					trigger.WithFilter(filter),
++					trigger.WithExtensions(eventFilter.Extensions),
++				}
++
++				trigger.Install(sink, brokerName, cfg...)(ctx, t)
+ 			}
+ 
+-			// Install the trigger
+-			f.Setup("install trigger", trigger.Install(sink, brokerName, cfg...))
+-			f.Setup("trigger goes ready", trigger.IsReady(sink))
+-		}
++			broker.IsReady(brokerName)(ctx, t)
++			broker.IsAddressable(brokerName)(ctx, t)
++
++			for sink := range testcase.eventFilters {
++				trigger.IsReady(sink)(ctx, t)
++			}
++		})
+ 
+ 		for _, event := range testcase.eventsToSend {
+ 			eventToSend := cloudevents.NewEvent()
diff --git a/openshift/patches/disable-ko-publish-rekt.patch b/openshift/patches/disable-ko-publish-rekt.patch
deleted file mode 100644
index 537bc86307..0000000000
--- a/openshift/patches/disable-ko-publish-rekt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/vendor/knative.dev/reconciler-test/pkg/images/ko/publish.go b/vendor/knative.dev/reconciler-test/pkg/images/ko/publish.go
-index f6a62a67..835f1427 100644
---- a/vendor/knative.dev/reconciler-test/pkg/images/ko/publish.go
-+++ b/vendor/knative.dev/reconciler-test/pkg/images/ko/publish.go
-@@ -19,8 +19,6 @@ package ko
- import (
- 	"context"
- 	"errors"
--	"fmt"
--	"os"
- )
- 
- // ErrKoPublishFailed is returned when the ko publish command fails.
-@@ -28,23 +26,5 @@ var ErrKoPublishFailed = errors.New("ko publish failed")
- 
- // Publish uses ko to publish the image.
- func Publish(ctx context.Context, path string) (string, error) {
--	version := os.Getenv("GOOGLE_KO_VERSION")
--	if version == "" {
--		version = "v0.11.2"
--	}
--	args := []string{
--		"go", "run", fmt.Sprintf("github.com/google/ko@%s", version),
--		"publish",
--	}
--	platform := os.Getenv("PLATFORM")
--	if len(platform) > 0 {
--		args = append(args, "--platform="+platform)
--	}
--	args = append(args, "-B", path)
--	out, err := runCmd(ctx, args)
--	if err != nil {
--		return "", fmt.Errorf("%w: %v -- command: %q",
--			ErrKoPublishFailed, err, args)
--	}
--	return out, nil
-+	return "", nil
- }
diff --git a/openshift/release/generate-release.sh b/openshift/release/generate-release.sh
index 8c7aff0f53..6d48993cc4 100755
--- a/openshift/release/generate-release.sh
+++ b/openshift/release/generate-release.sh
@@ -5,6 +5,7 @@ set -euo pipefail
 source $(dirname $0)/resolve.sh
 
 GITHUB_ACTIONS=true $(dirname $0)/../../hack/update-codegen.sh
+git apply openshift/patches/backport_1056.patch
 
 # Eventing core will bring the config tracing ConfigMap, so remove it from heret
 rm -f control-plane/config/eventing-kafka-broker/200-controller/100-config-tracing.yaml