Merge pull request kubernetes#342 from mvladev/fix-GetLabelsForVolume…

…-nil-dereference fix GetLabelsForVolume to handle only Cinder volumes
powellchristoph · Nov 11, 2018 · 1f196f9 · 1f196f9
2 parents a6057f2 + f06c429
commit 1f196f9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/cloudprovider/providers/openstack/openstack_volumes.go b/pkg/cloudprovider/providers/openstack/openstack_volumes.go
@@ -720,6 +720,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