From 307c48f88a57110e1c762a66f9cac60e4966cb6f Mon Sep 17 00:00:00 2001
From: sarahpeiffer <speiffer@wustl.edu>
Date: Thu, 23 Sep 2021 13:02:50 -0700
Subject: [PATCH] CDPX repo naming change

---
 .../Parameters/ContainerInsights.Linux.Parameters.json    | 4 ----
 .../Parameters/ContainerInsights.Windows.Parameters.json  | 4 ----
 .../ScopeBindings/Public.ScopeBindings.json               | 8 --------
 .../ServiceGroupRoot/Scripts/pushAgentToAcr.sh            | 7 +------
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Linux.Parameters.json b/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Linux.Parameters.json
index b9ca8c407..6104609a6 100644
--- a/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Linux.Parameters.json
+++ b/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Linux.Parameters.json
@@ -43,10 +43,6 @@
               "name": "AGENT_IMAGE_FULL_PATH",
               "value": "__ACR_NAME__/public/azuremonitor/containerinsights/__AGENT_RELEASE__:__AGENT_RELEASE____AGENT_IMAGE_TAG_SUFFIX__"
             }, 
-            {
-              "name": "CDPX_ACR",
-              "value": "__CDPX_LINUX_ACR__"
-            },
             {
               "name": "CDPX_REGISTRY",
               "value": "__CDPX_LINUX_REGISTRY__"
diff --git a/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Windows.Parameters.json b/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Windows.Parameters.json
index f7f12218f..de0bbfe1c 100644
--- a/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Windows.Parameters.json
+++ b/deployment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Windows.Parameters.json
@@ -43,10 +43,6 @@
                 "name": "AGENT_IMAGE_FULL_PATH",
                 "value": "__ACR_NAME__/public/azuremonitor/containerinsights/__AGENT_RELEASE__:win-__AGENT_RELEASE____AGENT_IMAGE_TAG_SUFFIX__"
             },
-            {
-              "name": "CDPX_ACR",
-              "value": "__CDPX_WINDOWS_ACR__"
-            },
             {
               "name": "CDPX_REGISTRY",
               "value": "__CDPX_WINDOWS_REGISTRY__"
diff --git a/deployment/agent-deployment/ServiceGroupRoot/ScopeBindings/Public.ScopeBindings.json b/deployment/agent-deployment/ServiceGroupRoot/ScopeBindings/Public.ScopeBindings.json
index 82a1fae73..cbc6db8b3 100644
--- a/deployment/agent-deployment/ServiceGroupRoot/ScopeBindings/Public.ScopeBindings.json
+++ b/deployment/agent-deployment/ServiceGroupRoot/ScopeBindings/Public.ScopeBindings.json
@@ -21,14 +21,6 @@
                     "find": "__MANAGED_IDENTITY__",
                     "replaceWith": "$(ManagedIdentity)"
                 }, 
-                {
-                    "find": "__CDPX_LINUX_ACR__",
-                    "replaceWith": "$(CDPXLinuxACR)"
-                },
-                {
-                    "find": "__CDPX_WINDOWS_ACR__",
-                    "replaceWith": "$(CDPXWindowsACR)"
-                },
                 {
                     "find": "__CDPX_LINUX_REGISTRY__",
                     "replaceWith": "$(CDPXLinuxRegistry)"
diff --git a/deployment/agent-deployment/ServiceGroupRoot/Scripts/pushAgentToAcr.sh b/deployment/agent-deployment/ServiceGroupRoot/Scripts/pushAgentToAcr.sh
index f319c3bbe..7d1b6c27e 100644
--- a/deployment/agent-deployment/ServiceGroupRoot/Scripts/pushAgentToAcr.sh
+++ b/deployment/agent-deployment/ServiceGroupRoot/Scripts/pushAgentToAcr.sh
@@ -18,11 +18,6 @@ if [ -z $AGENT_IMAGE_FULL_PATH ]; then
   exit 1
 fi
 
-if [ -z $CDPX_ACR ]; then
-  echo "-e error value of CDPX_ACR shouldn't be empty. check release variables"
-  exit 1
-fi
-
 if [ -z $CDPX_TAG ]; then
   echo "-e error value of CDPX_TAG shouldn't be empty. check release variables"
   exit 1
@@ -55,7 +50,7 @@ else
 fi     
 
 echo "Pushing ${AGENT_IMAGE_FULL_PATH} to ${ACR_NAME}"
-az acr import --name $ACR_NAME --registry $CDPX_REGISTRY --source ${CDPX_ACR}/official/${CDPX_REPO_NAME}:${CDPX_TAG} --image $AGENT_IMAGE_FULL_PATH
+az acr import --name $ACR_NAME --registry $CDPX_REGISTRY --source official/${CDPX_REPO_NAME}:${CDPX_TAG} --image $AGENT_IMAGE_FULL_PATH
 if [ $? -eq 0 ]; then
   echo "Retagged and pushed image successfully"
 else