Skip to content

ci: extend pipeline image override support - #4774

Merged
Mugesh (mugeshsp) merged 6 commits into
masterfrom
ci/extend-image-overrides
Sep 9, 2026
Merged

Mugesh (mugeshsp) merged 6 commits into
masterfrom
ci/extend-image-overrides

Conversation

@mugeshsp

Copy link
Copy Markdown
Contributor

Reason for Change:

Extends pipeline image override support to azure-iptables-monitor, azure-ip-masq-merger, and cilium-log-collector.

Also removes redundant CNI, CNS, and Azure IPAM build booleans by deriving build and publish behavior from the image override parameters.

Issue Fixed:

Requirements:

Notes:

  • Preserves current default image versions and build behavior.
  • Supports tag, digest, and tag-plus-digest image references.
  • Validated the requested v0.0.4/v0.0.2/v0.0.2 override paths and default manifest parity.

Copilot AI lite review requested due to automatic review settings August 28, 2026 16:31
@azure-pipelines

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

@mugeshsp

Copy link
Copy Markdown
Contributor Author

This replaces #4732 so the head is the upstream Azure/azure-container-networking:ci/extend-image-overrides branch.

Prior ACN PR Pipeline validation at d82b2e636:

  • Default run 177958418: affected image builds and multiarch manifests ran; Azure Overlay Linux and relevant Cilium default/EBPF scenarios passed. The overall run failed in unrelated Windows/stateless E2E stages.
  • Combined override run 177998718: all six overridden components were omitted from image build/publish matrices; their values reached installers; relevant Linux/Cilium E2Es and cleanup passed.

Current parallel validation:

  • Default run 178675609 uses commit 492fe326e.
  • Override run 178676029 uses isolated commit fbd682c83 and verified acnpublic image inputs.
  • Commit 42864fdcd changes cluster suffixes to use Build.BuildId, preventing parallel-run collisions.

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

This PR extends the Azure Pipelines “image override” mechanism to additional Cilium-adjacent components (azure-iptables-monitor, azure-ip-masq-merger, and cilium-log-collector), and simplifies build/publish behavior by deriving it from whether an image override is supplied rather than separate boolean build flags. It updates both the pipeline wiring and the integration manifests/scripts so the new single-variable image references can be substituted consistently.

Changes:

  • Add new pipeline parameters/outputs for ebpf helper images and cilium-log-collector, and gate build/publish matrix entries based on whether overrides are provided.
  • Update AKS deploy Makefile and Cilium integration manifests to use full image variables (e.g., $AZURE_IPTABLES_MONITOR_IMAGE) instead of registry+tag pairs.
  • Refactor override parsing/formatting helpers to support composing fully qualified image strings from parsed inputs.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 9 comments.

