Skip to content

Commit 4a9110a

Browse files
authored
chore(deps): update dependencies in release/v1.4 (#3292)
update github workflows dependencies update build/tools deps update golangci workflow update crds update golangci workflow update Dockerfile update all go.mod update k8s e2e to use azure cli v2 update images update azure cli to v2 update ado pipeline yaml files update k8s version update cyclonus-netpol-test.yaml update go version update go version update cyclonus-netpol-test.yaml
1 parent 2dab850 commit 4a9110a

File tree

63 files changed

+861
-1331
lines changed

Some content is hidden

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

63 files changed

+861
-1331
lines changed

.github/workflows/codeql.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
language: [ 'go' ]
2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@v2
29+
uses: github/codeql-action/init@v3
3030
with:
3131
languages: ${{ matrix.language }}
3232
- name: Autobuild
33-
uses: github/codeql-action/autobuild@v2
33+
uses: github/codeql-action/autobuild@v3
3434
- name: Perform CodeQL Analysis
35-
uses: github/codeql-action/analyze@v2
35+
uses: github/codeql-action/analyze@v3

.github/workflows/crdgen.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
crdgen119:
1212
strategy:
1313
matrix:
14-
go-version: ["1.21", "1.22"]
14+
go-version: ["1.22", "1.23"]
1515
os: [ubuntu-latest]
1616
name: CRDs are Generated
1717
runs-on: ${{ matrix.os }}
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
22-
- uses: actions/setup-go@v4
22+
- uses: actions/setup-go@v5
2323
with:
2424
go-version: ${{ matrix.go-version }}
2525
- name: Regenerate NodeNetworkConfig CRD

.github/workflows/cyclonus-netpol-extended-nightly-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
]
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

28-
- uses: actions/setup-go@v4
28+
- uses: actions/setup-go@v5
2929
with:
3030
go-version: "^1.22"
3131

@@ -71,7 +71,7 @@ jobs:
7171
mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
7272
7373
- name: "Upload Logs"
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
if: always()
7676
with:
7777
name: logs

