ci: extend pipeline image override support - #4774
Conversation
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
This replaces #4732 so the head is the upstream Prior ACN PR Pipeline validation at
Current parallel validation:
|
There was a problem hiding this comment.
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.
d265c4f to
29a26be
Compare
John Payne (jpayne3506)
left a comment
There was a problem hiding this comment.
Lgtm. Want to wait for Camryn Lee (@camrynl) or Vipul Singh (@vipul-21) get eyes on as well due to the manifest changes.
a1f151f
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>
a1f151f to
ad460b9
Compare
|
/azp run |
|
Azure Pipelines: Successfully started running 2 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
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: