ci: extend pipeline image override support - #4732
Mugesh (mugeshsp) wants to merge 2 commits into
Conversation
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
There was a problem hiding this comment.
Pull request overview
This PR extends Azure Pipelines “image override” handling to additional Cilium-related components (azure-iptables-monitor, azure-ip-masq-merger, and cilium-log-collector) by switching manifests and deployment scripts to accept full image references (tag, digest, or tag+digest). It also simplifies CI build/publish selection by removing dedicated build booleans and deriving whether images are built/published from whether an override image parameter is provided.
Changes:
- Update Cilium integration manifests to use single env vars (e.g.,
AZURE_IPTABLES_MONITOR_IMAGE,AZURE_IP_MASQ_MERGER_IMAGE,CILIUM_LOG_COLLECTOR_IMAGE) instead of registry+tag pairs. - Add/standardize helper formatting logic for tag vs digest image references (
format_override_image/format_image) and propagate the new image env vars through the AKS deploy Makefile and pipeline install template. - Extend
.pipelines/pipeline.yamlparameters and build/publish matrix gating to cover the new components and remove redundantbuildCni/buildCns/buildIpambooleans.
Reviewed changes
Copilot reviewed 24 out of 24 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| test/integration/manifests/cilium/v1.19/ebpf/podsubnet/cilium.yaml | Switch azure-iptables-monitor image to $AZURE_IPTABLES_MONITOR_IMAGE. |
| test/integration/manifests/cilium/v1.19/ebpf/overlay/cilium.yaml | Switch azure-iptables-monitor + azure-ip-masq-merger images to single env-var image refs. |
| test/integration/manifests/cilium/v1.19/ebpf/dualstack/cilium.yaml | Switch azure-iptables-monitor + azure-ip-masq-merger images to single env-var image refs. |
| test/integration/manifests/cilium/v1.19/cilium-log-collector/daemonset-patch.yaml | Switch log collector image to $CILIUM_LOG_COLLECTOR_IMAGE. |
| test/integration/manifests/cilium/v1.18/ebpf/podsubnet/cilium.yaml | Switch azure-iptables-monitor image to $AZURE_IPTABLES_MONITOR_IMAGE. |
| test/integration/manifests/cilium/v1.18/ebpf/overlay/cilium.yaml | Switch azure-iptables-monitor + azure-ip-masq-merger images to single env-var image refs. |
| test/integration/manifests/cilium/v1.18/ebpf/dualstack/cilium.yaml | Switch azure-iptables-monitor + azure-ip-masq-merger images to single env-var image refs. |
| test/integration/manifests/cilium/v1.18/cilium-log-collector/daemonset-patch.yaml | Switch log collector image to $CILIUM_LOG_COLLECTOR_IMAGE. |
| test/integration/manifests/cilium/v1.17/ebpf/podsubnet/cilium.yaml | Switch azure-iptables-monitor image to $AZURE_IPTABLES_MONITOR_IMAGE. |
| test/integration/manifests/cilium/v1.17/ebpf/overlay/cilium.yaml | Switch azure-iptables-monitor + azure-ip-masq-merger images to single env-var image refs. |
| test/integration/manifests/cilium/v1.17/ebpf/dualstack/cilium.yaml | Switch azure-iptables-monitor + azure-ip-masq-merger images to single env-var image refs. |
| test/integration/manifests/cilium/v1.17/cilium-log-collector/daemonset-patch.yaml | Switch log collector image to $CILIUM_LOG_COLLECTOR_IMAGE. |
| hack/scripts/parse_override_image.sh | Update override parser to return repo/name/version and add format_override_image helper. |
| hack/aks/deploy.mk | Add computed *_IMAGE variables, export them, and update envsubst usage to substitute full image refs. |
| .pipelines/templates/network-install.yaml | Export new image env vars (with digest-aware formatting) and switch log collector injection to use CILIUM_LOG_COLLECTOR_IMAGE. |
| .pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml | Pass CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE via setup outputs. |
| .pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml | Pass CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE via setup outputs. |
| .pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml | Pass CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE via setup outputs. |
| .pipelines/singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml | Pass IPTables/MASQ/log-collector image overrides via setup outputs. |
| .pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml | Pass CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE via setup outputs. |
| .pipelines/singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml | Pass IPTables + log-collector image overrides via setup outputs. |
| .pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml | Pass CILIUM_LOG_COLLECTOR_IMAGE_OVERRIDE via setup outputs. |
| .pipelines/singletenancy/cilium-dualstack-ebpf/cilium-dualstack-e2e-job-template.yaml | Pass IPTables/MASQ/log-collector image overrides via setup outputs. |
| .pipelines/pipeline.yaml | Add new image parameters, compute formatted override images, and gate build/publish matrices on override presence. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
|
ACN PR Pipeline validation completed at
Validated new release images: monitor |
|
Superseded by #4774, whose head is the upstream Azure/azure-container-networking branch rather than the fork. |
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: