From 2189c0561183c4fdfc36e2feca4478d54209f280 Mon Sep 17 00:00:00 2001
From: Ahmed Abdalla <aabdelre@redhat.com>
Date: Fri, 28 Jan 2022 10:11:52 +0100
Subject: [PATCH] Fix wrong image names in generated manifests

Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com>
---
 openshift/release/generate-release.sh                       | 2 +-
 openshift/release/knative-eventing-kafka-channel-ci.yaml    | 6 +++---
 .../knative-eventing-kafka-channel-postinstall-ci.yaml      | 2 +-
 openshift/release/knative-eventing-kafka-source-ci.yaml     | 4 ++--
 .../knative-eventing-kafka-source-postinstall-ci.yaml       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openshift/release/generate-release.sh b/openshift/release/generate-release.sh
index 3a04eee97b..f0e72137e7 100755
--- a/openshift/release/generate-release.sh
+++ b/openshift/release/generate-release.sh
@@ -13,7 +13,7 @@ if [ "$release" == "ci" ]; then
     image_prefix="registry.ci.openshift.org/openshift/knative-nightly:knative-eventing-kafka-"
     tag=""
 else
-    image_prefix="registry.ci.openshift.org/openshift/knative-${release}:knative-eventing-kafka-"
+    image_prefix="registry.ci.openshift.org/openshift/${release}:knative-eventing-kafka-"
     tag=""
 fi
 
diff --git a/openshift/release/knative-eventing-kafka-channel-ci.yaml b/openshift/release/knative-eventing-kafka-channel-ci.yaml
index dec1638633..0e8a3bf969 100644
--- a/openshift/release/knative-eventing-kafka-channel-ci.yaml
+++ b/openshift/release/knative-eventing-kafka-channel-ci.yaml
@@ -666,7 +666,7 @@ spec:
       serviceAccountName: kafka-ch-controller
       containers:
       - name: controller
-        image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-consolidated-controller
+        image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-consolidated-controller
         env:
         - name: CONFIG_LOGGING_NAME
           value: config-logging
@@ -683,7 +683,7 @@ spec:
         - name: CONFIG_LEADERELECTION_NAME
           value: config-leader-election
         - name: DISPATCHER_IMAGE
-          value: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-consolidated-dispatcher
+          value: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-consolidated-dispatcher
         - name: SERVICE_ACCOUNT
           value: kafka-ch-dispatcher
         ports:
@@ -752,7 +752,7 @@ spec:
       containers:
       - name: kafka-webhook
         terminationMessagePolicy: FallbackToLogsOnError
-        image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-webhook
+        image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-webhook
         env:
         - name: SYSTEM_NAMESPACE
           valueFrom:
diff --git a/openshift/release/knative-eventing-kafka-channel-postinstall-ci.yaml b/openshift/release/knative-eventing-kafka-channel-postinstall-ci.yaml
index c139a4e7c0..8ef9bd4e2e 100644
--- a/openshift/release/knative-eventing-kafka-channel-postinstall-ci.yaml
+++ b/openshift/release/knative-eventing-kafka-channel-postinstall-ci.yaml
@@ -84,6 +84,6 @@ spec:
       restartPolicy: OnFailure
       containers:
         - name: migrate
-          image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-migrate
+          image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-migrate
           args:
             - "kafkachannels.messaging.knative.dev"
diff --git a/openshift/release/knative-eventing-kafka-source-ci.yaml b/openshift/release/knative-eventing-kafka-source-ci.yaml
index 6e6a3c400c..8e73b9d924 100644
--- a/openshift/release/knative-eventing-kafka-source-ci.yaml
+++ b/openshift/release/knative-eventing-kafka-source-ci.yaml
@@ -343,7 +343,7 @@ spec:
       serviceAccountName: kafka-controller-manager
       containers:
       - name: manager
-        image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-source-controller
+        image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-source-controller
         env:
         - name: SYSTEM_NAMESPACE
           valueFrom:
@@ -356,7 +356,7 @@ spec:
         - name: CONFIG_LEADERELECTION_NAME
           value: config-leader-election
         - name: KAFKA_RA_IMAGE
-          value: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-receive-adapter
+          value: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-receive-adapter
         volumeMounts:
         resources:
           requests:
diff --git a/openshift/release/knative-eventing-kafka-source-postinstall-ci.yaml b/openshift/release/knative-eventing-kafka-source-postinstall-ci.yaml
index 09bf289c1f..a1581a1fb8 100644
--- a/openshift/release/knative-eventing-kafka-source-postinstall-ci.yaml
+++ b/openshift/release/knative-eventing-kafka-source-postinstall-ci.yaml
@@ -84,6 +84,6 @@ spec:
       restartPolicy: OnFailure
       containers:
         - name: migrate
-          image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-migrate
+          image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-migrate
           args:
             - "kafkasources.messaging.knative.dev"