Skip to content

Commit 491fb4c

Browse files
rejain456rejain456
authored
Merge branch 'master' into jainriya/distroless1
2 parents 75f54a5 + 7997767 commit 491fb4c

File tree

69 files changed

+1459
-814
lines changed

Some content is hidden

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

69 files changed

+1459
-814
lines changed

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

‎.pipelines/containers/manifest-template.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
name: manifest_build
2120
displayName: Manifest Build
2221
retryCountOnTaskFailure: 3

‎.pipelines/npm/npm-cni-integration-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
# deploy azure-npm-win
7070
# Windows
7171
kubectl apply -f npm/examples/windows/azure-npm.yaml
72-
kubectl set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-${{ parameters.tag }}
72+
kubectl set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-${{ parameters.tag }}
7373
kubectl rollout status -n kube-system daemonset/azure-npm-win
7474
7575
# konnectivity agent tends to fail after rollout. Give it time to recover

‎.pipelines/npm/npm-conformance-tests-latest-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
180180
az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
181181
./kubectl --kubeconfig=./kubeconfig apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/examples/windows/azure-npm.yaml
182-
./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-$(TAG)
182+
./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-$(TAG)
183183
184184
else
185185
echo "Creating Linux Cluster";
@@ -409,7 +409,7 @@ jobs:
409409
# ./kubectl --kubeconfig=./kubeconfig apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/examples/windows/azure-npm.yaml
410410

411411
# # swap azure-npm image with one built during run
412-
# ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-$(TAG)
412+
# ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-$(TAG)
413413

414414
# echo "sleeping 3 minutes to allow NPM pods to restart"
415415
# sleep 180

‎.pipelines/npm/npm-conformance-tests.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,16 @@ stages:
7474
arch: amd64
7575
name: npm
7676
os: linux
77-
npm_windows2022_amd64:
77+
npm_windows_amd64:
7878
arch: amd64
7979
name: npm
8080
os: windows
81-
os_version: ltsc2022
8281
steps:
8382
- template: ../containers/container-template.yaml
8483
parameters:
8584
arch: $(arch)
8685
name: $(name)
8786
os: $(os)
88-
os_version: $(os_version)
8987

9088
- stage: Create_Cluster_and_Run_Test
9189
displayName: NPM Conformance
@@ -204,7 +202,7 @@ stages:
204202
205203
az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
206204
./kubectl --kubeconfig=./kubeconfig apply -f $(Pipeline.Workspace)/s/npm/examples/windows/azure-npm.yaml
207-
./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-$(TAG)
205+
./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-$(TAG)
208206
209207
else
210208
echo "Creating Linux Cluster";
@@ -515,7 +513,7 @@ stages:
515513
# ./kubectl --kubeconfig=./kubeconfig apply -f $(Pipeline.Workspace)/s/npm/examples/windows/azure-npm.yaml
516514

517515
# # swap azure-npm image with one built during run
518-
# ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-$(TAG)
516+
# ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-$(TAG)
519517

520518
# echo "sleeping and waiting for NPM pods to be ready..."
521519
# sleep 1m

‎.pipelines/npm/npm-cyc-win-tests-latest-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
./kubectl --kubeconfig=./kubeconfig apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/examples/windows/azure-npm.yaml
154154
155155
# swap azure-npm image with one built during run
156-
./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-$(TAG)
156+
./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-$(TAG)
157157
158158
echo "sleeping 3 minutes to allow NPM pods to restart"
159159
sleep 180

0 commit comments

Comments
 (0)