github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

remove AllowImageVolumeSource

Browse Source
This commit is contained in:
carlory 2024-09-13 23:41:06 +08:00
parent 24a50a3ddf
commit 684fbd6f20
4 changed files with 17 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,7 +385,6 @@ func GetValidationOptionsFromPodSpecAndMeta(podSpec, oldPodSpec *api.PodSpec, po
AllowInvalidTopologySpreadConstraintLabelSelector: false,
AllowNamespacedSysctlsForHostNetAndHostIPC: false,
AllowNonLocalProjectedTokenPath: false,
AllowImageVolumeSource: utilfeature.DefaultFeatureGate.Enabled(features.ImageVolume),
}
// If old spec uses relaxed validation or enabled the RelaxedEnvironmentVariableValidation feature gate,
@ -416,9 +415,6 @@ func GetValidationOptionsFromPodSpecAndMeta(podSpec, oldPodSpec *api.PodSpec, po
}
}
}
// if old spec has used image volume source, we must allow it
opts.AllowImageVolumeSource = opts.AllowImageVolumeSource || hasUsedImageVolumeSourceWithPodSpec(oldPodSpec)
}
if oldPodMeta != nil && !opts.AllowInvalidPodDeletionCost {
// This is an update, so validate only if the existing object was valid.
@ -584,19 +580,6 @@ func hasUsedDownwardAPIFieldPathWithContainer(container *api.Container, fieldPat
return false
}
func hasUsedImageVolumeSourceWithPodSpec(podSpec *api.PodSpec) bool {
if podSpec == nil {
return false
}
for _, vol := range podSpec.Volumes {
if vol.Image != nil {
return true
}
}
return false
}
// GetValidationOptionsFromPodTemplate will return pod validation options for specified template.
func GetValidationOptionsFromPodTemplate(podTemplate, oldPodTemplate *api.PodTemplateSpec) apivalidation.PodValidationOptions {
var newPodSpec, oldPodSpec *api.PodSpec

42
pkg/api/pod/util_test.go
View File

@ -2553,48 +2553,6 @@ func TestValidateAllowNonLocalProjectedTokenPathOption(t *testing.T) {
}
}
func TestValidateAllowImageVolumeSourceOption(t *testing.T) {
testCases := []struct {
name string
oldPodSpec *api.PodSpec
featureEnabled bool
wantOption bool
}{
{
name: "CreateFeatureEnabled",
featureEnabled: true,
wantOption: true,
},
{
name: "CreateFeatureDisabled",
featureEnabled: false,
wantOption: false,
},
{
name: "UpdateFeatureDisabled",
oldPodSpec: &api.PodSpec{Volumes: []api.Volume{{VolumeSource: api.VolumeSource{Image: &api.ImageVolumeSource{Reference: "image"}}}}},
featureEnabled: false,
wantOption: true,
},
{
name: "UpdateFeatureEnabled",
oldPodSpec: &api.PodSpec{Volumes: []api.Volume{{VolumeSource: api.VolumeSource{Image: &api.ImageVolumeSource{Reference: "image"}}}}},
featureEnabled: true,
wantOption: true,
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ImageVolume, tc.featureEnabled)
gotOptions := GetValidationOptionsFromPodSpecAndMeta(nil, tc.oldPodSpec, nil, nil)
if tc.wantOption != gotOptions.AllowImageVolumeSource {
t.Errorf("unexpected diff, want: %v, got: %v", tc.wantOption, gotOptions.AllowImageVolumeSource)
}
})
}
}
func TestDropInPlacePodVerticalScaling(t *testing.T) {
podWithInPlaceVerticalScaling := func() *api.Pod {
return &api.Pod{

18
pkg/apis/core/validation/validation.go
View File

@ -741,7 +741,7 @@ func validateVolumeSource(source *core.VolumeSource, fldPath *field.Path, volNam
}
}
}
if opts.AllowImageVolumeSource && source.Image != nil {
if source.Image != nil {
if numVolumes > 0 {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("image"), "may not specify more than 1 volume type"))
} else {
@ -2940,14 +2940,12 @@ func ValidateVolumeMounts(mounts []core.VolumeMount, voldevices map[string]strin
}
// Disallow subPath/subPathExpr for image volumes
if opts.AllowImageVolumeSource {
if v, ok := volumes[mnt.Name]; ok && v.Image != nil {
if len(mnt.SubPath) != 0 {
allErrs = append(allErrs, field.Invalid(idxPath.Child("subPath"), mnt.SubPath, "not allowed in image volume sources"))
}
if len(mnt.SubPathExpr) != 0 {
allErrs = append(allErrs, field.Invalid(idxPath.Child("subPathExpr"), mnt.SubPathExpr, "not allowed in image volume sources"))
}
if v, ok := volumes[mnt.Name]; ok && v.Image != nil {
if len(mnt.SubPath) != 0 {
allErrs = append(allErrs, field.Invalid(idxPath.Child("subPath"), mnt.SubPath, "not allowed in image volume sources"))
}
if len(mnt.SubPathExpr) != 0 {
allErrs = append(allErrs, field.Invalid(idxPath.Child("subPathExpr"), mnt.SubPathExpr, "not allowed in image volume sources"))
}
}
@ -4049,8 +4047,6 @@ type PodValidationOptions struct {
ResourceIsPod bool
// Allow relaxed validation of environment variable names
AllowRelaxedEnvironmentVariableValidation bool
// Allow the use of the ImageVolumeSource API.
AllowImageVolumeSource bool
// Allow the use of a relaxed DNS search
AllowRelaxedDNSSearchValidation bool
}

25
pkg/apis/core/validation/validation_test.go
View File

@ -5378,19 +5378,14 @@ func TestValidateVolumes(t *testing.T) {
},
},
},
opts: PodValidationOptions{AllowImageVolumeSource: true},
opts: PodValidationOptions{},
}, {
name: "feature disabled",
name: "no volume source",
vol: core.Volume{
Name: "image-volume",
VolumeSource: core.VolumeSource{
Image: &core.ImageVolumeSource{
Reference: "quay.io/my/artifact:v1",
PullPolicy: "IfNotPresent",
},
},
Name: "volume",
VolumeSource: core.VolumeSource{},
},
opts: PodValidationOptions{AllowImageVolumeSource: false},
opts: PodValidationOptions{},
errs: []verr{{
etype: field.ErrorTypeRequired,
field: "field[0]",
@ -5407,7 +5402,7 @@ func TestValidateVolumes(t *testing.T) {
},
},
},
opts: PodValidationOptions{AllowImageVolumeSource: true},
opts: PodValidationOptions{},
errs: []verr{{
etype: field.ErrorTypeRequired,
field: "name",
@ -5423,7 +5418,7 @@ func TestValidateVolumes(t *testing.T) {
},
},
},
opts: PodValidationOptions{AllowImageVolumeSource: true, ResourceIsPod: true},
opts: PodValidationOptions{ResourceIsPod: true},
errs: []verr{{
etype: field.ErrorTypeRequired,
field: "image.reference",
@ -5439,7 +5434,7 @@ func TestValidateVolumes(t *testing.T) {
},
},
},
opts: PodValidationOptions{AllowImageVolumeSource: true, ResourceIsPod: false},
opts: PodValidationOptions{ResourceIsPod: false},
}, {
name: "image volume with wrong pullPolicy",
vol: core.Volume{
@ -5451,7 +5446,7 @@ func TestValidateVolumes(t *testing.T) {
},
},
},
opts: PodValidationOptions{AllowImageVolumeSource: true},
opts: PodValidationOptions{},
errs: []verr{{
etype: field.ErrorTypeNotSupported,
field: "image.pullPolicy",
@ -7066,7 +7061,7 @@ func TestValidateVolumeMounts(t *testing.T) {
}}}},
{Name: "image-volume", VolumeSource: core.VolumeSource{Image: &core.ImageVolumeSource{Reference: "quay.io/my/artifact:v1", PullPolicy: "IfNotPresent"}}},
}
opts := PodValidationOptions{AllowImageVolumeSource: true}
opts := PodValidationOptions{}
vols, v1err := ValidateVolumes(volumes, nil, field.NewPath("field"), opts)
if len(v1err) > 0 {
t.Errorf("Invalid test volume - expected success %v", v1err)