Skip to content

fix(helm): use sovereign MCR endpoints for Bleu and Delos - #1834

Merged
rashmichandrashekar (rashmichandrashekar) merged 2 commits into
ci_prodfrom
rashmi/bleu-delos-mcr-endpoints
Nov 11, 2026
Merged

rashmichandrashekar (rashmichandrashekar) merged 2 commits into
ci_prodfrom
rashmi/bleu-delos-mcr-endpoints

Conversation

@rashmichandrashekar

@rashmichandrashekar rashmichandrashekar (rashmichandrashekar) commented Nov 11, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Add the missing Bleu and Delos image-registry mappings to the unified Container Insights chart's shared MCR helper:

Cloud MCR endpoint
AzureBleuCloud mcr.sovcloud-azure.fr
AzureDelosCloud mcr.sovcloud-azure.de

Matches the AKS RP MCR helpers and is the Docker Provider counterpart to Azure/prometheus-collector#1817.

The existing addon helper is used by Linux agent/Prometheus-sidecar, Windows agent, replicaset, multitenancy, and addon-resizer image references. Existing cloud-name matching, fallback behavior, repositories, and image tags are unchanged. Arc's explicitly configured image repositories, AKS-injected token-adapter YAML, and diagnostic MCR_URL settings are not modified.

Validation

Only the production registry helper is changed; the test-file addition has been removed as requested.

Local validation was performed against the unchanged helper code using a temporary PowerShell/Helm harness. It generated an isolated AKS chart from the tracked chart/values templates, enabled multitenancy and addon-resizer, and checked Helm lint plus all six affected image references across nine cases: empty/default, public, government, China, USNat, USSec, Bleu, Delos, and unknown cloud. Temporary chart files were cleaned up.

Command Result
helm lint $chart @helmArgs PASS: all nine cloud/default cases.
helm template ama-logs $chart @helmArgs PASS: all nine cases; six affected image references checked per case, including repository paths and Linux/Windows tag suffixes.
git diff --cached --check PASS.

$chart was the temporary generated chart; $helmArgs set global.commonGlobals.CloudEnvironment for each case and enabled OmsAgent.isRSVPAEnabled and OmsAgent.isMultitenancyLogsEnabled. Before the helper fix, the same harness reproduced the Bleu failure: images incorrectly used mcr.microsoft.com.

No cluster deployment, sovereign-registry image-pull validation, full image build, or cluster-backed E2E tests were run for this chart-only change. No test files or CI wiring changes are included.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 899929c5-d91e-45f6-b6f1-68564ebf9d5f
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 899929c5-d91e-45f6-b6f1-68564ebf9d5f
@rashmichandrashekar

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
2 pipeline(s) were filtered out due to trigger conditions.

@rashmichandrashekar
rashmichandrashekar (rashmichandrashekar) merged commit f2b91a6 into ci_prod Nov 11, 2026
20 checks passed
zanejohnson-azure pushed a commit that referenced this pull request Nov 13, 2026
…1835)

Fill the <tbd> linux/windows image tags and azurelinux version from
pipeline 444 ci_prod build 131881 (3.10.0-ci-prod-11-10-2026-c75cc056),
and add #1834 (shipped in the 3.10.0 build) to the Common section.

Assisted-by: Azure SRE Agent

Co-authored-by: azure-monitor-assistant[bot] <1435322+azure-monitor-assistant[bot]@users.noreply.github.com>
Co-authored-by: Azure SRE Agent <noreply@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants