Skip to content

Commit 3cc100f

Browse files
authored
Merge branch 'master' into jainriya/npmUnitTestFix
2 parents 24626be + bbe5cb9 commit 3cc100f

30 files changed

+675
-291
lines changed

.github/dependabot.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ updates:
2929
- "azure/azure-sdn-members"
3030
commit-message:
3131
prefix: "deps"
32+
labels: [ "dependencies" ]
3233
open-pull-requests-limit: 10
3334
- package-ecosystem: "gomod"
3435
directory: "/azure-ipam"
@@ -38,6 +39,7 @@ updates:
3839
- "azure/azure-sdn-members"
3940
commit-message:
4041
prefix: "deps"
42+
labels: [ "dependencies", "azure-ipam" ]
4143
open-pull-requests-limit: 10
4244
- package-ecosystem: "gomod"
4345
directory: "/build/tools"
@@ -47,18 +49,65 @@ updates:
4749
- "azure/azure-sdn-members"
4850
commit-message:
4951
prefix: "deps"
52+
labels: [ "dependencies" ]
5053
open-pull-requests-limit: 10
5154
- package-ecosystem: "gomod"
5255
directory: "/dropgz"
5356
schedule:
5457
interval: "daily"
5558
commit-message:
5659
prefix: "deps"
60+
labels: [ "dependencies", "dropgz" ]
5761
open-pull-requests-limit: 10
5862
- package-ecosystem: "gomod"
5963
directory: "/zapai"
6064
schedule:
6165
interval: "daily"
6266
commit-message:
6367
prefix: "deps"
68+
labels: [ "dependencies" ]
6469
open-pull-requests-limit: 10
70+
- package-ecosystem: "gomod"
71+
directory: "/"
72+
schedule:
73+
interval: "daily"
74+
reviewers:
75+
- "azure/azure-sdn-members"
76+
commit-message:
77+
prefix: "deps"
78+
labels: [ "dependencies", "release/1.5" ]
79+
open-pull-requests-limit: 10
80+
target-branch: "release/v1.5"
81+
- package-ecosystem: "gomod"
82+
directory: "/azure-ipam"
83+
schedule:
84+
interval: "daily"
85+
reviewers:
86+
- "azure/azure-sdn-members"
87+
commit-message:
88+
prefix: "deps"
89+
labels: [ "dependencies", "azure-ipam", "release/1.5" ]
90+
open-pull-requests-limit: 10
91+
target-branch: "release/v1.5"
92+
- package-ecosystem: "gomod"
93+
directory: "/"
94+
schedule:
95+
interval: "daily"
96+
reviewers:
97+
- "azure/azure-sdn-members"
98+
commit-message:
99+
prefix: "deps"
100+
labels: [ "dependencies", "release/1.4" ]
101+
open-pull-requests-limit: 10
102+
target-branch: "release/v1.4"
103+
- package-ecosystem: "gomod"
104+
directory: "/azure-ipam"
105+
schedule:
106+
interval: "daily"
107+
reviewers:
108+
- "azure/azure-sdn-members"
109+
commit-message:
110+
prefix: "deps"
111+
labels: [ "dependencies", "azure-ipam", "release/1.4" ]
112+
open-pull-requests-limit: 10
113+
target-branch: "release/v1.4"

.github/workflows/codeql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: github/codeql-action/init@v3
4444
with:
4545
languages: ${{ matrix.language }}
46-
queries: ./codeql/
46+
# queries: ./codeql/
4747
- name: Autobuild
4848
uses: github/codeql-action/autobuild@v3
4949
- name: Perform CodeQL Analysis

.pipelines/cni/lsg/lsg-cni-intergration-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ stages:
176176
echo "Delete load-test Namespace"
177177
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
178178
kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
179-
delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
179+
delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
180180
kubectl delete ns $delete
181181
kubectl cluster-info
182182
kubectl get po -owide -A

