github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the fieldpath in the deprecated plugin response

Browse Source 
Signed-off-by: Humble Chirammal <humble.devassy@gmail.com>
Signed-off-by: carlory <baofa.fan@daocloud.io>
This commit is contained in:
Humble Chirammal
2023-06-16 19:47:03 +05:30
parent 471fd1ae8a
commit f54c15d4e8
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/persistentvolume/util.go
View File

@@ -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")))

12
pkg/api/persistentvolume/util_test.go
View File

@@ -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+`,
},
},
}