Merge pull request #75 from openshift-cloud-team/rebase-bot-master

OCPBUGS-18026: Merge https://github.com/kubernetes-sigs/cloud-provider-azure:master (ff9e8d8) into master

.codespellignore

@@ -0,0 +1,2 @@
+afterall
+aks

.github/workflows/cflite_cron.yaml

@@ -20,7 +20,7 @@ jobs:
         - memory
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v2.4.1
       with:
         egress-policy: audit
 

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+        uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v2.4.1
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@1360a344ccb0ab6e9475edef90ad2f46bf8003b1 # v3.0.6

.github/workflows/scorecards.yml

@@ -32,17 +32,17 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+        uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v2.4.1
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -72,6 +72,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
+        uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
         with:
           sarif_file: results.sarif

.github/workflows/update-vendor-license.yml

@@ -0,0 +1,77 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "Update vendor licenses"
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master, 'release-**' ]
+    paths:
+      - 'go.*'
+  schedule:
+    - cron: '0 */4 * * *'
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+
+    steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v2.4.1
+      with:
+        egress-policy: audit
+
+    - name: Checkout repository
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - name: Set up Go 1.x
+      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      with:
+        go-version: '>=1.20'
+        check-latest: true
+      id: go
+
+    - name: Autobuild
+      run: |
+        make update
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v5
+      with:
+        branch: doc/update-vendorlicense-${{github.ref_name}}
+        delete-branch: true
+        labels: |
+            lgtm
+            approved
+        commit-message: Update vendor license for ${{github.ref_name}}
+        body: |
+            Auto-generated by GitHub Action [Update vendor licenses](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})
+
+            #### What type of PR is this?
+            /kind testing
+
+            #### What this PR does / why we need it:
+            New release published.
+
+            #### Does this PR introduce a user-facing change?
+            ```release-note
+            None
+            ```

.pipelines/README.md

@@ -3,6 +3,7 @@
 | pipeline name                  | branch master status                            | trigger events        |
 |--------------------------------|-------------------------------------------------|-----------------------|
 | aks-basic-lb-e2e               | [![Build Status](https://msazure.visualstudio.com/CloudNativeCompute/_apis/build/status/AKS/cloud-provider-azure/kubernetes-sigs.cloud-provider-azure.basic_lb?branchName=master)](https://msazure.visualstudio.com/CloudNativeCompute/_build?definitionId=282180&branchName=master)                   | PR merged          |
+| aks-vmas-e2e               | [![Build Status](https://msazure.visualstudio.com/CloudNativeCompute/_apis/build/status/AKS/cloud-provider-azure/kubernetes-sigs.cloud-provider-azure.vmas?branchName=master)](https://msazure.visualstudio.com/CloudNativeCompute/_build?definitionId=324017&branchName=master)                   | once per day          |
 | aks-autoscaling-e2e            | [![Build Status](https://msazure.visualstudio.com/CloudNativeCompute/_apis/build/status/AKS/cloud-provider-azure/kubernetes-sigs.cloud-provider-azure.autoscaling?branchName=master)](https://msazure.visualstudio.com/CloudNativeCompute/_build?definitionId=282187&branchName=master)                   | once per day          |
 | aks-autoscaling-multipool-e2e  |  [![Build Status](https://msazure.visualstudio.com/CloudNativeCompute/_apis/build/status/AKS/cloud-provider-azure/kubernetes-sigs.cloud-provider-azure.autoscaling-multipool?branchName=master)](https://msazure.visualstudio.com/CloudNativeCompute/_build?definitionId=282222&branchName=master)  | once per day          |
 | daily-gc                       | [![Build Status](https://msazure.visualstudio.com/CloudNativeCompute/_apis/build/status/AKS/cloud-provider-azure/kubernetes-sigs.cloud-provider-azure.gc?branchName=master)](https://msazure.visualstudio.com/CloudNativeCompute/_build?definitionId=282223&branchName=master)                   | once per day          |

.pipelines/run-vmas-e2e.yml

@@ -0,0 +1,41 @@
+schedules:
+- cron: "0 20 * * *"
+  displayName: Daily AKS VMAS E2E Test
+  branches:
+    include:
+    - master
+
+trigger: none
+
+pr: none
+
+pool:
+  vmImage: ubuntu-latest
+
+variables:
+- template: var-e2e.yml
+
+stages:
+  - stage: run_vmas_e2e
+    dependsOn: []
+    jobs:
+    - job: build_push_ccm_image_job
+      timeoutInMinutes: 30
+      steps:
+        - template: ./ccm-image.yml
+    - job: build_push_cnm_image_job
+      timeoutInMinutes: 30
+      steps:
+        - template: ./cnm-image.yml
+    - job: create_aks_cluster_and_run_tests_job
+      dependsOn: [build_push_ccm_image_job, build_push_cnm_image_job]
+      timeoutInMinutes: 300
+      steps:
+        - task: GoTool@0
+          inputs:
+            version: '1.19'
+        - bash: |
+            CLUSTER_TYPE="vmas"
+            echo "##vso[task.setvariable variable=CLUSTER_TYPE]${CLUSTER_TYPE}"
+          displayName: set cluster type
+        - template: run-e2e.yml

.pipelines/scripts/collect-log.sh

@@ -19,13 +19,13 @@ set -o nounset
 set -o pipefail
 
 echo "collecting logs of all pods in kube-system"
-mkdir "${ARTIFACT_DIR}/kube-system"
+mkdir -p "${ARTIFACT_DIR:-}/kube-system"
 kubectl get pod -A | grep "kube-system" | awk '{printf("%s\n",$2)}' | while read -r POD; do
-    kubectl logs ${POD} -n kube-system > "${ARTIFACT_DIR}/kube-system/${POD}.log" || echo "Cannot collect log from pod ${POD}"
+    kubectl logs ${POD} -n kube-system > "${ARTIFACT_DIR:-}/kube-system/${POD}.log" || echo "Cannot collect log from pod ${POD}"
 done
 
 echo "collecting logs of all nodes"
-mkdir "${ARTIFACT_DIR}/node-log"
+mkdir "${ARTIFACT_DIR:-}/node-log"
 LOG_IMAGE="mcr.microsoft.com/dotnet/runtime-deps:6.0"
 NODE_CMDS=("journalctl --no-pager --output=short-precise" \
            "journalctl --no-pager --output=short-precise -k" \
@@ -36,7 +36,7 @@ NODE_CMDS=("journalctl --no-pager --output=short-precise" \
            "ls /run/cluster-api/")
 NODE_LOG_FILE_NAMES=("journal.log" "kern.log" "kubelet-version.txt" "kubelet.log" "containerd.log" "cloud-init.log" "cloud-init-output.log" "sentinel-file-dir.txt")
 kubectl get node | grep "aks-" | awk '{printf("%s\n",$1)}' | while read -r NODE; do
-    NODE_LOG_DIR="${ARTIFACT_DIR}/node-log/${NODE}"
+    NODE_LOG_DIR="${ARTIFACT_DIR:-}/node-log/${NODE}"
     mkdir "${NODE_LOG_DIR}"
     for i in "${!NODE_CMDS[@]}"; do
         kubectl debug node/${NODE} -it --image=${LOG_IMAGE} -- /bin/sh -c "chroot /host ${NODE_CMDS[$i]}" > "${NODE_LOG_DIR}/${NODE_LOG_FILE_NAMES[$i]}" || echo "Cannot collect ${NODE_LOG_FILE_NAMES[$i]} log from node ${NODE}"