@@ -39,6 +39,7 @@ stages:
3939
4040 IMAGE_REPO_PATH : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
4141 AZURE_IPAM_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
42+ AZURE_IP_MASQ_MERGER_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
4243 CNI_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
4344 CNS_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
4445 IPV6_HP_BPF_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
@@ -63,6 +64,12 @@ stages:
6364 archiveVersion : $(AZURE_IPAM_VERSION)
6465 imageTag : $(Build.BuildNumber)
6566 packageWithDropGZ : True
67+ azure_ip_masq_merger :
68+ name : azure-ip-masq-merger
69+ extraArgs : ' '
70+ archiveName : azure-ip-masq-merger
71+ archiveVersion : $(AZURE_IP_MASQ_MERGER_VERSION)
72+ imageTag : $(Build.BuildNumber)
6673 cni :
6774 name : cni
6875 extraArgs : ' --build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
@@ -141,6 +148,12 @@ stages:
141148 extraArgs : ' '
142149 imageTag : $(Build.BuildNumber)
143150 packageWithDropGZ : True
151+ azure_ip_masq_merger :
152+ name : azure-ip-masq-merger
153+ extraArgs : ' '
154+ archiveName : azure-ip-masq-merger
155+ archiveVersion : $(AZURE_IP_MASQ_MERGER_VERSION)
156+ imageTag : $(Build.BuildNumber)
144157 cni :
145158 name : cni
146159 extraArgs : ' --build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
@@ -177,6 +190,7 @@ stages:
177190 IMAGE_REPO_PATH : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
178191
179192 AZURE_IPAM_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
193+ AZURE_IP_MASQ_MERGER_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
180194 CNI_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
181195 CNS_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
182196 IPV6_HP_BPF_VERSION : $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
@@ -186,6 +200,9 @@ stages:
186200 IPAM_LINUX_ARM64_REF : $(IMAGE_REPO_PATH)/linux-arm64/azure-ipam:$(Build.BuildNumber)
187201 IPAM_WINDOWS_AMD64_REF : $(IMAGE_REPO_PATH)/windows-amd64/azure-ipam:$(Build.BuildNumber)
188202
203+ IP_MASQ_MERGER_LINUX_AMD64_REF : $(IMAGE_REPO_PATH)/linux-amd64/azure-ip-masq-merger:$(Build.BuildNumber)
204+ IP_MASQ_MERGER_LINUX_ARM64_REF : $(IMAGE_REPO_PATH)/linux-arm64/azure-ip-masq-merger:$(Build.BuildNumber)
205+
189206 CNI_LINUX_AMD64_REF : $(IMAGE_REPO_PATH)/linux-amd64/cni:$(Build.BuildNumber)
190207 CNI_LINUX_ARM64_REF : $(IMAGE_REPO_PATH)/linux-arm64/cni:$(Build.BuildNumber)
191208 CNI_WINDOWS_AMD64_REF : $(IMAGE_REPO_PATH)/windows-amd64/cni:$(Build.BuildNumber)
@@ -216,6 +233,15 @@ stages:
216233 imageReference : $(IPAM_LINUX_ARM64_REF)
217234 - platform : windows/amd64
218235 imageReference : $(IPAM_WINDOWS_AMD64_REF)
236+ - job : azure_ip_masq_merger
237+ templateContext :
238+ name : azure-ip-masq-merger
239+ image_tag : $(AZURE_IP_MASQ_MERGER_VERSION)
240+ platforms :
241+ - platform : linux/amd64
242+ imageReference : $(IP_MASQ_MERGER_LINUX_AMD64_REF)
243+ - platform : linux/arm64
244+ imageReference : $(IP_MASQ_MERGER_LINUX_ARM64_REF)
219245 - job : cni
220246 templateContext :
221247 name : cni
0 commit comments