From 08cc519db875b7a7fa3b9dbbd6bae3c3426d5538 Mon Sep 17 00:00:00 2001
From: Fiachra Corcoran <fiachra.corcoran@est.tech>
Date: Thu, 26 Jun 2025 17:27:49 +0100
Subject: [PATCH] Rename kpt-argo plugins

Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>
---
 .prow.yaml                                      | 8 ++++----
 gitops-tools/kpt-argocd-cmp/kpt-render/Makefile | 2 +-
 gitops-tools/kpt-argocd-cmp/kpt-repo/Makefile   | 2 +-
 gitops-tools/kpt-argocd-cmp/patch.sh            | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.prow.yaml b/.prow.yaml
index 68138f4f..34578107 100644
--- a/.prow.yaml
+++ b/.prow.yaml
@@ -119,7 +119,7 @@ postsubmits:
               - key: .dockerconfigjson
                 path: config.json
 
-  - name: build-push-argocd-kpt-repo-plugin-dev-image
+  - name: build-push-kpt-repo-argo-cmp-dev-image
     cluster: default
     always_run: true
     branches:
@@ -143,7 +143,7 @@ postsubmits:
         - "/bin/sh"
         - "-c"
         - |
-          executor --context=/home/prow/go/src/nephio_build/gitops-tools/kpt-argocd-cmp/kpt-repo/ --dockerfile=Dockerfile --destination=nephio/kpt-repo-plugin:${BUILD_ID} --destination=nephio/kpt-repo-plugin:latest
+          executor --context=/home/prow/go/src/nephio_build/gitops-tools/kpt-argocd-cmp/kpt-repo/ --dockerfile=Dockerfile --destination=nephio/kpt-repo-argo-cmp:${BUILD_ID} --destination=nephio/kpt-repo-argo-cmp:latest
         volumeMounts:
           - name: kaniko-secret
             mountPath: /kaniko/.docker/
@@ -159,7 +159,7 @@ postsubmits:
               - key: .dockerconfigjson
                 path: config.json
 
-  - name: build-push-argocd-kpt-render-plugin-dev-image
+  - name: build-push-kpt-render-argo-cmp-dev-image
     cluster: default
     always_run: true
     branches:
@@ -183,7 +183,7 @@ postsubmits:
         - "/bin/sh"
         - "-c"
         - |
-          executor --context=/home/prow/go/src/nephio_build/gitops-tools/kpt-argocd-cmp/kpt-render/ --dockerfile=Dockerfile --destination=nephio/kpt-render-plugin:${BUILD_ID} --destination=nephio/kpt-render-plugin:latest
+          executor --context=/home/prow/go/src/nephio_build/gitops-tools/kpt-argocd-cmp/kpt-render/ --dockerfile=Dockerfile --destination=nephio/kpt-render-argo-cmp:${BUILD_ID} --destination=nephio/kpt-render-argo-cmp:latest
         volumeMounts:
           - name: kaniko-secret
             mountPath: /kaniko/.docker/
diff --git a/gitops-tools/kpt-argocd-cmp/kpt-render/Makefile b/gitops-tools/kpt-argocd-cmp/kpt-render/Makefile
index e341262c..19063534 100644
--- a/gitops-tools/kpt-argocd-cmp/kpt-render/Makefile
+++ b/gitops-tools/kpt-argocd-cmp/kpt-render/Makefile
@@ -14,7 +14,7 @@
 
 IMAGE_TAG ?= latest
 REGISTRY ?= docker.io/nephio
-IMAGE_NAME ?= kpt-render-plugin
+IMAGE_NAME ?= kpt-render-argo-cmp
 IMG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
 
 include ../../../detect-container-runtime.mk
diff --git a/gitops-tools/kpt-argocd-cmp/kpt-repo/Makefile b/gitops-tools/kpt-argocd-cmp/kpt-repo/Makefile
index f448e6d0..d53db717 100644
--- a/gitops-tools/kpt-argocd-cmp/kpt-repo/Makefile
+++ b/gitops-tools/kpt-argocd-cmp/kpt-repo/Makefile
@@ -14,7 +14,7 @@
 
 IMAGE_TAG ?= latest
 REGISTRY ?= docker.io/nephio
-IMAGE_NAME ?= kpt-repo-plugin
+IMAGE_NAME ?= kpt-repo-argo-cmp
 IMG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
 
 include ../../../detect-container-runtime.mk
diff --git a/gitops-tools/kpt-argocd-cmp/patch.sh b/gitops-tools/kpt-argocd-cmp/patch.sh
index e8852299..41ab50a2 100755
--- a/gitops-tools/kpt-argocd-cmp/patch.sh
+++ b/gitops-tools/kpt-argocd-cmp/patch.sh
@@ -3,8 +3,8 @@ kubectl patch deployment argocd-repo-server -n argocd --type json -p='[
     "op": "add",
     "path": "/spec/template/spec/containers/-",
     "value": {
-      "name": "kpt-repo-plugin",
-      "image": "docker.io/nephio/kpt-repo-plugin:latest",
+      "name": "kpt-repo-argo-cmp",
+      "image": "docker.io/nephio/kpt-repo-argo-cmp:latest",
       "command": ["/var/run/argocd/argocd-cmp-server"],
       "securityContext": {
           "runAsNonRoot": true,
@@ -30,8 +30,8 @@ kubectl patch deployment argocd-repo-server -n argocd --type json -p='[
     "op": "add",
     "path": "/spec/template/spec/containers/-",
     "value": {
-      "name": "kpt-render-plugin",
-      "image": "docker.io/nephio/kpt-render-plugin:latest",
+      "name": "kpt-render-argo-cmp",
+      "image": "docker.io/nephio/kpt-render-argo-cmp:latest",
       "command": ["/var/run/argocd/argocd-cmp-server"],
       "securityContext": {
           "runAsNonRoot": true,