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

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

Author: openshift-merge-bot[bot]

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
+        uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3

.github/workflows/lint-ci-weekly.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           egress-policy: audit
       - name: Setup Golang
@@ -23,9 +23,9 @@ jobs:
           go-version: '>=1.21'
           check-latest: true
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
+        uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
         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: latest

.github/workflows/scorecards.yml

@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 
@@ -64,7 +64,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: SARIF file
           path: results.sarif

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

@@ -37,12 +37,12 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
       with:
         egress-policy: audit
 
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up Go 1.x
       uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
@@ -54,7 +54,7 @@ jobs:
       run: |
         make update
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5
+      uses: peter-evans/create-pull-request@v6
       with:
         branch: doc/update-vendorlicense-${{github.ref_name}}
         delete-branch: true

.gitignore

@@ -38,3 +38,5 @@ _kubeconfig
 _rundir
 
 site/.hugo_build.lock
+
+.kubeconfig/

.pipelines/run-autoscaling-e2e.yml

@@ -29,7 +29,7 @@ stages:
         - 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
+      timeoutInMinutes: 340
       steps:
         - task: GoTool@0
           inputs:

.pipelines/run-autoscaling-multipool-e2e.yml

@@ -29,7 +29,7 @@ stages:
         - 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
+      timeoutInMinutes: 340
       steps:
         - task: GoTool@0
           inputs:

.pipelines/scripts/run-e2e.sh

@@ -79,6 +79,9 @@ if [[ -z "${AZURE_LOCATION:-}" ]]; then
   export AZURE_LOCATION="$(get_random_location)"
 fi
 
+# TODO: remove this and use user-input CUSTOM_CCM_IMAGE_TAG to defined the image tag for
+# cloud provider azure. This will remove dependency on cloud-provider-azure repo, and use
+# explicit variables makes the interface more clear.
 if [[ -z "${IMAGE_TAG:-}" ]]; then
   IMAGE_TAG="$(git describe --tags)"
 fi
@@ -110,12 +113,11 @@ fi
 echo "Choose custom config file: ${CUSTOM_CONFIG_PATH:-}"
 
 if [[ "${SKIP_BUILD_KUBETEST2_AKS:-}" != "true" ]]; then
-  rm -rf kubetest2-aks
-  git clone https://github.com/kubernetes-sigs/cloud-provider-azure.git
-  cp -r cloud-provider-azure/kubetest2-aks .
-  rm -rf cloud-provider-azure
-  git config --global --add safe.directory "$(pwd)" || true
-  pushd kubetest2-aks
+  # Considering building kubetest2-aks has no dependency on cloud-provider-azure repo, and to avoid
+  # the potential conflict between the cloud-provider-azure repo and the kubetest2-aks, we use a
+  # tmp folder to clone the cloud-provider-azure repo and build kubetest2-aks. 
+  git clone https://github.com/kubernetes-sigs/cloud-provider-azure.git /tmp/cloud-provider-azure
+  pushd /tmp/cloud-provider-azure/kubetest2-aks
   go get -d sigs.k8s.io/kubetest2@latest
   go install sigs.k8s.io/kubetest2@latest
   go mod tidy
@@ -125,6 +127,7 @@ if [[ "${SKIP_BUILD_KUBETEST2_AKS:-}" != "true" ]]; then
   else
     sudo GOPATH="/home/vsts/go" make install
   fi
+  rm /tmp/cloud-provider-azure -rf
   popd
 fi
 
@@ -148,9 +151,9 @@ kubetest2 aks --up --rgName "${RESOURCE_GROUP:-}" \
 --config "${CLUSTER_CONFIG_PATH:-}" \
 --customConfig "${CUSTOM_CONFIG_PATH}" \
 --clusterName "${CLUSTER_NAME:-}" \
---ccmImageTag "${IMAGE_TAG:-}" \
+--ccmImageTag "${CUSTOM_CCM_IMAGE_TAG:-$IMAGE_TAG}" \
 --casImageTag "${CUSTOM_CAS_IMAGE:-}" \
---kubernetesImageTag "${IMAGE_TAG:-}" \
+--kubernetesImageTag "${CUSTOM_K8S_IMAGE_TAG:-}" \
 --kubeletURL "${KUBELET_URL:-}" \
 --k8sVersion "${AKS_KUBERNETES_VERSION:-}"
 

.pipelines/templates/customconfiguration-autoscaling-multipool.json

@@ -3,17 +3,17 @@
     "kube-cloud-controller-manager": {
       "image": "{CUSTOM_CCM_IMAGE}",
       "config": {
-          "--min-resync-period": "10h0m0s",
-          "--profiling": "false",
-          "--v": "6"
+        "--min-resync-period": "10h0m0s",
+        "--profiling": "false",
+        "--v": "6"
       }
     },
     "kube-cloud-node-manager": {
       "image": "{CUSTOM_CNM_IMAGE}",
       "config": {
-          "--node-name": "$(NODE_NAME)",
-          "kube-api-burst": "50",
-          "kube-api-qps": "50"
+        "--node-name": "$(NODE_NAME)",
+        "--kube-api-burst": "50",
+        "--kube-api-qps": "50"
       }
     },
     "cluster-autoscaler": {
@@ -27,4 +27,4 @@
       }
     }
   }
-}
+}

.pipelines/templates/customconfiguration-autoscaling.json

@@ -3,17 +3,17 @@
     "kube-cloud-controller-manager": {
       "image": "{CUSTOM_CCM_IMAGE}",
       "config": {
-          "--min-resync-period": "10h0m0s",
-          "--profiling": "false",
-          "--v": "6"
+        "--min-resync-period": "10h0m0s",
+        "--profiling": "false",
+        "--v": "6"
       }
     },
     "kube-cloud-node-manager": {
       "image": "{CUSTOM_CNM_IMAGE}",
       "config": {
-          "--node-name": "$(NODE_NAME)",
-          "kube-api-burst": "50",
-          "kube-api-qps": "50"
+        "--node-name": "$(NODE_NAME)",
+        "--kube-api-burst": "50",
+        "--kube-api-qps": "50"
       }
     },
     "cluster-autoscaler": {
@@ -26,4 +26,4 @@
       }
     }
   }
-}
+}