Skip to content

Commit 443a6cb

Browse files
aggarwal0009aggarwal0009
authored
Merge branch 'master' into ankaggar/instantiate_device_plugin
2 parents efcec7d + 281770b commit 443a6cb

File tree

107 files changed

+2143
-1164
lines changed

Some content is hidden

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

107 files changed

+2143
-1164
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/cyclonus-netpol-extended-nightly-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
go-version: "^1.23"
3030

3131
- name: Setup Kind
32-
uses: engineerd/setup-kind@v0.5.0
32+
uses: engineerd/setup-kind@v0.6.2
3333
with:
3434
version: "v0.11.1"
3535
config: ./test/kind/kind.yaml

‎.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ stages:
142142
143143
echo "install Cilium onto Overlay Cluster with hubble enabled"
144144
export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
145-
export DIR=${CILIUM_VERSION_TAG%.*}
145+
export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
146146
echo "installing files from ${DIR}"
147147
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
148148
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files

‎.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/pipeline.yaml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,18 @@ stages:
3939
arch: amd64
4040
name: azure-ipam
4141
os: linux
42-
azure_ipam_windows2019_amd64:
42+
azure_ipam_windows_amd64:
4343
arch: amd64
4444
name: azure-ipam
4545
os: windows
46-
os_version: ltsc2019
47-
azure_ipam_windows2022_amd64:
48-
arch: amd64
49-
name: azure-ipam
50-
os: windows
51-
os_version: ltsc2022
5246
cni_linux_amd64:
5347
arch: amd64
5448
name: cni
5549
os: linux
56-
cni_windows2019_amd64:
57-
arch: amd64
58-
name: cni
59-
os: windows
60-
os_version: ltsc2019
61-
cni_windows2022_amd64:
50+
cni_windows_amd64:
6251
arch: amd64
6352
name: cni
6453
os: windows
65-
os_version: ltsc2022
6654
ipv6_hp_bpf_linux_amd64:
6755
arch: amd64
6856
name: ipv6-hp-bpf
@@ -71,18 +59,16 @@ stages:
7159
arch: amd64
7260
name: npm
7361
os: linux
74-
npm_windows2022_amd64:
62+
npm_windows_amd64:
7563
arch: amd64
7664
name: npm
7765
os: windows
78-
os_version: ltsc2022
7966
steps:
8067
- template: ../containers/container-template.yaml
8168
parameters:
8269
arch: $(arch)
8370
name: $(name)
8471
os: $(os)
85-
os_version: $(os_version)
8672
- job: containerize_linux_arm64
8773
displayName: Build Images
8874
pool:
@@ -160,14 +146,12 @@ stages:
160146
platforms: linux/amd64 linux/arm64 windows/amd64
161147
cni:
162148
name: cni
163-
os_versions: ltsc2019 ltsc2022
164149
platforms: linux/amd64 linux/arm64 windows/amd64
165150
ipv6-hp-bpf:
166151
name: ipv6-hp-bpf
167152
platforms: linux/amd64 linux/arm64
168153
npm:
169154
name: npm
170-
os_versions: ltsc2022
171155
platforms: linux/amd64 linux/arm64 windows/amd64
172156
steps:
173157
- template: ../containers/manifest-template.yaml

‎.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/containers/container-template.steps.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ parameters:
22
arch: ""
33
name: ""
44
os: ""
5-
os_version: ""
65

76
steps:
87
- task: AzureCLI@2
@@ -17,7 +16,7 @@ steps:
1716
- script: |
1817
set -e
1918
if [ "$IN_OS" = 'windows' ]; then export BUILDX_ACTION='--push'; fi
20-
make "$IMGNAME" OS="$IN_OS" ARCH="$IN_ARCH" OS_VERSION="$IN_OS_VERSION"
19+
make "$IMGNAME" OS="$IN_OS" ARCH="$IN_ARCH"
2120
name: image_build
2221
displayName: Image Build
2322
workingDirectory: $(ACN_DIR)
@@ -26,7 +25,6 @@ steps:
2625
IMGNAME: '${{ parameters.name }}-image'
2726
IN_OS: '${{ parameters.os }}'
2827
IN_ARCH: '${{ parameters.arch }}'
29-
IN_OS_VERSION: '${{ parameters.os_version }}'
3028

3129
- task: AzureCLI@2
3230
displayName: "Logout"

‎.pipelines/containers/container-template.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ parameters:
22
arch: ""
33
name: ""
44
os: ""
5-
os_version: ""
65

76
steps:
87
- task: AzureCLI@2
@@ -17,7 +16,7 @@ steps:
1716
- script: |
1817
set -e
1918
if [ ${{ parameters.os }} = 'windows' ]; then export BUILDX_ACTION='--push'; fi
20-
make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }}
19+
make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }}
2120
name: image_build
2221
displayName: Image Build
2322
retryCountOnTaskFailure: 3

‎.pipelines/containers/manifest-template.steps.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
parameters:
22
name: ""
33
platforms: ""
4-
os_versions: ""
54

65
steps:
76

@@ -16,7 +15,7 @@ steps:
1615
1716
- script: |
1817
set -e
19-
make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}" OS_VERSIONS="${{ parameters.os_versions }}"
18+
make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}"
2019
workingDirectory: $(ACN_DIR)
2120
name: manifest_build
2221
displayName: Manifest Build

0 commit comments

Comments
 (0)