diff --git a/pkg/api/persistentvolume/util.go b/pkg/api/persistentvolume/util.go index 64f60ac48c2..5f929297a27 100644 --- a/pkg/api/persistentvolume/util.go +++ b/pkg/api/persistentvolume/util.go @@ -81,16 +81,16 @@ func warningsForPersistentVolumeSpecAndMeta(fieldPath *field.Path, pvSpec *api.P } // If we are on deprecated volume plugin if pvSpec.CephFS != nil { - warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.28, non-functional in v1.31+", fieldPath.Child("spec", "persistentVolumeSource").Child("cephfs"))) + warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.28, non-functional in v1.31+", fieldPath.Child("spec", "cephfs"))) } if pvSpec.PhotonPersistentDisk != nil { - warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.11, non-functional in v1.16+", fieldPath.Child("spec", "persistentVolumeSource").Child("photonPersistentDisk"))) + warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.11, non-functional in v1.16+", fieldPath.Child("spec", "photonPersistentDisk"))) } if pvSpec.ScaleIO != nil { - warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.16, non-functional in v1.22+", fieldPath.Child("spec", "persistentVolumeSource").Child("scaleIO"))) + warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.16, non-functional in v1.22+", fieldPath.Child("spec", "scaleIO"))) } if pvSpec.StorageOS != nil { - warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.22, non-functional in v1.25+", fieldPath.Child("spec", "persistentVolumeSource").Child("storageOS"))) + warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.22, non-functional in v1.25+", fieldPath.Child("spec", "storageOS"))) } if pvSpec.Glusterfs != nil { warnings = append(warnings, fmt.Sprintf("%s: deprecated in v1.25, non-functional in v1.26+", fieldPath.Child("spec", "glusterfs"))) diff --git a/pkg/api/persistentvolume/util_test.go b/pkg/api/persistentvolume/util_test.go index 6565080223a..5000f3adf75 100644 --- a/pkg/api/persistentvolume/util_test.go +++ b/pkg/api/persistentvolume/util_test.go @@ -193,7 +193,7 @@ func TestWarnings(t *testing.T) { }, }, expected: []string{ - `spec.persistentVolumeSource.cephfs: deprecated in v1.28, non-functional in v1.31+`, + `spec.cephfs: deprecated in v1.28, non-functional in v1.31+`, }, }, { @@ -209,7 +209,7 @@ func TestWarnings(t *testing.T) { }, }, expected: []string{ - `spec.persistentVolumeSource.photonPersistentDisk: deprecated in v1.11, non-functional in v1.16+`, + `spec.photonPersistentDisk: deprecated in v1.11, non-functional in v1.16+`, }, }, { @@ -254,10 +254,9 @@ func TestWarnings(t *testing.T) { }, }, expected: []string{ - `spec.persistentVolumeSource.scaleIO: deprecated in v1.16, non-functional in v1.22+`, + `spec.scaleIO: deprecated in v1.16, non-functional in v1.22+`, }, }, - { name: "PV StorageOS deprecation warning", template: &api.PersistentVolume{ @@ -274,10 +273,9 @@ func TestWarnings(t *testing.T) { }, }, expected: []string{ - `spec.persistentVolumeSource.storageOS: deprecated in v1.22, non-functional in v1.25+`, + `spec.storageOS: deprecated in v1.22, non-functional in v1.25+`, }, }, - { name: "PV GlusterFS deprecation warning", template: &api.PersistentVolume{ @@ -293,7 +291,7 @@ func TestWarnings(t *testing.T) { }, }, expected: []string{ - `spec.persistentVolumeSource.glusterfs: deprecated in v1.25, non-functional in v1.26+`, + `spec.glusterfs: deprecated in v1.25, non-functional in v1.26+`, }, }, }