Merge pull request #124528 from jsafrane/fix-azure-topology

1.29: Fix PersistentVolumeLabel admission plugin on Azure
kubernetes · May 29, 2024 · ee31580 · ee31580
2 parents dbefeef + e5561a4
commit ee31580
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go
@@ -364,6 +364,11 @@ func (c *Cloud) GetAzureDiskLabels(diskURI string) (map[string]string, error) {
 		return nil, err
 	}
 
+	if c.Location == "" {
+		// The cloud provider is not initialized and cannot get the topology labels.
+		return nil, nil
+	}
+
 	labels := map[string]string{
 		v1.LabelTopologyRegion: c.Location,
 	}

diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	cloudprovider "k8s.io/cloud-provider"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -551,3 +552,31 @@ func TestGetLabelsForVolume(t *testing.T) {
 		assert.Equal(t, test.expectedErrMsg, err, "TestCase[%d]: %s, expected: %v, return: %v", i, test.desc, test.expectedErrMsg, err)
 	}
 }
+
+func TestGetAzureDiskLabelsUninitialized(t *testing.T) {
+	// Create an uninitialized Azure cloud provider
+	testCloud, err := NewCloud(nil)
+	if err != nil {
+		t.Fatalf("Failed to create uninitialized cloud: %v", err)
+	}
+
+	pv := &v1.PersistentVolume{
+		Spec: v1.PersistentVolumeSpec{
+			PersistentVolumeSource: v1.PersistentVolumeSource{
+				AzureDisk: &v1.AzureDiskVolumeSource{
+					DiskName:    cloudvolume.ProvisionedVolumeName,
+					DataDiskURI: "/subscriptions/4347f140-6c74-4199-b4fc-1938eb6c16c0/resourceGroups/test/providers/Microsoft.Compute/disks/pvc-ade30d58-5a51-4a62-a83a-142267b74f9e",
+				},
+			},
+		},
+	}
+
+	labeller := testCloud.(cloudprovider.PVLabeler)
+	labels, err := labeller.GetLabelsForVolume(context.Background(), pv)
+	if err != nil {
+		t.Errorf("Unexpected GetLabelsForVolume error: %v", err)
+	}
+	if labels != nil {
+		t.Errorf("The cloud provider should return nil labels for uninitialized cloud, got: %v", labels)
+	}
+}