remove extra validations as its there in K8

knative · Jan 6, 2025 · 01bb99f · 01bb99f
1 parent 5cd7605
commit 01bb99f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 105 deletions.
diff --git a/pkg/apis/serving/k8s_validation.go b/pkg/apis/serving/k8s_validation.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"math"
 	"path"
-	"path/filepath"
 	"strings"
 
 	"github.com/google/go-containerregistry/pkg/name"
@@ -162,11 +161,6 @@ func validateVolume(ctx context.Context, volume corev1.Volume) *apis.FieldError
 		specified = append(specified, "persistentVolumeClaim")
 	}
 
-	if vs.HostPath != nil {
-		specified = append(specified, "hostPath")
-		errs = errs.Also(validateHostPathVolumeSource(vs.HostPath).ViaField("hostPath"))
-	}
-
 	if len(specified) == 0 {
 		fieldPaths := []string{"secret", "configMap", "projected"}
 		cfg := config.FromContextOrDefaults(ctx)
@@ -176,9 +170,6 @@ func validateVolume(ctx context.Context, volume corev1.Volume) *apis.FieldError
 		if cfg.Features.PodSpecPersistentVolumeClaim == config.Enabled {
 			fieldPaths = append(fieldPaths, "persistentVolumeClaim")
 		}
-		if cfg.Features.PodSpecVolumesHostPath == config.Enabled {
-			fieldPaths = append(fieldPaths, "hostPath")
-		}
 		errs = errs.Also(apis.ErrMissingOneOf(fieldPaths...))
 	} else if len(specified) > 1 {
 		errs = errs.Also(apis.ErrMultipleOneOf(specified...))
@@ -295,52 +286,6 @@ func validateEmptyDirFields(dir *corev1.EmptyDirVolumeSource) *apis.FieldError {
 	return errs
 }
 
-func validateHostPathVolumeSource(hostPath *corev1.HostPathVolumeSource) *apis.FieldError {
-	var errs *apis.FieldError
-	// This is checked at the K8s side for host Path so better validate early
-	// ref: https://bit.ly/4gcWAVK
-	if len(hostPath.Path) == 0 {
-		errs = errs.Also(apis.ErrInvalidValue("''", "path"))
-		return errs
-	}
-	errs = errs.Also(validatePathNoBacksteps(hostPath.Path, "path"))
-	errs = errs.Also(validateHostPathType(hostPath.Type, "type"))
-	return errs
-}
-
-// validatePathNoBacksteps makes sure the targetPath does not have any `..` path elements when split
-//
-// This assumes the OS of the apiserver and the nodes are the same. The same check should be done
-// on the node to ensure there are no backsteps.
-func validatePathNoBacksteps(targetPath string, fldPath string) *apis.FieldError {
-	var errs *apis.FieldError
-	parts := strings.Split(filepath.ToSlash(targetPath), "/")
-	for _, item := range parts {
-		if item == ".." {
-			errs = errs.Also(apis.ErrInvalidValue(targetPath, fldPath, "must not contain '..'"))
-			break // even for `../../..`, one error is sufficient to make the point
-		}
-	}
-	return errs
-}
-
-func validateHostPathType(hostPathType *corev1.HostPathType, fldPath string) *apis.FieldError {
-	var errs *apis.FieldError
-	supportedHostPathTypes := sets.New(
-		corev1.HostPathUnset,
-		corev1.HostPathDirectoryOrCreate,
-		corev1.HostPathDirectory,
-		corev1.HostPathFileOrCreate,
-		corev1.HostPathFile,
-		corev1.HostPathSocket,
-		corev1.HostPathCharDev,
-		corev1.HostPathBlockDev)
-	if hostPathType != nil && !supportedHostPathTypes.Has(*hostPathType) {
-		errs = errs.Also(apis.ErrInvalidValue(*hostPathType, fldPath, "unknown type"))
-	}
-	return errs
-}
-
 func validateEnvValueFrom(ctx context.Context, source *corev1.EnvVarSource) *apis.FieldError {
 	if source == nil {
 		return nil

diff --git a/pkg/apis/serving/k8s_validation_test.go b/pkg/apis/serving/k8s_validation_test.go
@@ -171,13 +171,6 @@ func withMultiContainerProbesEnabled() configOption {
 	}
 }
 
-func withPodSpecVolumesHostPathEnabled() configOption {
-	return func(cfg *config.Config) *config.Config {
-		cfg.Features.PodSpecVolumesHostPath = config.Enabled
-		return cfg
-	}
-}
-
 func withPodSpecDNSPolicyEnabled() configOption {
 	return func(cfg *config.Config) *config.Config {
 		cfg.Features.PodSpecDNSPolicy = config.Enabled
@@ -2918,49 +2911,6 @@ func TestVolumeValidation(t *testing.T) {
 			Message: `Persistent volume write support is disabled, but found persistent volume claim myclaim that is not read-only`,
 		}).Also(
 			&apis.FieldError{Message: "must not set the field(s)", Paths: []string{"persistentVolumeClaim"}}),
-	}, {
-		name: "hostPath volume",
-		v: corev1.Volume{
-			Name: "foo",
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: "foo/foo",
-				},
-			},
-		},
-		cfgOpts: []configOption{withPodSpecVolumesHostPathEnabled()},
-	}, {
-		name: "invalid hostPath volume, invalid type",
-		v: corev1.Volume{
-			Name: "foo",
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: "foo/foo",
-					Type: (*corev1.HostPathType)(ptr.String("wrong")),
-				},
-			},
-		},
-		cfgOpts: []configOption{withPodSpecVolumesHostPathEnabled()},
-		want: &apis.FieldError{
-			Message: `invalid value: wrong`,
-			Paths:   []string{"hostPath.type"},
-			Details: "unknown type",
-		},
-	}, {
-		name: "invalid hostPath volume, empty path",
-		v: corev1.Volume{
-			Name: "foo",
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: "",
-				},
-			},
-		},
-		cfgOpts: []configOption{withPodSpecVolumesHostPathEnabled()},
-		want: &apis.FieldError{
-			Message: `invalid value: ''`,
-			Paths:   []string{"hostPath.path"},
-		},
 	}, {
 		name: "no volume source",
 		v: corev1.Volume{