github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83249 from yutedz/az-disk-nil

Browse Source 
Add nil checks for Azure CSI translation
This commit is contained in:
Kubernetes Prow Robot 2019-09-30 13:09:16 -07:00 committed by GitHub
commit 75321b99ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/csi-translation-lib/plugins/azure_disk.go
View File

@ -78,19 +78,21 @@ func (t *azureDiskCSITranslator) TranslateInTreeInlineVolumeToCSI(volume *v1.Vol
CSI: &v1.CSIPersistentVolumeSource{ CSI: &v1.CSIPersistentVolumeSource{
Driver: AzureDiskDriverName, Driver: AzureDiskDriverName,
VolumeHandle: azureSource.DataDiskURI, VolumeHandle: azureSource.DataDiskURI,
ReadOnly: *azureSource.ReadOnly,
FSType: *azureSource.FSType,
VolumeAttributes: map[string]string{azureDiskKind: "Managed"}, VolumeAttributes: map[string]string{azureDiskKind: "Managed"},
}, },
}, },
AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
}, },
} }
if azureSource.ReadOnly != nil {
pv.Spec.PersistentVolumeSource.CSI.ReadOnly = *azureSource.ReadOnly
}
if *azureSource.CachingMode != "" { if azureSource.CachingMode != nil && *azureSource.CachingMode != "" {
pv.Spec.PersistentVolumeSource.CSI.VolumeAttributes[azureDiskCachingMode] = string(*azureSource.CachingMode) pv.Spec.PersistentVolumeSource.CSI.VolumeAttributes[azureDiskCachingMode] = string(*azureSource.CachingMode)
} }
if *azureSource.FSType != "" { if azureSource.FSType != nil {
pv.Spec.PersistentVolumeSource.CSI.FSType = *azureSource.FSType
pv.Spec.PersistentVolumeSource.CSI.VolumeAttributes[azureDiskFSType] = *azureSource.FSType pv.Spec.PersistentVolumeSource.CSI.VolumeAttributes[azureDiskFSType] = *azureSource.FSType
} }
if azureSource.Kind != nil { if azureSource.Kind != nil {