Skip to content

fix(config): register Microsoft.ContainerInstance on mgmt subscriptions (ARO-28100)#5893

Merged
openshift-merge-bot[bot] merged 1 commit into
Azure:mainfrom
raelga:rael/register-containerinstance-ARO-28100
Jul 2, 2026
Merged

fix(config): register Microsoft.ContainerInstance on mgmt subscriptions (ARO-28100)#5893
openshift-merge-bot[bot] merged 1 commit into
Azure:mainfrom
raelga:rael/register-containerinstance-ARO-28100

Conversation

@raelga

@raelga raelga commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

ARO-28100 (epic ARO-28038)

What

Add Microsoft.ContainerInstance to the management subscription providers list (mgmt.subscription.providers in config/config.yaml) and regenerate the rendered dev configs (make -C config/ materialize).

# config/config.yaml — mgmt.subscription.providers
'Microsoft.ContainerInstance':
  poll: true

Why

The swift-vnet step (#5834, relanded in #5889) creates an Azure Container Instance (az container create) in the management subscription to run the Swift VNet create/tag as the Swift-registered globalMSI. That subscription's registered providers did not include Microsoft.ContainerInstance, and swift-vnet is the first ACI user in the repo. On a brand-new management subscription with Swift enabled, az container create could fail with MissingSubscriptionRegistration.

Adding it to the providers list means the existing rpRegistration step registers it before swift-vnet runs, making fresh region buildouts deterministic. Existing int/stg/prod mgmt subscriptions already have it registered (#5834's e2e ran the container), so this is a fast-follow hardening — not a fix for the current reland.

Flagged by Copilot review on #5889.

Testing

  • make -C config/ materialize — rendered dev configs regenerated; only Microsoft.ContainerInstance added.
  • verify-materialize (make -C config/ detect-change) is clean after committing the rendered outputs.

Special notes for your reviewer

mgmt-solo-pipeline.yaml is intentionally not touched: it is a manual/dev-only pipeline (not in any topology) with no rpRegistration step, and assumes a pre-registered subscription.

PR Checklist

  • PR is scoped to a single task
  • Title follows Conventional Commits
  • Summary explains the "Why"
  • Linked to relevant ticket/issue
  • Self-reviewed the diff
  • CI/CD checks are passing (ignore Tide)
  • Commit history is clean
  • Tricky code blocks are commented

…ns (ARO-28100)

The swift-vnet step creates an ACI (az container create) in the
management subscription, but Microsoft.ContainerInstance was not in
mgmt.subscription.providers, so a fresh management subscription with
Swift enabled could fail az container create with
MissingSubscriptionRegistration.

Add Microsoft.ContainerInstance to the mgmt providers list so the
rpRegistration step registers it before swift-vnet runs, making
fresh-subscription rollouts deterministic. Rendered dev configs
regenerated via 'make -C config/ materialize'.

Existing int/stg/prod mgmt subscriptions already have the provider
registered (Azure#5834's e2e ran the container), so this is a fast-follow
hardening, not a fix for the current reland (Azure#5889).

Flagged by Copilot review on Azure#5889.
Copilot AI review requested due to automatic review settings July 2, 2026 11:10
@openshift-ci openshift-ci Bot requested review from ashishmax31 and sclarkso July 2, 2026 11:10
@openshift-ci openshift-ci Bot added the approved label Jul 2, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Registers the Microsoft.ContainerInstance resource provider for management subscriptions by adding it to the shared mgmt.subscription.providers defaults and regenerating the rendered dev config outputs, ensuring swift-vnet (which uses Azure Container Instances in the mgmt subscription) won’t fail on freshly created subscriptions due to missing RP registration.

Changes:

  • Add Microsoft.ContainerInstance (with poll: true) to defaults.mgmt.subscription.providers in config/config.yaml.
  • Regenerate rendered dev configs so the new provider appears in the materialized per-environment YAML outputs.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.

Show a summary per file
File Description
config/config.yaml Adds Microsoft.ContainerInstance to the mgmt subscription provider registration defaults.
config/rendered/dev/pers/westus3.yaml Materialized dev config updated to include Microsoft.ContainerInstance under mgmt providers.
config/rendered/dev/perf/westus3.yaml Materialized dev config updated to include Microsoft.ContainerInstance under mgmt providers.
config/rendered/dev/dev/westus3.yaml Materialized dev config updated to include Microsoft.ContainerInstance under mgmt providers.
config/rendered/dev/cspr/westus3.yaml Materialized dev config updated to include Microsoft.ContainerInstance under mgmt providers.
config/rendered/dev/ci01/centralus.yaml Materialized dev config updated to include Microsoft.ContainerInstance under mgmt providers.
config/rendered/dev/ci00/centralus.yaml Materialized dev config updated to include Microsoft.ContainerInstance under mgmt providers.

@mmazur

mmazur commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

/lgtm

@openshift-ci

openshift-ci Bot commented Jul 2, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mmazur, raelga

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit 1624d02 into Azure:main Jul 2, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants