Merge pull request #4992 from nojnhuh/apiversion-upgrade

use managed identity for API version upgrade e2e tests

Author: k8s-ci-robot

templates/test/ci/cluster-template-prow.yaml

@@ -47,6 +47,7 @@ patches:
 - path: ../patches/windows-server-version.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+- path: ../patches/uami-md-0.yaml
 configMapGenerator:
 - files:
   - windows-cni=../../../addons/windows/calico/calico.yaml

templates/test/ci/prow/kustomization.yaml

@@ -25,6 +25,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/ptr"
@@ -187,6 +189,16 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 
 				// Unset windows specific variables
 				Expect(os.Unsetenv("WINDOWS_WORKER_MACHINE_COUNT")).To(Succeed())
+
+				cred, err := azidentity.NewDefaultAzureCredential(nil)
+				Expect(err).NotTo(HaveOccurred())
+				identityClient, err := armmsi.NewUserAssignedIdentitiesClient(getSubscriptionID(Default), cred, nil)
+				Expect(err).NotTo(HaveOccurred())
+				identityRG := e2eConfig.GetVariable(AzureIdentityResourceGroup)
+				identityName := e2eConfig.GetVariable(AzureUserIdentity)
+				identity, err := identityClient.Get(ctx, identityRG, identityName, nil)
+				Expect(err).NotTo(HaveOccurred())
+				os.Setenv("AZURE_CLIENT_ID_CLOUD_PROVIDER", *identity.Properties.ClientID)
 			})
 
 			Context("upgrade from an old version of v1beta1 to current, and scale workload clusters created in the old version", func() {

test/e2e/capi_test.go

@@ -230,6 +230,8 @@ variables:
   LATEST_PROVIDER_UPGRADE_VERSION: "v1.15.1"
   OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"
   LATEST_CAAPH_UPGRADE_VERSION: "v0.1.1-alpha.1"
+  CI_RG: capz-ci
+  USER_IDENTITY: cloud-provider-user-identity
 
 intervals:
   default/wait-controllers: ["3m", "10s"]