Skip to content

Commit 98e4450

Browse files
pjohnst5pjohnst5
authored
Merge branch 'master' into copilot/fix-3550
Signed-off-by: Paul Johnston <[email protected]>
2 parents be4ab3f + f2d2be5 commit 98e4450

File tree

119 files changed

+3531
-1749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+3531
-1749
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
"postCreateCommand": "make setup",
5858
"remoteUser": "vscode",
5959
"features": {
60+
"ghcr.io/devcontainers/features/go:1": {
61+
"version": "1.23.2"
62+
},
6063
"docker-in-docker": "latest",
6164
"kubectl-helm-minikube": "latest",
6265
"git": "latest",

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
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
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

‎.github/dependabot.yaml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ updates:
1717
prefix: "ci"
1818
labels: [ "ci", "dependencies" ]
1919
open-pull-requests-limit: 10
20+
21+
22+
# Constrain Kubernetes dependencies to compatibility with default branch - v1.33-v1.35
2023
- package-ecosystem: "gomod"
2124
directory: "/"
2225
schedule:
@@ -25,6 +28,19 @@ updates:
2528
prefix: "deps"
2629
labels: [ "dependencies" ]
2730
open-pull-requests-limit: 10
31+
ignore:
32+
- dependency-name: "k8s.io/api"
33+
versions: [">=0.35.0"]
34+
- dependency-name: "k8s.io/apiextensions-apiserver"
35+
versions: [">=0.35.0"]
36+
- dependency-name: "k8s.io/apimachinery"
37+
versions: [">=0.35.0"]
38+
- dependency-name: "k8s.io/client-go"
39+
versions: [">=0.35.0"]
40+
- dependency-name: "k8s.io/kubelet"
41+
versions: [">=0.35.0"]
42+
- dependency-name: "k8s.io/kubectl"
43+
versions: [">=0.35.0"]
2844
- package-ecosystem: "gomod"
2945
directory: "/azure-ipam"
3046
schedule:
@@ -33,6 +49,19 @@ updates:
3349
prefix: "deps"
3450
labels: [ "dependencies", "azure-ipam" ]
3551
open-pull-requests-limit: 10
52+
ignore:
53+
- dependency-name: "k8s.io/api"
54+
versions: [">=0.35.0"]
55+
- dependency-name: "k8s.io/apiextensions-apiserver"
56+
versions: [">=0.35.0"]
57+
- dependency-name: "k8s.io/apimachinery"
58+
versions: [">=0.35.0"]
59+
- dependency-name: "k8s.io/client-go"
60+
versions: [">=0.35.0"]
61+
- dependency-name: "k8s.io/kubelet"
62+
versions: [">=0.35.0"]
63+
- dependency-name: "k8s.io/kubectl"
64+
versions: [">=0.35.0"]
3665
- package-ecosystem: "gomod"
3766
directory: "/build/tools"
3867
schedule:
@@ -41,6 +70,19 @@ updates:
4170
prefix: "deps"
4271
labels: [ "dependencies" ]
4372
open-pull-requests-limit: 10
73+
ignore:
74+
- dependency-name: "k8s.io/api"
75+
versions: [">=0.35.0"]
76+
- dependency-name: "k8s.io/apiextensions-apiserver"
77+
versions: [">=0.35.0"]
78+
- dependency-name: "k8s.io/apimachinery"
79+
versions: [">=0.35.0"]
80+
- dependency-name: "k8s.io/client-go"
81+
versions: [">=0.35.0"]
82+
- dependency-name: "k8s.io/kubelet"
83+
versions: [">=0.35.0"]
84+
- dependency-name: "k8s.io/kubectl"
85+
versions: [">=0.35.0"]
4486
- package-ecosystem: "gomod"
4587
directory: "/dropgz"
4688
schedule:
@@ -57,6 +99,60 @@ updates:
5799
prefix: "deps"
58100
labels: [ "dependencies" ]
59101
open-pull-requests-limit: 10
102+
103+
104+
# Constrain Kubernetes dependencies to compatibility with release/v1.6 branch - v1.30-v1.32
105+
- package-ecosystem: "gomod"
106+
directory: "/"
107+
schedule:
108+
interval: "daily"
109+
reviewers:
110+
- "azure/azure-sdn-members"
111+
commit-message:
112+
prefix: "deps"
113+
labels: [ "dependencies" ]
114+
open-pull-requests-limit: 10
115+
target-branch: "release/v1.6"
116+
ignore:
117+
- dependency-name: "k8s.io/api"
118+
versions: [">=0.32.0"]
119+
- dependency-name: "k8s.io/apiextensions-apiserver"
120+
versions: [">=0.32.0"]
121+
- dependency-name: "k8s.io/apimachinery"
122+
versions: [">=0.32.0"]
123+
- dependency-name: "k8s.io/client-go"
124+
versions: [">=0.32.0"]
125+
- dependency-name: "k8s.io/kubelet"
126+
versions: [">=0.32.0"]
127+
- dependency-name: "k8s.io/kubectl"
128+
versions: [">=0.32.0"]
129+
- package-ecosystem: "gomod"
130+
directory: "/azure-ipam"
131+
schedule:
132+
interval: "daily"
133+
reviewers:
134+
- "azure/azure-sdn-members"
135+
commit-message:
136+
prefix: "deps"
137+
labels: [ "dependencies", "azure-ipam" ]
138+
open-pull-requests-limit: 10
139+
target-branch: "release/v1.6"
140+
ignore:
141+
- dependency-name: "k8s.io/api"
142+
versions: [">=0.32.0"]
143+
- dependency-name: "k8s.io/apiextensions-apiserver"
144+
versions: [">=0.32.0"]
145+
- dependency-name: "k8s.io/apimachinery"
146+
versions: [">=0.32.0"]
147+
- dependency-name: "k8s.io/client-go"
148+
versions: [">=0.32.0"]
149+
- dependency-name: "k8s.io/kubelet"
150+
versions: [">=0.32.0"]
151+
- dependency-name: "k8s.io/kubectl"
152+
versions: [">=0.32.0"]
153+
154+
155+
# Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - v1.28-v1.30
60156
- package-ecosystem: "gomod"
61157
directory: "/"
62158
schedule:
@@ -66,6 +162,19 @@ updates:
66162
labels: [ "dependencies", "release/1.5" ]
67163
open-pull-requests-limit: 10
68164
target-branch: "release/v1.5"
165+
ignore:
166+
- dependency-name: "k8s.io/api"
167+
versions: [">=0.30.0"]
168+
- dependency-name: "k8s.io/apiextensions-apiserver"
169+
versions: [">=0.30.0"]
170+
- dependency-name: "k8s.io/apimachinery"
171+
versions: [">=0.30.0"]
172+
- dependency-name: "k8s.io/client-go"
173+
versions: [">=0.30.0"]
174+
- dependency-name: "k8s.io/kubelet"
175+
versions: [">=0.30.0"]
176+
- dependency-name: "k8s.io/kubectl"
177+
versions: [">=0.30.0"]
69178
- package-ecosystem: "gomod"
70179
directory: "/azure-ipam"
71180
schedule:
@@ -75,6 +184,22 @@ updates:
75184
labels: [ "dependencies", "azure-ipam", "release/1.5" ]
76185
open-pull-requests-limit: 10
77186
target-branch: "release/v1.5"
187+
ignore:
188+
- dependency-name: "k8s.io/api"
189+
versions: [">=0.30.0"]
190+
- dependency-name: "k8s.io/apiextensions-apiserver"
191+
versions: [">=0.30.0"]
192+
- dependency-name: "k8s.io/apimachinery"
193+
versions: [">=0.30.0"]
194+
- dependency-name: "k8s.io/client-go"
195+
versions: [">=0.30.0"]
196+
- dependency-name: "k8s.io/kubelet"
197+
versions: [">=0.30.0"]
198+
- dependency-name: "k8s.io/kubectl"
199+
versions: [">=0.30.0"]
200+
201+
202+
# Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - v1.25-v1.27
78203
- package-ecosystem: "gomod"
79204
directory: "/"
80205
schedule:
@@ -84,6 +209,19 @@ updates:
84209
labels: [ "dependencies", "release/1.4" ]
85210
open-pull-requests-limit: 10
86211
target-branch: "release/v1.4"
212+
ignore:
213+
- dependency-name: "k8s.io/api"
214+
versions: [">=0.27.0"]
215+
- dependency-name: "k8s.io/apiextensions-apiserver"
216+
versions: [">=0.27.0"]
217+
- dependency-name: "k8s.io/apimachinery"
218+
versions: [">=0.27.0"]
219+
- dependency-name: "k8s.io/client-go"
220+
versions: [">=0.27.0"]
221+
- dependency-name: "k8s.io/kubelet"
222+
versions: [">=0.27.0"]
223+
- dependency-name: "k8s.io/kubectl"
224+
versions: [">=0.27.0"]
87225
- package-ecosystem: "gomod"
88226
directory: "/azure-ipam"
89227
schedule:
@@ -93,3 +231,16 @@ updates:
93231
labels: [ "dependencies", "azure-ipam", "release/1.4" ]
94232
open-pull-requests-limit: 10
95233
target-branch: "release/v1.4"
234+
ignore:
235+
- dependency-name: "k8s.io/api"
236+
versions: [">=0.27.0"]
237+
- dependency-name: "k8s.io/apiextensions-apiserver"
238+
versions: [">=0.27.0"]
239+
- dependency-name: "k8s.io/apimachinery"
240+
versions: [">=0.27.0"]
241+
- dependency-name: "k8s.io/client-go"
242+
versions: [">=0.27.0"]
243+
- dependency-name: "k8s.io/kubelet"
244+
versions: [">=0.27.0"]
245+
- dependency-name: "k8s.io/kubectl"
246+
versions: [">=0.27.0"]

‎.github/workflows/golangci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
uses: golangci/golangci-lint-action@v6
3131
with:
3232
version: v1.61
33-
args: --new-from-rev=origin/master --config=.golangci.yml --timeout=25m
33+
args: ${{ github.event_name == 'pull_request' && format('--new-from-rev=origin/{0}', github.base_ref) || '' }} --config=.golangci.yml --timeout=25m

‎.github/workflows/stale.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ jobs:
1616
id: stale
1717
with:
1818
ascending: true
19-
close-issue-message: 'Issue closed due to inactivity.'
2019
close-pr-message: 'Pull request closed due to inactivity.'
21-
days-before-close: 7
2220
days-before-stale: 14
21+
days-before-issue-close: -1
22+
days-before-pr-close: 7
2323
delete-branch: true
2424
exempt-issue-labels: 'exempt-stale'
25+
exempt-pr-labels: 'exempt-stale,dependencies,ci'
2526
operations-per-run: 100
26-
stale-issue-message: 'This issue is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days'
27+
stale-issue-message: 'This issue is stale because it has been open for 2 weeks with no activity. Remove stale label or comment to keep it open.'
2728
stale-pr-message: 'This pull request is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days'
2829
- name: Print outputs
2930
run: echo ${{ join(steps.stale.outputs.*, ',') }}

‎.golangci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
issues:
22
max-same-issues: 0
33
max-issues-per-linter: 0
4-
new-from-rev: origin/master
54
linters:
65
presets:
76
- bugs

‎.pipelines/build/dockerfiles/azure-ip-masq-merger.Dockerfile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ARG ARCH
2+
3+
FROM scratch AS linux
4+
ARG ARTIFACT_DIR
5+
6+
COPY ${ARTIFACT_DIR}/bin/azure-ip-masq-merger /azure-ip-masq-merger
7+
ENTRYPOINT ["/azure-ip-masq-merger"]

‎.pipelines/build/dockerfiles/cni.Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
# !! AUTOGENERATED - DO NOT EDIT !!
2+
# SOURCE: .pipelines/build/dockerfiles/cni.Dockerfile.tmpl
13
ARG ARCH
24

3-
4-
# skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
5-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
5+
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
6+
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
67
ARG ARTIFACT_DIR .
78

89
COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe

‎.pipelines/build/dockerfiles/cni.Dockerfile.tmpl‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# {{.RENDER_MSG}}
2+
# SOURCE: {{.SRC_PIPE}}
3+
ARG ARCH
4+
5+
# {{.WIN_HPC_IMG}}
6+
FROM --platform=windows/${ARCH} {{.WIN_HPC_PIN}} AS windows
7+
ARG ARTIFACT_DIR .
8+
9+
COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe
10+
ENTRYPOINT [ "/dropgz.exe" ]
11+
12+
13+
FROM scratch AS linux
14+
ARG ARTIFACT_DIR .
15+
16+
COPY ${ARTIFACT_DIR}/bin/dropgz /dropgz
17+
ENTRYPOINT [ "/dropgz" ]

‎.pipelines/build/dockerfiles/cns.Dockerfile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1+
# !! AUTOGENERATED - DO NOT EDIT !!
2+
# SOURCE: .pipelines/build/dockerfiles/cns.Dockerfile.tmpl
13
ARG ARCH
24

3-
45
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
56
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
67
ARG ARTIFACT_DIR .
78

8-
COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
9-
COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1
109
COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
1110
ENTRYPOINT ["azure-cns.exe"]
1211
EXPOSE 10090
1312

14-
15-
# mcr.microsoft.com/cbl-mariner/base/core:2.0
16-
# skopeo inspect docker://mcr.microsoft.com/cbl-mariner/base/core:2.0 --format "{{.Name}}@{{.Digest}}"
17-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:961bfedbbbdc0da51bc664f51d959da292eced1ad46c3bf674aba43b9be8c703 AS build-helper
13+
# mcr.microsoft.com/azurelinux/base/core:3.0
14+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:9948138108a3d69f1dae62104599ac03132225c3b7a5ac57b85a214629c8567d AS build-helper
1815
RUN tdnf install -y iptables
1916

20-
# mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0
21-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:7778a86d86947d5f64c1280a7ee0cf36c6c6d76b5749dd782fbcc14f113961bf AS linux
17+
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
18+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0801b80a0927309572b9adc99bd1813bc680473175f6e8175cd4124d95dbd50c AS linux
2219
ARG ARTIFACT_DIR .
2320

2421
COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/

0 commit comments

Comments
 (0)