From 447137d1ff71c5f8524c5697f60eca2889cc2d38 Mon Sep 17 00:00:00 2001
From: Antonin Bas <antonin.bas@broadcom.com>
Date: Fri, 20 Sep 2024 11:42:52 -0700
Subject: [PATCH] Stop using projects.registry.vmware.com registry for Kafka
 images

- For confluent images (Kafka and Zookeeper), we now use the standard
  images from the confluentinc docker.io organization.
- For the kafka-consumer image, we use antrea/kafka-consumer.

Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
---
 README.md                             | 6 +++---
 build/yamls/kafka-flow-collector.yaml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 970abb30..4c5ec466 100644
--- a/README.md
+++ b/README.md
@@ -42,9 +42,9 @@ kubectl apply -f ./build/yamls/kafka-flow-collector.yaml
 ``` 
 Broker address will be `kafka-service.kafka.svc:9092`.
 Notice that `KAFKA_ADVERTISED_LISTENERS` for kafka-broker and broker address should be consistent and accessible
-from other namespaces. Also, versioned images of kafka-broker `projects.registry.vmware.com/antrea/confluentinc-kafka:v6.2.0` 
-and zookeeper `projects.registry.vmware.com/antrea/confluentinc-zookeeper:v6.2.0` are used in the set-up. Proper
-upload of Docker images is required to support more versions.
+from other namespaces. Also, versioned images of kafka-broker `confluentinc/cp-kafka:6.2.0`
+and zookeeper `confluentinc/cp-zookeeper:6.2.0` are used in the set-up. Other
+versions have not been validated.
 
 Currently, `antrea/kafka-consumer` only supports decoding and logging messages with AntreaFlowMsg proto schema.
 
diff --git a/build/yamls/kafka-flow-collector.yaml b/build/yamls/kafka-flow-collector.yaml
index 129365e8..1b3d237a 100644
--- a/build/yamls/kafka-flow-collector.yaml
+++ b/build/yamls/kafka-flow-collector.yaml
@@ -50,7 +50,7 @@ spec:
     spec:
       containers:
         - name: zookeeper
-          image: projects.registry.vmware.com/antrea/confluentinc-zookeeper:6.2.0
+          image: confluentinc/cp-zookeeper:6.2.0
           ports:
             - containerPort: 2181
           env:
@@ -77,7 +77,7 @@ spec:
     spec:
       containers:
         - name: kafka
-          image: projects.registry.vmware.com/antrea/confluentinc-kafka:6.2.0
+          image: confluentinc/cp-kafka:6.2.0
           ports:
             - containerPort: 9092
           env:
@@ -106,7 +106,7 @@ spec:
     spec:
       containers:
         - name: kafka
-          image: projects.registry.vmware.com/antrea/kafka-consumer
+          image: antrea/kafka-consumer
           imagePullPolicy: IfNotPresent
           args:
             - --brokers=kafka-service.kafka.svc:9092