Skip to content

Commit e3efa6d

Browse files
santhoshmprabhusanthoshmprabhu
committed
Merge remote-tracking branch 'origin/master' into sanprabhu/iptables-block-binary
2 parents ea38462 + 8cc5b7e commit e3efa6d

File tree

13 files changed

+110
-55
lines changed

13 files changed

+110
-55
lines changed

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
# review a PR in an area.
88
#
99
# Rules are evaluated in this order, and the last match is used for auto-assignment.
10-
* @azure/azure-sdn-members
11-
/.github/ @azure/acn-admins
12-
/cns/ @azure/acn-cns-reviewers
13-
/cni/ @azure/acn-cni-reviewers
14-
/dropgz/ @rbtr @camrynl @paulyufan2 @ashvindeodhar @thatmattlong
15-
/npm/ @azure/acn-npm-reviewers
16-
/zapai/ @rbtr @ZetaoZhuang
17-
/bpf-prog/ @camrynl
18-
/azure-ip-masq-merger/ @QxBytes @santhoshmprabhu
10+
* @azure/azure-sdn-members
11+
/.github/ @azure/acn-admins
12+
/cns/ @azure/acn-cns-reviewers
13+
/cni/ @azure/acn-cni-reviewers
14+
/dropgz/ @rbtr @camrynl @paulyufan2 @ashvindeodhar @thatmattlong
15+
/npm/ @azure/acn-npm-reviewers
16+
/zapai/ @rbtr @ZetaoZhuang
17+
/bpf-prog/ @camrynl
18+
/azure-ip-masq-merger/ @QxBytes @santhoshmprabhu
19+
/azure-iptables-monitor/ @QxBytes @santhoshmprabhu

‎.github/dependabot.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,9 @@ updates:
106106
directory: "/"
107107
schedule:
108108
interval: "daily"
109-
reviewers:
110-
- "azure/azure-sdn-members"
111109
commit-message:
112110
prefix: "deps"
113-
labels: [ "dependencies" ]
111+
labels: [ "dependencies", "release/1.6" ]
114112
open-pull-requests-limit: 10
115113
target-branch: "release/v1.6"
116114
ignore:
@@ -130,11 +128,9 @@ updates:
130128
directory: "/azure-ipam"
131129
schedule:
132130
interval: "daily"
133-
reviewers:
134-
- "azure/azure-sdn-members"
135131
commit-message:
136132
prefix: "deps"
137-
labels: [ "dependencies", "azure-ipam" ]
133+
labels: [ "dependencies", "azure-ipam", "release/1.6" ]
138134
open-pull-requests-limit: 10
139135
target-branch: "release/v1.6"
140136
ignore:

