Merge branch 'master' into andyzhangx/upgrade-sidecar-images2

.github/workflows/check-coverage.yml

@@ -24,7 +24,7 @@ jobs:
         if: success()
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '1.22'
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run unit tests
@@ -52,4 +52,4 @@ jobs:
         uses: coverallsapp/github-action@v2
         with:
           parallel-finished: true
-          carryforward: "run-1"
+          carryforward: "run-1"

.github/workflows/check-generated.yml

@@ -8,7 +8,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v3
       with:
-        go-version: '^1.16'
+        go-version: '1.22'
     - run: |
         make
         git diff --exit-code

.github/workflows/check-shell.yml

@@ -8,7 +8,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v3
       with:
-        go-version: '^1.16'
+        go-version: '1.22'
     - run: |
         make validate-shell
       name: Verify Shell scripts

.github/workflows/check-tests.yml

@@ -8,7 +8,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v3
       with:
-        go-version: '^1.16'
+        go-version: '1.22'
     - run: |
         E2E_TEST=true
         export E2E_TEST

.github/workflows/golangci-lint-pr.yml

@@ -17,13 +17,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.19'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.51.2
+          version: v1.59.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.github/workflows/golangci-lint.yml

@@ -17,13 +17,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.19'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.51.2
+          version: v1.59.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.github/workflows/validate-components.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.21.4'
+          go-version: '1.22'
       - name: 'install cue'
         run: |
           go version

.gitignore

@@ -38,4 +38,5 @@ hack/tools/bin
 
 # to make sure we don't accidently add this back after the recent
 # migration off of go-bindata
-pkg/templates/templates_generated.go
+pkg/templates/templates_generated.go
+e2e/scenario-logs/

.pipelines/e2e.yaml

@@ -18,7 +18,6 @@ pr:
     - pkg/agent/testdata/AKSWindows* # Windows test data
 
 variables:
-- group: "AKS Dev Assistant (KV)"
 - group: ab-e2e
 - name: timeout
   value: 90
@@ -41,15 +40,24 @@ jobs:
   - bash: |
       export PATH="/usr/local/go/bin:$PATH"
       go version
+      
+      echo "VHD_BUILD_ID=$VHD_BUILD_ID"
 
-      export BUILD_ID=$(Build.BuildId)
+      if [ -n "${VHD_BUILD_ID}" ]; then
+        export SIG_VERSION_TAG_NAME=buildId
+        export SIG_VERSION_TAG_VALUE=$VHD_BUILD_ID
+        export IGNORE_SCENARIOS_WITH_MISSING_VHD=true
+    
+        # You can add other commands here that you want to execute
+      else
+        echo "Build.BuildId is not specified. Running default e2e tests."
+      fi
 
       cd e2e
       go test -parallel ${{ variables.parallel}} -timeout ${{ variables.timeout }}m -v -run Test_All ./
     displayName: Run AgentBaker E2E
     env:
       VHD_BUILD_ID: $(VHD_BUILD_ID)
-      ADO_PAT: $(PAT-aksdevassistant)
   - publish: $(System.DefaultWorkingDirectory)/e2e/scenario-logs
     artifact: scenario-logs
     condition: always()

.pipelines/scripts/setup_go.sh

@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-GOLANG_VERSION="go1.19.7"
+GOLANG_VERSION="go1.22.4"
 echo "Downloading ${GOLANG_VERSION}"
 curl -O "https://dl.google.com/go/${GOLANG_VERSION}.linux-amd64.tar.gz"
 

e2e/README.md

@@ -141,19 +141,9 @@ specified VHD build, the selector will select the corresponding default catalog
 VHD_BUILD_ID=123456789 SCENARIOS_TO_RUN=ubuntu2204,ubuntu2204-arm64,ubuntu2204-gpu-ncv3 ./e2e-local.sh
 ```
 
-***NOTE: To utilize this feature, you'll also need to provide the suite with an ADO PAT (personal access token) with
-which it can access the ADO resources to download the appropriate build artifacts.***
-
-To specify your PAT, simply set the `ADO_PAT` environment variable accordingly:
-
-```bash
-ADO_PAT=<secret> VHD_BUILD_ID=123456789 SCENARIOS_TO_RUN=ubuntu2204,ubuntu2204-arm64,ubuntu2204-gpu-ncv3 ./e2e-local.sh
-```
-
 or:
 
 ```bash
-export ADO_PAT=<secret>
 VHD_BUILD_ID=123456789 SCENARIOS_TO_RUN=ubuntu2204,ubuntu2204-arm64,ubuntu2204-gpu-ncv3 ./e2e-local.sh
 VHD_BUILD_ID=234567891 SCENARIOS_TO_RUN=ubuntu2204,ubuntu2204-arm64,ubuntu2204-gpu-ncv3 ./e2e-local.sh
 ...