Skip to content

Commit

Permalink
chore(deps): update dependencies in release/v1.4 (#3292)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
nddq authored Jan 3, 2025
1 parent 2dab850 commit 4a9110a
Show file tree
Hide file tree
Showing 63 changed files with 861 additions and 1,331 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
language: [ 'go' ]
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/crdgen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
crdgen119:
strategy:
matrix:
go-version: ["1.21", "1.22"]
go-version: ["1.22", "1.23"]
os: [ubuntu-latest]
name: CRDs are Generated
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
- name: Regenerate NodeNetworkConfig CRD
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cyclonus-netpol-extended-nightly-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "^1.22"

Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
- name: "Upload Logs"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: logs
Expand Down
32 changes: 14 additions & 18 deletions .github/workflows/cyclonus-netpol-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ on:
push:
branches:
- main
- release/*
pull_request:
paths:
- "npm/**"
- "github/**"
- "test/**"
- 'npm/**'
- '.github/**'
schedule:
# run once a day at midnight
- cron: "0 0 * * *"
- cron: '0 0 * * *'

jobs:
cyclonus-test:
Expand All @@ -30,27 +30,26 @@ jobs:
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "^1.22"
go-version: '^1.23'

- name: Setup Kind
uses: engineerd/setup-kind@v0.5.0
uses: helm/kind-action@v1
with:
version: "v0.11.1"
version: "v0.22.0"
kubectl_version: "v1.27.7"
config: ./test/kind/kind.yaml
name: npm-kind
cluster_name: npm-kind

- name: Check Kind
run: |
kubectl get po -owide -A
- name: Make NPM image
run: |
make npm-image NPM_PLATFORM_TAG=cyclonus PLATFORM=linux/amd64 CONTAINER_BUILDER=docker BUILDX_ACTION='--load'
- name: Install Azure NPM
# set the ConfigMap based on the build matrix
# currently have to restart the daemonset because changing the ConfigMap doesn't restart NPM
Expand All @@ -61,13 +60,11 @@ jobs:
echo "Applying profile: ${{ matrix.profile }}"
kubectl apply -f ./npm/profiles/${{ matrix.profile }}
kubectl rollout restart ds azure-npm -n kube-system
- name: Check Cluster Components
run: |
sleep 10
kubectl get po -owide -A
kubectl describe ds azure-npm -n kube-system
- name: Run Cyclonus network policy test
run: make test-cyclonus

Expand All @@ -76,12 +73,11 @@ jobs:
run: |
kubectl logs -n kube-system -l k8s-app=azure-npm --tail -1 --prefix > npm-logs_${{ matrix.profile }}.txt
mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
- name: "Upload Logs"
uses: actions/upload-artifact@v3
- name: 'Upload Logs'
uses: actions/upload-artifact@v4
if: always()
with:
name: logs
name: logs-${{ matrix.profile }}
path: |
./npm-logs_${{ matrix.profile }}.txt
./cyclonus-test_${{ matrix.profile }}.txt
30 changes: 16 additions & 14 deletions .github/workflows/golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ on:
- reopened
- synchronize
- ready_for_review
merge_group:
types:
- checks_requested
jobs:
golangci119:
golangci:
strategy:
fail-fast: false
matrix:
go-version: ["1.21.x", "1.22.x"]
go-version: ['1.22.x', '1.23.x']
os: [ubuntu-latest, windows-latest]
name: Lint
runs-on: ${{ matrix.os }}
steps:
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.55.2
args: --timeout=25m
only-new-issues: true
- uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.61
args: --new-from-rev=origin/release/v1.4 --config=.golangci.yml --timeout=25m
12 changes: 6 additions & 6 deletions .pipelines/cni/cilium/cilium-cni-load-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:
jobs:
- job: create_aks_cluster_with_cilium
steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand All @@ -25,7 +25,7 @@ stages:
jobs:
- job: deploy_cilium_components
steps:
- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Install Cilium, CNS, and ip-masq-agent"
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
Expand Down Expand Up @@ -76,7 +76,7 @@ stages:
jobs:
- job: validate_state
steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand All @@ -95,7 +95,7 @@ stages:
jobs:
- job: restart_nodes
steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down Expand Up @@ -138,7 +138,7 @@ stages:
rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
name: "InstallCiliumCli"
displayName: "Install Cilium CLI"
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand All @@ -162,7 +162,7 @@ stages:
jobs:
- job: delete_resources
steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down
6 changes: 3 additions & 3 deletions .pipelines/cni/cilium/nightly-release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ stages:
make docker-operator-generic-image
name: BuildCiliumImage
displayName: "Build Cilium Image"
- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Login"
inputs:
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
inlineScript: |
az acr login -n $(ACR)
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand All @@ -35,7 +35,7 @@ stages:
docker push $(ACR).azurecr.io/cilium/operator-generic:$(DOCKER_IMAGE_TAG)
name: "PushCiliumImage"
displayName: "Push Cilium Image"
- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Logout"
inputs:
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
pool:
name: $(BUILD_POOL_NAME_DEFAULT)
steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: ${{ parameters.sub }}
scriptLocation: "inlineScript"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
windowsVMSize: ""

steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parameters:
iterations: 4

steps:
- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Pod Deployment"
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ parameters:
clusterName: ""

steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
restartCase: "false"

steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stages:
arch: amd64
os_version: ltsc2022
steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down Expand Up @@ -155,7 +155,7 @@ stages:
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
steps:
- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down
6 changes: 4 additions & 2 deletions .pipelines/containers/container-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ parameters:
os_version: ""

steps:
- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Login"
inputs:
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
scriptType: "bash"
inlineScript: |
az acr login -n $(ACR)
Expand All @@ -21,10 +22,11 @@ steps:
displayName: Image Build
retryCountOnTaskFailure: 3

- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Logout"
inputs:
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
scriptType: "bash"
inlineScript: |
docker logout
6 changes: 4 additions & 2 deletions .pipelines/containers/manifest-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ parameters:

steps:

- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Login"
inputs:
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
scriptType: "bash"
inlineScript: |
az acr login -n $(ACR)
Expand All @@ -36,11 +37,12 @@ steps:
displayName: Manifest Push
retryCountOnTaskFailure: 3
- task: AzureCLI@1
- task: AzureCLI@2
displayName: "Logout"
inputs:
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
scriptType: "bash"
inlineScript: |
docker logout
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/singletenancy/aks-swift/e2e-step-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ steps:
inputs:
kubectlVersion: latest

- task: AzureCLI@1
- task: AzureCLI@2
inputs:
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
scriptLocation: "inlineScript"
Expand Down
Loading

0 comments on commit 4a9110a

Please sign in to comment.