Skip to content

CDPX repo naming change #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarahpeiffer merged 1 commit into from
Sep 23, 2021
Merged

CDPX repo naming change #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...ment/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Linux.Parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__"
Expand Down
4 changes: 0 additions & 4 deletions ...nt/agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Windows.Parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__"
Expand Down
8 changes: 0 additions & 8 deletions deployment/agent-deployment/ServiceGroupRoot/ScopeBindings/Public.ScopeBindings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
7 changes: 1 addition & 6 deletions deployment/agent-deployment/ServiceGroupRoot/Scripts/pushAgentToAcr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down