From d5cf5621e6cd835484835e233c0418f3505c4ea8 Mon Sep 17 00:00:00 2001
From: Antonin Bas <abas@vmware.com>
Date: Fri, 11 Dec 2020 11:43:00 -0800
Subject: [PATCH] Use VMware Harbor registry for flow-aggregator Docker image
 (#1650)

Changes are the same as in
https://github.com/vmware-tanzu/antrea/pull/1617 but for the
antrea/flow-aggregator Docker image.

There was also a typo in the flow-aggregator YAML: the image key didn't
match the one used in generate-manifest-flow-aggregator.sh when invoking
kustomize.
---
 Makefile                                             | 2 ++
 build/yamls/flow-aggregator.yml                      | 2 +-
 build/yamls/flow-aggregator/base/flow-aggregator.yml | 2 +-
 hack/generate-manifest-flow-aggregator.sh            | 2 +-
 hack/release/prepare-assets.sh                       | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b0968a7b3d2..d4ce769628d 100644
--- a/Makefile
+++ b/Makefile
@@ -329,6 +329,8 @@ else
 	docker build --pull -t antrea/flow-aggregator:$(DOCKER_IMG_VERSION) -f build/images/flow-aggregator/Dockerfile .
 endif
 	docker tag antrea/flow-aggregator:$(DOCKER_IMG_VERSION) antrea/flow-aggregator
+	docker tag antrea/flow-aggregator:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/flow-aggregator
+	docker tag antrea/flow-aggregator:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/flow-aggregator:$(DOCKER_IMG_VERSION)
 
 .PHONY: verify
 verify:
diff --git a/build/yamls/flow-aggregator.yml b/build/yamls/flow-aggregator.yml
index e0253dead91..77c4d4782dc 100644
--- a/build/yamls/flow-aggregator.yml
+++ b/build/yamls/flow-aggregator.yml
@@ -61,7 +61,7 @@ spec:
         - --v=0
         command:
         - flow-aggregator
-        image: antrea/flow-aggregator
+        image: projects.registry.vmware.com/antrea/flow-aggregator:latest
         imagePullPolicy: IfNotPresent
         name: flow-aggregator
         ports:
diff --git a/build/yamls/flow-aggregator/base/flow-aggregator.yml b/build/yamls/flow-aggregator/base/flow-aggregator.yml
index ace34cc4e7f..09219166998 100644
--- a/build/yamls/flow-aggregator/base/flow-aggregator.yml
+++ b/build/yamls/flow-aggregator/base/flow-aggregator.yml
@@ -36,7 +36,7 @@ spec:
         command:
           - flow-aggregator
         name: flow-aggregator
-        image: antrea/flow-aggregator
+        image: flow-aggregator
         ports:
           - containerPort: 4739
         volumeMounts:
diff --git a/hack/generate-manifest-flow-aggregator.sh b/hack/generate-manifest-flow-aggregator.sh
index ab98fe40d73..d1529a88397 100755
--- a/hack/generate-manifest-flow-aggregator.sh
+++ b/hack/generate-manifest-flow-aggregator.sh
@@ -113,7 +113,7 @@ $KUSTOMIZE edit add base $BASE
 find ../../patches/$MODE -name \*.yml -exec cp {} . \;
 
 if [ "$MODE" == "dev" ]; then
-    $KUSTOMIZE edit set image flow-aggregator=antrea/flow-aggregator:latest
+    $KUSTOMIZE edit set image flow-aggregator=projects.registry.vmware.com/antrea/flow-aggregator:latest
     $KUSTOMIZE edit add patch imagePullPolicy.yml
 fi
 
diff --git a/hack/release/prepare-assets.sh b/hack/release/prepare-assets.sh
index fbf9e1d2bb7..5398aedd36a 100755
--- a/hack/release/prepare-assets.sh
+++ b/hack/release/prepare-assets.sh
@@ -78,7 +78,7 @@ export IMG_NAME=projects.registry.vmware.com/antrea/octant-antrea-ubuntu
 export IMG_NAME=projects.registry.vmware.com/antrea/antrea-windows
 ./hack/generate-manifest-windows.sh --mode release > "$OUTPUT_DIR"/antrea-windows.yml
 
-export IMG_NAME=antrea/flow-aggregator
+export IMG_NAME=projects.registry.vmware.com/antrea/flow-aggregator
 ./hack/generate-manifest-flow-aggregator.sh --mode release > "$OUTPUT_DIR"/flow-aggregator.yml
 
 ls "$OUTPUT_DIR" | cat