fix openstack provider to handle only Cinder volumes

When the cloud-controller-manager is running with PV label initializing controller and NFS volume is created, it causes nill reference error. related to #68996

fix openstack provider to handle only Cinder volumes
3b0ddbf0 · Martin Vladev · 59625d87 · 3b0ddbf0
Commit 3b0ddbf0 authored Oct 31, 2018 by Martin Vladev
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

openstack_volumes.go pkg/cloudprovider/providers/openstack/openstack_volumes.go +5 -0

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_volumes.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_volumes.go
@@ -697,6 +697,11 @@ func (os *OpenStack) ShouldTrustDevicePath() bool {

 // GetLabelsForVolume implements PVLabeler.GetLabelsForVolume
 func (os *OpenStack) GetLabelsForVolume(ctx context.Context, pv *v1.PersistentVolume) (map[string]string, error) {
+	// Ignore if not Cinder.
+	if pv.Spec.Cinder == nil {
+		return nil, nil
+	}
+
 	// Ignore any volumes that are being provisioned
 	if pv.Spec.Cinder.VolumeID == k8s_volume.ProvisionedVolumeName {
 		return nil, nil