‎.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
ARG ARCH
2+
3+
# mcr.microsoft.com/azurelinux/base/core:3.0
4+
FROM mcr.microsoft.com/azurelinux/base/core@sha256:9948138108a3d69f1dae62104599ac03132225c3b7a5ac57b85a214629c8567d AS mariner-core
5+
6+
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
7+
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0801b80a0927309572b9adc99bd1813bc680473175f6e8175cd4124d95dbd50c AS mariner-distroless
8+
9+
FROM mariner-core AS iptables
10+
RUN tdnf install -y iptables
11+
12+
FROM mariner-distroless AS linux
13+
ARG ARTIFACT_DIR
14+
COPY --from=iptables /usr/sbin/*tables* /usr/sbin/
15+
COPY --from=iptables /usr/lib /usr/lib
16+
COPY ${ARTIFACT_DIR}/bin/azure-iptables-monitor /azure-iptables-monitor
17+
18+
ENTRYPOINT ["/azure-iptables-monitor"]

‎.pipelines/build/ob-prepare.steps.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ steps:
6262
echo "##vso[task.setvariable variable=azureIpMasqMergerVersion;isOutput=true]$AZUREIPMASQMERGERVERSION"
6363
echo "azureIpMasqMergerVersion: $AZUREIPMASQMERGERVERSION"
6464
65+
AZUREIPTABLESMONITORVERSION=$(make azure-iptables-monitor-version)
66+
echo "##vso[task.setvariable variable=azureIptablesMonitorVersion;isOutput=true]$AZUREIPTABLESMONITORVERSION"
67+
echo "azureIptablesMonitorVersion: $AZUREIPTABLESMONITORVERSION"
68+
6569
CNIVERSION=$(make cni-version)
6670
echo "##vso[task.setvariable variable=cniVersion;isOutput=true]$CNIVERSION"
6771
echo "cniVersion: $CNIVERSION"

‎.pipelines/build/scripts/azure-iptables-monitor.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
set -eux
3+
4+
[[ $OS =~ windows ]] && { echo "azure-iptables-monitor is not supported on Windows"; exit 1; }
5+
FILE_EXT=''
6+
7+
export CGO_ENABLED=0
8+
9+
mkdir -p "$OUT_DIR"/bin
10+
mkdir -p "$OUT_DIR"/files
11+
12+
pushd "$REPO_ROOT"/azure-iptables-monitor
13+
GOOS="$OS" go build -v -a -trimpath \
14+
-o "$OUT_DIR"/bin/azure-iptables-monitor"$FILE_EXT" \
15+
-ldflags "-s -w -X github.com/Azure/azure-container-networking/azure-iptables-monitor/internal/buildinfo.Version=$AZURE_IPTABLES_MONITOR_VERSION -X main.version=$AZURE_IPTABLES_MONITOR_VERSION" \
16+
-gcflags="-dwarflocationlists=true" \
17+
.
18+
popd

‎.pipelines/cni/pipeline.yaml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -227,22 +227,6 @@ stages:
227227
scaleup: ${SCALEUP_WIN}
228228
iterations: ${ITERATIONS_WIN}
229229

230-
- template: singletenancy/cniv2-template.yaml
231-
parameters:
232-
name: windows19_overlay
233-
clusterType: overlay-byocni-up
234-
clusterName: w19-amd-ov
235-
nodeCount: ${NODE_COUNT_WINCLUSTER_SYSTEMPOOL}
236-
nodeCountWin: ${NODE_COUNT_WIN}
237-
vmSize: ${VM_SIZE_WINCLUSTER_SYSTEMPOOL}
238-
vmSizeWin: ${VM_SIZE_WIN}
239-
arch: amd64
240-
os: windows
241-
os_version: 'ltsc2019'
242-
osSkuWin: 'Windows2019'
243-
scaleup: ${SCALEUP_WIN}
244-
iterations: ${ITERATIONS_WIN}
245-
246230
## Linux E2E
247231
- template: singletenancy/cniv1-template.yaml
248232
parameters:
@@ -561,7 +545,6 @@ stages:
561545
- rdma_linux_overlay
562546
- windows_podsubnet_HNS
563547
- windows_overlay_HNS
564-
- windows19_overlay_HNS
565548
- setup
566549
- ${{if eq(parameters.upgradeScenario, true)}}:
567550
- cilium_overlay_upgrade
@@ -636,9 +619,6 @@ stages:
636619
win-cniv2-overlay:
637620
name: windows_overlay
638621
clusterName: w22-over
639-
windows19_overlay:
640-
name: windows19_overlay
641-
clusterName: w19-amd-ov
642622
steps:
643623
- task: AzureCLI@2
644624
inputs:

‎.pipelines/pipeline.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ trigger:
1515
branches:
1616
include:
1717
- gh-readonly-queue/master/*
18+
- gh-readonly-queue/release/*
1819
tags:
1920
include:
2021
- "*"
@@ -125,6 +126,10 @@ stages:
125126
arch: amd64
126127
name: azure-ip-masq-merger
127128
os: linux
129+
azure_iptables_monitor_linux_amd64:
130+
arch: amd64
131+
name: azure-iptables-monitor
132+
os: linux
128133
cni_linux_amd64:
129134
arch: amd64
130135
name: cni
@@ -174,6 +179,10 @@ stages:
174179
arch: arm64
175180
name: azure-ip-masq-merger
176181
os: linux
182+
azure_iptables_monitor_linux_arm64:
183+
arch: arm64
184+
name: azure-iptables-monitor
185+
os: linux
177186
cni_linux_arm64:
178187
arch: arm64
179188
name: cni
@@ -228,6 +237,9 @@ stages:
228237
azure_ip_masq_merger:
229238
name: azure-ip-masq-merger
230239
platforms: linux/amd64 linux/arm64
240+
azure_iptables_monitor:
241+
name: azure-iptables-monitor
242+
platforms: linux/amd64 linux/arm64
231243
steps:
232244
- template: containers/manifest-template.yaml
233245
parameters:

‎.pipelines/run-pipeline.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ stages:
3838
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
3939
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
4040
AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
41+
AZURE_IPTABLES_MONITOR_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIptablesMonitorVersion'] ]
4142
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
4243
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
4344
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
@@ -68,6 +69,12 @@ stages:
6869
archiveName: azure-ip-masq-merger
6970
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
7071
imageTag: $(Build.BuildNumber)
72+
azure_iptables_monitor:
73+
name: azure-iptables-monitor
74+
extraArgs: ''
75+
archiveName: azure-iptables-monitor
76+
archiveVersion: $(AZURE_IPTABLES_MONITOR_VERSION)
77+
imageTag: $(Build.BuildNumber)
7178
cni:
7279
name: cni
7380
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
@@ -152,6 +159,12 @@ stages:
152159
archiveName: azure-ip-masq-merger
153160
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
154161
imageTag: $(Build.BuildNumber)
162+
azure_iptables_monitor:
163+
name: azure-iptables-monitor
164+
extraArgs: ''
165+
archiveName: azure-iptables-monitor
166+
archiveVersion: $(AZURE_IPTABLES_MONITOR_VERSION)
167+
imageTag: $(Build.BuildNumber)
155168
cni:
156169
name: cni
157170
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
@@ -190,6 +203,7 @@ stages:
190203

191204
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
192205
AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
206+
AZURE_IPTABLES_MONITOR_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIptablesMonitorVersion'] ]
193207
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
194208
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
195209
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
@@ -202,6 +216,9 @@ stages:
202216
IP_MASQ_MERGER_LINUX_AMD64_REF: $(IMAGE_REPO_PATH)/linux-amd64/azure-ip-masq-merger:$(Build.BuildNumber)
203217
IP_MASQ_MERGER_LINUX_ARM64_REF: $(IMAGE_REPO_PATH)/linux-arm64/azure-ip-masq-merger:$(Build.BuildNumber)
204218

219+
IPTABLES_MONITOR_LINUX_AMD64_REF: $(IMAGE_REPO_PATH)/linux-amd64/azure-iptables-monitor:$(Build.BuildNumber)
220+
IPTABLES_MONITOR_LINUX_ARM64_REF: $(IMAGE_REPO_PATH)/linux-arm64/azure-iptables-monitor:$(Build.BuildNumber)
221+
205222
CNI_LINUX_AMD64_REF: $(IMAGE_REPO_PATH)/linux-amd64/cni:$(Build.BuildNumber)
206223
CNI_LINUX_ARM64_REF: $(IMAGE_REPO_PATH)/linux-arm64/cni:$(Build.BuildNumber)
207224
CNI_WINDOWS_AMD64_REF: $(IMAGE_REPO_PATH)/windows-amd64/cni:$(Build.BuildNumber)
@@ -241,6 +258,15 @@ stages:
241258
imageReference: $(IP_MASQ_MERGER_LINUX_AMD64_REF)
242259
- platform: linux/arm64
243260
imageReference: $(IP_MASQ_MERGER_LINUX_ARM64_REF)
261+
- job: azure_iptables_monitor
262+
templateContext:
263+
name: azure-iptables-monitor
264+
image_tag: $(AZURE_IPTABLES_MONITOR_VERSION)
265+
platforms:
266+
- platform: linux/amd64
267+
imageReference: $(IPTABLES_MONITOR_LINUX_AMD64_REF)
268+
- platform: linux/arm64
269+
imageReference: $(IPTABLES_MONITOR_LINUX_ARM64_REF)
244270
- job: cni
245271
templateContext:
246272
name: cni

‎azure-iptables-monitor/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG OS
1515
ARG VERSION
1616
WORKDIR /azure-iptables-monitor
1717
COPY ./azure-iptables-monitor .
18-
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/iptables-monitor -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
18+
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/iptables-monitor -trimpath -ldflags "-s -w -X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
1919

2020
FROM mariner-core AS iptables
2121
RUN tdnf install -y iptables

‎azure-iptables-monitor/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.23.0
55
require (
66
github.com/coreos/go-iptables v0.8.0
77
github.com/stretchr/testify v1.9.0
8+
k8s.io/api v0.31.3
89
k8s.io/apimachinery v0.31.3
910
k8s.io/client-go v0.31.3
1011
k8s.io/component-base v0.31.3
@@ -44,7 +45,7 @@ require (
4445
github.com/spf13/pflag v1.0.5 // indirect
4546
github.com/x448/float16 v0.8.4 // indirect
4647
golang.org/x/net v0.38.0 // indirect
47-
golang.org/x/oauth2 v0.21.0 // indirect
48+
golang.org/x/oauth2 v0.27.0 // indirect
4849
golang.org/x/sys v0.31.0 // indirect
4950
golang.org/x/term v0.30.0 // indirect
5051
golang.org/x/text v0.23.0 // indirect
@@ -53,7 +54,6 @@ require (
5354
gopkg.in/inf.v0 v0.9.1 // indirect
5455
gopkg.in/yaml.v2 v2.4.0 // indirect
5556
gopkg.in/yaml.v3 v3.0.1 // indirect
56-
k8s.io/api v0.31.3 // indirect
5757
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
5858
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
5959
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)