github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78997 from j-griffith/fix_nil_pointer

Browse Source 
Fix nil pointer
This commit is contained in:
Kubernetes Prow Robot 2019-06-15 08:52:12 -07:00 committed by GitHub
commit fc33ddc285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/api/persistentvolumeclaim/util.go
View File

@ -60,15 +60,20 @@ func dataSourceInUse(oldPVCSpec *core.PersistentVolumeClaimSpec) bool {
func dataSourceIsEnabled(pvcSpec *core.PersistentVolumeClaimSpec) bool { func dataSourceIsEnabled(pvcSpec *core.PersistentVolumeClaimSpec) bool {
if pvcSpec.DataSource != nil { if pvcSpec.DataSource != nil {
if pvcSpec.DataSource.Kind == pvc && apiGroup := ""
*pvcSpec.DataSource.APIGroup == "" && if pvcSpec.DataSource.APIGroup != nil {
utilfeature.DefaultFeatureGate.Enabled(features.VolumePVCDataSource) { apiGroup = *pvcSpec.DataSource.APIGroup
}
if utilfeature.DefaultFeatureGate.Enabled(features.VolumePVCDataSource) &&
pvcSpec.DataSource.Kind == pvc &&
apiGroup == "" {
return true return true
} }
if pvcSpec.DataSource.Kind == volumeSnapshot &&
*pvcSpec.DataSource.APIGroup == "snapshot.storage.k8s.io" && if utilfeature.DefaultFeatureGate.Enabled(features.VolumeSnapshotDataSource) &&
utilfeature.DefaultFeatureGate.Enabled(features.VolumeSnapshotDataSource) { pvcSpec.DataSource.Kind == volumeSnapshot &&
apiGroup == "snapshot.storage.k8s.io" {
return true return true
} }
} }

16
pkg/api/persistentvolumeclaim/util_test.go
View File

@ -221,6 +221,12 @@ func TestPVCDataSourceSpecFilter(t *testing.T) {
Name: "test_clone", Name: "test_clone",
}, },
} }
validSpecNilAPIGroup := core.PersistentVolumeClaimSpec{
DataSource: &core.TypedLocalObjectReference{
Kind: "PersistentVolumeClaim",
Name: "test_clone",
},
}
invalidAPIGroup := "invalid.pvc.api.group" invalidAPIGroup := "invalid.pvc.api.group"
invalidSpec := core.PersistentVolumeClaimSpec{ invalidSpec := core.PersistentVolumeClaimSpec{
@ -266,6 +272,16 @@ func TestPVCDataSourceSpecFilter(t *testing.T) {
gateEnabled: false, gateEnabled: false,
want: nil, want: nil,
}, },
"enabled with valid spec but nil APIGroup": {
spec: validSpecNilAPIGroup,
gateEnabled: true,
want: validSpecNilAPIGroup.DataSource,
},
"disabled with valid spec but nil APIGroup": {
spec: validSpecNilAPIGroup,
gateEnabled: false,
want: nil,
},
} }
for testName, test := range tests { for testName, test := range tests {