Merge pull request #64709 from gnufied/fix-node-alpha-tests

Automatic merge from submit-queue (batch tested with PRs 64344, 64709, 64717, 63631, 58647). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix panic caused by no cloudprovider in test

We should not panic when no cloudprovider is present

Fixes https://github.com/kubernetes/kubernetes/issues/64704

Also added a test to cover the panic.

/sig storage
/sig node

```release-note
None
```

pkg/kubelet/kubelet_node_status_test.go

@@ -1648,6 +1648,12 @@ func TestSetVolumeLimits(t *testing.T) {
 			expectedVolumeKey: util.AzureVolumeLimitKey,
 			expectedLimit:     16,
 		},
+		{
+			name:              "when no cloudprovider is present",
+			cloudProviderName: "",
+			expectedVolumeKey: util.AzureVolumeLimitKey,
+			expectedLimit:     -1,
+		},
 	}
 	for _, test := range testcases {
 		node := &v1.Node{
@@ -1655,6 +1661,7 @@ func TestSetVolumeLimits(t *testing.T) {
 			Spec:       v1.NodeSpec{},
 		}
 
+		if test.cloudProviderName != "" {
 			fakeCloud := &fakecloud.FakeCloud{
 				Provider: test.cloudProviderName,
 				Err:      nil,
@@ -1663,12 +1670,23 @@ func TestSetVolumeLimits(t *testing.T) {
 			kubelet.cloudproviderRequestParallelism = make(chan int, 1)
 			kubelet.cloudproviderRequestSync = make(chan int)
 			kubelet.cloudproviderRequestTimeout = 10 * time.Second
+		} else {
+			kubelet.cloud = nil
+		}
+
 		kubelet.setVolumeLimits(node)
 		nodeLimits := []v1.ResourceList{}
 		nodeLimits = append(nodeLimits, node.Status.Allocatable)
 		nodeLimits = append(nodeLimits, node.Status.Capacity)
 		for _, volumeLimits := range nodeLimits {
+			if test.expectedLimit == -1 {
+				_, ok := volumeLimits[v1.ResourceName(test.expectedVolumeKey)]
+				if ok {
+					t.Errorf("Expected no volume limit found for %s", test.expectedVolumeKey)
+				}
+			} else {
 				fl, ok := volumeLimits[v1.ResourceName(test.expectedVolumeKey)]
+
 				if !ok {
 					t.Errorf("Expected to found volume limit for %s found none", test.expectedVolumeKey)
 				}
@@ -1680,4 +1698,6 @@ func TestSetVolumeLimits(t *testing.T) {
 			}
 
 		}
+
+	}
 }

pkg/volume/aws_ebs/aws_ebs.go

@@ -98,15 +98,23 @@ func (plugin *awsElasticBlockStorePlugin) SupportsBulkVolumeVerification() bool
 }
 
 func (plugin *awsElasticBlockStorePlugin) GetVolumeLimits() (map[string]int64, error) {
+	volumeLimits := map[string]int64{
+		util.EBSVolumeLimitKey: 39,
+	}
 	cloud := plugin.host.GetCloudProvider()
 
+	// if we can't fetch cloudprovider we return an error
+	// hoping external CCM or admin can set it. Returning
+	// default values from here will mean, no one can
+	// override them.
+	if cloud == nil {
+		return nil, fmt.Errorf("No cloudprovider present")
+	}
+
 	if cloud.ProviderName() != aws.ProviderName {
 		return nil, fmt.Errorf("Expected aws cloud, found %s", cloud.ProviderName())
 	}
 
-	volumeLimits := map[string]int64{
-		util.EBSVolumeLimitKey: 39,
-	}
 	instances, ok := cloud.Instances()
 	if !ok {
 		glog.V(3).Infof("Failed to get instances from cloud provider")

pkg/volume/azure_dd/azure_dd.go

@@ -117,14 +117,24 @@ func (plugin *azureDataDiskPlugin) SupportsBulkVolumeVerification() bool {
 }
 
 func (plugin *azureDataDiskPlugin) GetVolumeLimits() (map[string]int64, error) {
+	volumeLimits := map[string]int64{
+		util.AzureVolumeLimitKey: 16,
+	}
+
 	cloud := plugin.host.GetCloudProvider()
+
+	// if we can't fetch cloudprovider we return an error
+	// hoping external CCM or admin can set it. Returning
+	// default values from here will mean, no one can
+	// override them.
+	if cloud == nil {
+		return nil, fmt.Errorf("No cloudprovider present")
+	}
+
 	if cloud.ProviderName() != azure.CloudProviderName {
 		return nil, fmt.Errorf("Expected Azure cloudprovider, got %s", cloud.ProviderName())
 	}
 
-	volumeLimits := map[string]int64{
-		util.AzureVolumeLimitKey: 16,
-	}
 	return volumeLimits, nil
 }
 

pkg/volume/gce_pd/gce_pd.go

@@ -103,15 +103,23 @@ func (plugin *gcePersistentDiskPlugin) GetAccessModes() []v1.PersistentVolumeAcc
 }
 
 func (plugin *gcePersistentDiskPlugin) GetVolumeLimits() (map[string]int64, error) {
+	volumeLimits := map[string]int64{
+		util.GCEVolumeLimitKey: 16,
+	}
 	cloud := plugin.host.GetCloudProvider()
 
+	// if we can't fetch cloudprovider we return an error
+	// hoping external CCM or admin can set it. Returning
+	// default values from here will mean, no one can
+	// override them.
+	if cloud == nil {
+		return nil, fmt.Errorf("No cloudprovider present")
+	}
+
 	if cloud.ProviderName() != gcecloud.ProviderName {
 		return nil, fmt.Errorf("Expected gce cloud got %s", cloud.ProviderName())
 	}
 
-	volumeLimits := map[string]int64{
-		util.GCEVolumeLimitKey: 16,
-	}
 	return volumeLimits, nil
 }