Show a summary per file
File Description
test/integration/manifests/cilium/v1.19/ebpf/podsubnet/cilium.yaml Switch azure-iptables-monitor references to $AZURE_IPTABLES_MONITOR_IMAGE.
test/integration/manifests/cilium/v1.19/ebpf/overlay/cilium.yaml Switch azure-iptables-monitor and azure-ip-masq-merger references to single image variables.
test/integration/manifests/cilium/v1.19/ebpf/dualstack/cilium.yaml Switch ebpf helper images to $AZURE_IPTABLES_MONITOR_IMAGE / $AZURE_IP_MASQ_MERGER_IMAGE.
test/integration/manifests/cilium/v1.19/cilium-log-collector/daemonset-patch.yaml Switch cilium-log-collector image reference to $CILIUM_LOG_COLLECTOR_IMAGE.
test/integration/manifests/cilium/v1.18/ebpf/podsubnet/cilium.yaml Switch azure-iptables-monitor references to $AZURE_IPTABLES_MONITOR_IMAGE.
test/integration/manifests/cilium/v1.18/ebpf/overlay/cilium.yaml Switch azure-iptables-monitor and azure-ip-masq-merger references to single image variables.
test/integration/manifests/cilium/v1.18/ebpf/dualstack/cilium.yaml Switch ebpf helper images to $AZURE_IPTABLES_MONITOR_IMAGE / $AZURE_IP_MASQ_MERGER_IMAGE.
test/integration/manifests/cilium/v1.18/cilium-log-collector/daemonset-patch.yaml Switch cilium-log-collector image reference to $CILIUM_LOG_COLLECTOR_IMAGE.
test/integration/manifests/cilium/v1.17/ebpf/podsubnet/cilium.yaml Switch azure-iptables-monitor references to $AZURE_IPTABLES_MONITOR_IMAGE.
test/integration/manifests/cilium/v1.17/ebpf/overlay/cilium.yaml Switch azure-iptables-monitor and azure-ip-masq-merger references to single image variables.
test/integration/manifests/cilium/v1.17/ebpf/dualstack/cilium.yaml Switch ebpf helper images to $AZURE_IPTABLES_MONITOR_IMAGE / $AZURE_IP_MASQ_MERGER_IMAGE.
test/integration/manifests/cilium/v1.17/cilium-log-collector/daemonset-patch.yaml Switch cilium-log-collector image reference to $CILIUM_LOG_COLLECTOR_IMAGE.
hack/scripts/parse_override_image.sh Update override parsing output shape and add format_override_image helper.
hack/aks/deploy.mk Define/export full image variables for ebpf helpers + cilium-log-collector and update envsubst usage.
.pipelines/templates/network-install.yaml Add support for ebpf helper image overrides and cilium-log-collector full image override.
.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml Plumb cilium-log-collector image override output into job variables.
.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml Plumb cilium-log-collector image override output into job variables.
.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml Plumb cilium-log-collector image override output into job variables.
.pipelines/singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml Plumb ebpf helper + cilium-log-collector image override outputs into job variables.
.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml Plumb cilium-log-collector image override output into job variables.
.pipelines/singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml Plumb azure-iptables-monitor + cilium-log-collector image override outputs into job variables.
.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml Plumb cilium-log-collector image override output into job variables.
.pipelines/singletenancy/cilium-dualstack-ebpf/cilium-dualstack-e2e-job-template.yaml Plumb ebpf helper + cilium-log-collector image override outputs into job variables.
.pipelines/pipeline.yaml Add new override parameters/outputs and derive build/publish matrix inclusion from override presence.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread .pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml Outdated
Comment thread .pipelines/singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml Outdated
Comment thread .pipelines/singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml Outdated
Comment thread .pipelines/templates/network-install.yaml Outdated

@jpayne3506 John Payne (jpayne3506) 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.

Lgtm. Want to wait for Camryn Lee (@camrynl) or Vipul Singh (@vipul-21) get eyes on as well due to the manifest changes.

Comment thread .pipelines/pipeline.yaml Outdated
Comment thread .pipelines/pipeline.yaml Outdated
Comment thread .pipelines/pipeline.yaml
Comment thread hack/scripts/parse_override_image_test.sh Outdated
Mugesh (mugeshsp) and others added 6 commits September 3, 2026 21:32
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@mugeshsp
Mugesh (mugeshsp) force-pushed the ci/extend-image-overrides branch from a1f151f to ad460b9 Compare September 3, 2026 20:37
@mugeshsp
Mugesh (mugeshsp) removed the request for review from Evan Baker (rbtr) September 8, 2026 14:42
@mugeshsp

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

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

@mugeshsp
Mugesh (mugeshsp) added this pull request to the merge queue Sep 8, 2026
@mugeshsp
Mugesh (mugeshsp) removed this pull request from the merge queue due to a manual request Sep 8, 2026
@mugeshsp
Mugesh (mugeshsp) added this pull request to the merge queue Sep 8, 2026
@mugeshsp
Mugesh (mugeshsp) removed this pull request from the merge queue due to a manual request Sep 8, 2026
@mugeshsp
Mugesh (mugeshsp) added this pull request to the merge queue Sep 8, 2026
Merged via the queue into master with commit 184e93f Sep 9, 2026
194 of 205 checks passed
@mugeshsp
Mugesh (mugeshsp) deleted the ci/extend-image-overrides branch September 9, 2026 05:29
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.

5 participants