From ebfeff801d5fee647c41aecae0a26235e46097d2 Mon Sep 17 00:00:00 2001
From: afield <afield@redhat.com>
Date: Thu, 11 Nov 2021 05:45:29 -0500
Subject: [PATCH] :fire: Apply carried patches.

---
 pkg/common/client/config.go                   | 1 +
 test/e2e/helpers/kafka_helper.go              | 2 +-
 test/rekt/resources/kafkacat/kafkacat.yaml    | 2 +-
 test/rekt/resources/kafkacat/kafkacat_test.go | 4 ++--
 vendor/knative.dev/pkg/version/version.go     | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/common/client/config.go b/pkg/common/client/config.go
index d96ea86ebd..cca8447d8f 100644
--- a/pkg/common/client/config.go
+++ b/pkg/common/client/config.go
@@ -198,6 +198,7 @@ func (b *configBuilder) Build(ctx context.Context) (*sarama.Config, error) {
 
 		// We Always Want Success Messages From Producer
 		config.Producer.Return.Successes = true
+		config.Producer.RequiredAcks = sarama.WaitForAll
 	}
 
 	// then apply stuff from YAML
diff --git a/test/e2e/helpers/kafka_helper.go b/test/e2e/helpers/kafka_helper.go
index 71c29179ad..f0b89cd1a6 100644
--- a/test/e2e/helpers/kafka_helper.go
+++ b/test/e2e/helpers/kafka_helper.go
@@ -47,7 +47,7 @@ const (
 	strimziTopicResource = "kafkatopics"
 	interval             = 3 * time.Second
 	timeout              = 30 * time.Second
-	kafkaCatImage        = "docker.io/edenhill/kafkacat:1.6.0"
+	kafkaCatImage        = "quay.io/openshift-knative/kafkacat:1.6.0"
 )
 
 var (
diff --git a/test/rekt/resources/kafkacat/kafkacat.yaml b/test/rekt/resources/kafkacat/kafkacat.yaml
index d441bca4e1..3f7bdb39fd 100644
--- a/test/rekt/resources/kafkacat/kafkacat.yaml
+++ b/test/rekt/resources/kafkacat/kafkacat.yaml
@@ -19,7 +19,7 @@ metadata:
   namespace: {{ .namespace }}
 spec:
   containers:
-  - image: docker.io/edenhill/kafkacat:1.6.0
+  - image: quay.io/openshift-knative/kafkacat:1.6.0
     name: producer-container
     command:
     - kafkacat
diff --git a/test/rekt/resources/kafkacat/kafkacat_test.go b/test/rekt/resources/kafkacat/kafkacat_test.go
index 20b12bfc19..7c1a11ae00 100644
--- a/test/rekt/resources/kafkacat/kafkacat_test.go
+++ b/test/rekt/resources/kafkacat/kafkacat_test.go
@@ -51,7 +51,7 @@ func Example_min() {
 	//   namespace: bar
 	// spec:
 	//   containers:
-	//   - image: docker.io/edenhill/kafkacat:1.6.0
+	//   - image: quay.io/openshift-knative/kafkacat:1.6.0
 	//     name: producer-container
 	//     command:
 	//     - kafkacat
@@ -109,7 +109,7 @@ func Example_full() {
 	//   namespace: bar
 	// spec:
 	//   containers:
-	//   - image: docker.io/edenhill/kafkacat:1.6.0
+	//   - image: quay.io/openshift-knative/kafkacat:1.6.0
 	//     name: producer-container
 	//     command:
 	//     - kafkacat
diff --git a/vendor/knative.dev/pkg/version/version.go b/vendor/knative.dev/pkg/version/version.go
index 56b7ae9582..c79f442dee 100644
--- a/vendor/knative.dev/pkg/version/version.go
+++ b/vendor/knative.dev/pkg/version/version.go
@@ -33,7 +33,7 @@ const (
 	// NOTE: If you are changing this line, please also update the minimum kubernetes
 	// version listed here:
 	// https://github.com/knative/docs/blob/mkdocs/docs/snippets/prerequisites.md
-	defaultMinimumVersion = "v1.20.0"
+	defaultMinimumVersion = "v1.19.0"
 )
 
 func getMinimumVersion() string {