.github/workflows/cyclonus-netpol-test.yaml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ on:
55
push:
66
branches:
77
- main
8+
- release/*
89
pull_request:
910
paths:
10-
- "npm/**"
11-
- "github/**"
12-
- "test/**"
11+
- 'npm/**'
12+
- '.github/**'
1313
schedule:
1414
# run once a day at midnight
15-
- cron: "0 0 * * *"
15+
- cron: '0 0 * * *'
1616

1717
jobs:
1818
cyclonus-test:
@@ -30,27 +30,26 @@ jobs:
3030
]
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434

35-
- uses: actions/setup-go@v4
35+
- uses: actions/setup-go@v5
3636
with:
37-
go-version: "^1.22"
37+
go-version: '^1.23'
3838

3939
- name: Setup Kind
40-
uses: engineerd/setup-kind@v0.5.0
40+
uses: helm/kind-action@v1
4141
with:
42-
version: "v0.11.1"
42+
version: "v0.22.0"
43+
kubectl_version: "v1.27.7"
4344
config: ./test/kind/kind.yaml
44-
name: npm-kind
45+
cluster_name: npm-kind
4546

4647
- name: Check Kind
4748
run: |
4849
kubectl get po -owide -A
49-
5050
- name: Make NPM image
5151
run: |
5252
make npm-image NPM_PLATFORM_TAG=cyclonus PLATFORM=linux/amd64 CONTAINER_BUILDER=docker BUILDX_ACTION='--load'
53-
5453
- name: Install Azure NPM
5554
# set the ConfigMap based on the build matrix
5655
# currently have to restart the daemonset because changing the ConfigMap doesn't restart NPM
@@ -61,13 +60,11 @@ jobs:
6160
echo "Applying profile: ${{ matrix.profile }}"
6261
kubectl apply -f ./npm/profiles/${{ matrix.profile }}
6362
kubectl rollout restart ds azure-npm -n kube-system
64-
6563
- name: Check Cluster Components
6664
run: |
6765
sleep 10
6866
kubectl get po -owide -A
6967
kubectl describe ds azure-npm -n kube-system
70-
7168
- name: Run Cyclonus network policy test
7269
run: make test-cyclonus
7370

@@ -76,12 +73,11 @@ jobs:
7673
run: |
7774
kubectl logs -n kube-system -l k8s-app=azure-npm --tail -1 --prefix > npm-logs_${{ matrix.profile }}.txt
7875
mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
79-
80-
- name: "Upload Logs"
81-
uses: actions/upload-artifact@v3
76+
- name: 'Upload Logs'
77+
uses: actions/upload-artifact@v4
8278
if: always()
8379
with:
84-
name: logs
80+
name: logs-${{ matrix.profile }}
8581
path: |
8682
./npm-logs_${{ matrix.profile }}.txt
8783
./cyclonus-test_${{ matrix.profile }}.txt

.github/workflows/golangci.yaml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,27 @@ on:
77
- reopened
88
- synchronize
99
- ready_for_review
10+
merge_group:
11+
types:
12+
- checks_requested
1013
jobs:
11-
golangci119:
14+
golangci:
1215
strategy:
1316
fail-fast: false
1417
matrix:
15-
go-version: ["1.21.x", "1.22.x"]
18+
go-version: ['1.22.x', '1.23.x']
1619
os: [ubuntu-latest, windows-latest]
1720
name: Lint
1821
runs-on: ${{ matrix.os }}
1922
steps:
20-
- uses: actions/setup-go@v4
21-
with:
22-
go-version: ${{ matrix.go-version }}
23-
- uses: actions/checkout@v3
24-
with:
25-
fetch-depth: 0
26-
- name: golangci-lint
27-
uses: golangci/golangci-lint-action@v3
28-
with:
29-
version: v1.55.2
30-
args: --timeout=25m
31-
only-new-issues: true
23+
- uses: actions/setup-go@v5
24+
with:
25+
go-version: ${{ matrix.go-version }}
26+
- uses: actions/checkout@v4
27+
with:
28+
fetch-depth: 0
29+
- name: golangci-lint
30+
uses: golangci/golangci-lint-action@v6
31+
with:
32+
version: v1.61
33+
args: --new-from-rev=origin/release/v1.4 --config=.golangci.yml --timeout=25m

.pipelines/cni/cilium/cilium-cni-load-test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stages:
77
jobs:
88
- job: create_aks_cluster_with_cilium
99
steps:
10-
- task: AzureCLI@1
10+
- task: AzureCLI@2
1111
inputs:
1212
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
1313
scriptLocation: "inlineScript"
@@ -25,7 +25,7 @@ stages:
2525
jobs:
2626
- job: deploy_cilium_components
2727
steps:
28-
- task: AzureCLI@1
28+
- task: AzureCLI@2
2929
displayName: "Install Cilium, CNS, and ip-masq-agent"
3030
inputs:
3131
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
@@ -76,7 +76,7 @@ stages:
7676
jobs:
7777
- job: validate_state
7878
steps:
79-
- task: AzureCLI@1
79+
- task: AzureCLI@2
8080
inputs:
8181
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
8282
scriptLocation: "inlineScript"
@@ -95,7 +95,7 @@ stages:
9595
jobs:
9696
- job: restart_nodes
9797
steps:
98-
- task: AzureCLI@1
98+
- task: AzureCLI@2
9999
inputs:
100100
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
101101
scriptLocation: "inlineScript"
@@ -138,7 +138,7 @@ stages:
138138
rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
139139
name: "InstallCiliumCli"
140140
displayName: "Install Cilium CLI"
141-
- task: AzureCLI@1
141+
- task: AzureCLI@2
142142
inputs:
143143
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
144144
scriptLocation: "inlineScript"
@@ -162,7 +162,7 @@ stages:
162162
jobs:
163163
- job: delete_resources
164164
steps:
165-
- task: AzureCLI@1
165+
- task: AzureCLI@2
166166
inputs:
167167
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
168168
scriptLocation: "inlineScript"

.pipelines/cni/cilium/nightly-release-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ stages:
1616
make docker-operator-generic-image
1717
name: BuildCiliumImage
1818
displayName: "Build Cilium Image"
19-
- task: AzureCLI@1
19+
- task: AzureCLI@2
2020
displayName: "Login"
2121
inputs:
2222
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
2323
scriptLocation: "inlineScript"
2424
inlineScript: |
2525
az acr login -n $(ACR)
26-
- task: AzureCLI@1
26+
- task: AzureCLI@2
2727
inputs:
2828
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
2929
scriptLocation: "inlineScript"
@@ -35,7 +35,7 @@ stages:
3535
docker push $(ACR).azurecr.io/cilium/operator-generic:$(DOCKER_IMAGE_TAG)
3636
name: "PushCiliumImage"
3737
displayName: "Push Cilium Image"
38-
- task: AzureCLI@1
38+
- task: AzureCLI@2
3939
displayName: "Logout"
4040
inputs:
4141
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)

.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pool:
1414
name: $(BUILD_POOL_NAME_DEFAULT)
1515
steps:
16-
- task: AzureCLI@1
16+
- task: AzureCLI@2
1717
inputs:
1818
azureSubscription: ${{ parameters.sub }}
1919
scriptLocation: "inlineScript"

.pipelines/cni/load-test-templates/create-cluster-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
windowsVMSize: ""
77

88
steps:
9-
- task: AzureCLI@1
9+
- task: AzureCLI@2
1010
inputs:
1111
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1212
scriptLocation: "inlineScript"

.pipelines/cni/load-test-templates/pod-deployment-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
iterations: 4
66

77
steps:
8-
- task: AzureCLI@1
8+
- task: AzureCLI@2
99
displayName: "Pod Deployment"
1010
inputs:
1111
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)

0 commit comments

Comments
 (0)