.pipelines/cni/singletenancy/cniv1-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ stages:
203203
echo "Delete load-test Namespace"
204204
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
205205
kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
206-
delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
206+
delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
207207
kubectl delete ns $delete
208208
kubectl cluster-info
209209
kubectl get po -owide -A
@@ -315,7 +315,7 @@ stages:
315315
echo "Delete load-test Namespace"
316316
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
317317
kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
318-
delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
318+
delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
319319
kubectl delete ns $delete
320320
kubectl cluster-info
321321
kubectl get po -owide -A

.pipelines/cni/singletenancy/cniv2-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ stages:
258258
echo "Delete load-test Namespace"
259259
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
260260
kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
261-
delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
261+
delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
262262
kubectl delete ns $delete
263263
kubectl cluster-info
264264
kubectl get po -owide -A

.pipelines/pipeline.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ trigger:
1919
include:
2020
- "*"
2121

22+
schedules:
23+
- cron: "0 2 * * *" # Every day at 2am
24+
displayName: "Official Nightly Pipeline"
25+
branches:
26+
include: ["master"]
27+
always: true
28+
2229
stages:
2330
- stage: setup
2431
displayName: ACN

azure-ipam/go.mod

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ toolchain go1.23.2
77
require (
88
github.com/Azure/azure-container-networking v1.5.21
99
github.com/containernetworking/cni v1.2.3
10-
github.com/containernetworking/plugins v1.6.0
10+
github.com/containernetworking/plugins v1.6.1
1111
github.com/pkg/errors v0.9.1
12-
github.com/stretchr/testify v1.9.0
12+
github.com/stretchr/testify v1.10.0
1313
go.uber.org/zap v1.27.0
1414
gopkg.in/natefinch/lumberjack.v2 v2.2.1
1515
)
@@ -24,13 +24,15 @@ require (
2424
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
2525
github.com/Masterminds/semver v1.5.0 // indirect
2626
github.com/Microsoft/go-winio v0.6.2 // indirect
27-
github.com/Microsoft/hcsshim v0.12.7 // indirect
27+
github.com/Microsoft/hcsshim v0.12.9 // indirect
2828
github.com/avast/retry-go/v3 v3.1.1 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/billgraziano/dpapi v0.5.0 // indirect
3131
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3232
github.com/containerd/cgroups/v3 v3.0.3 // indirect
33-
github.com/containerd/errdefs v0.1.0 // indirect
33+
github.com/containerd/errdefs v0.3.0 // indirect
34+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
35+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
3436
github.com/coreos/go-iptables v0.8.0 // indirect
3537
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3638
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -68,18 +70,18 @@ require (
6870
github.com/vishvananda/netns v0.0.4 // indirect
6971
go.opencensus.io v0.24.0 // indirect
7072
go.uber.org/multierr v1.11.0 // indirect
71-
golang.org/x/crypto v0.26.0 // indirect
73+
golang.org/x/crypto v0.31.0 // indirect
7274
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
73-
golang.org/x/net v0.28.0 // indirect
74-
golang.org/x/oauth2 v0.21.0 // indirect
75-
golang.org/x/sync v0.8.0 // indirect
76-
golang.org/x/sys v0.26.0 // indirect
77-
golang.org/x/term v0.23.0 // indirect
78-
golang.org/x/text v0.17.0 // indirect
75+
golang.org/x/net v0.30.0 // indirect
76+
golang.org/x/oauth2 v0.22.0 // indirect
77+
golang.org/x/sync v0.10.0 // indirect
78+
golang.org/x/sys v0.28.0 // indirect
79+
golang.org/x/term v0.27.0 // indirect
80+
golang.org/x/text v0.21.0 // indirect
7981
golang.org/x/time v0.5.0 // indirect
80-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
81-
google.golang.org/grpc v1.66.0 // indirect
82-
google.golang.org/protobuf v1.34.2 // indirect
82+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
83+
google.golang.org/grpc v1.67.0 // indirect
84+
google.golang.org/protobuf v1.35.1 // indirect
8385
gopkg.in/inf.v0 v0.9.1 // indirect
8486
gopkg.in/yaml.v2 v2.4.0 // indirect
8587
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)