Skip to content

Conversation

@QxBytes
Copy link
Contributor

@QxBytes QxBytes commented Jun 16, 2025

Reason for Change:

Adds building the azure ip masq merger to the signed and unsigned binaries pipelines. Merge once #3737 has merged in.

Issue Fixed:

Requirements:

Notes:
ACN PR Run Before Rebase: https://msazure.visualstudio.com/One/_build/results?buildId=127562678&view=results
ACN PR Run Latest: https://msazure.visualstudio.com/One/_build/results?buildId=127597027&view=results
ACN Official Build Signed: https://dev.azure.com/msazure/One/_build/results?buildId=127600651&view=results

@QxBytes QxBytes requested a review from Copilot June 16, 2025 19:53
@QxBytes QxBytes self-assigned this Jun 16, 2025
@QxBytes QxBytes added ci Infra or tooling. cilium Related to Cilium. labels Jun 16, 2025

This comment was marked as outdated.

@QxBytes QxBytes force-pushed the alew/add-azure-ip-masq-merger-pipeline branch from e163f81 to 72cc8c6 Compare June 17, 2025 22:38
@QxBytes QxBytes requested a review from Copilot June 17, 2025 22:40
Copy link
Contributor

Copilot AI left a comment

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 integrates the azure-ip-masq-merger into the CI pipelines so that its binary is built and published alongside existing components.

  • Added a README with usage and configuration instructions for the azure-ip-masq-merger.
  • Updated Dockerfiles for both Linux and Windows images to reference the new binary name.
  • Modified pipeline YAML files and build scripts to include azure-ip-masq-merger build and packaging steps.

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
azure-ip-masq-merger/README.md Added documentation describing the tool’s purpose, usage, and config.
azure-ip-masq-merger/Dockerfile Updated Dockerfile to copy and set the proper binary name and entrypoint.
.pipelines/run-pipeline.yaml Added environment variables and job definitions for the new merger build.
.pipelines/pipeline.yaml Included definitions for additional build jobs (architecture-specific).
.pipelines/build/scripts/azure-ip-masq-merger.sh New build script for compiling the azure-ip-masq-merger binary.
.pipelines/build/ob-prepare.steps.yaml Added steps to set the azure-ip-masq-merger version variable.
.pipelines/build/dockerfiles/azure-ip-masq-merger.Dockerfile New Dockerfile for building a minimal container image for the merger.

@QxBytes QxBytes marked this pull request as ready for review June 17, 2025 23:17
@QxBytes QxBytes requested a review from a team as a code owner June 17, 2025 23:17
@QxBytes QxBytes requested a review from pjohnst5 June 17, 2025 23:17
@QxBytes QxBytes force-pushed the alew/add-azure-ip-masq-merger-pipeline branch from 047b1a2 to d9541a4 Compare June 18, 2025 18:03
@QxBytes
Copy link
Contributor Author

QxBytes commented Jun 23, 2025

/azp run Azure Container Networking PR

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@QxBytes QxBytes added this pull request to the merge queue Jun 23, 2025
Merged via the queue into master with commit 191d3c5 Jun 23, 2025
96 of 99 checks passed
@QxBytes QxBytes deleted the alew/add-azure-ip-masq-merger-pipeline branch June 23, 2025 22:42
sivakami-projects pushed a commit that referenced this pull request Oct 23, 2025
* add ip masq merger to pipeline yaml

* add azure ip masq merger to signed binaries (acn official build) pipeline

todo: add azureIpMasqMergerVersion pipeline version somewhere

* add script and changes to signed pipeline

* add README to azure ip masq merger

* modify dockerfile to be consistent with binary naming

tested merged config live cluster with tcpdump

* update dockerfiles

* remove unused dockerfile components
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci Infra or tooling. cilium Related to Cilium.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants