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

Merge pull request #125940 from thockin/master

Browse Source 
Clarify errors in ProjectedVolume validation
This commit is contained in:
Kubernetes Prow Robot
2024-07-17 13:09:51 -07:00
committed by GitHub
parent 6aa300c48b e6bb041445
commit b23f41e192
9 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1157,7 +1157,7 @@ func validateProjectionSources(projection *core.ProjectedVolumeSource, projectio
allErrs = append(allErrs, ValidateLocalNonReservedPath(source.ServiceAccountToken.Path, fldPath.Child("path"))...)
}
}
if projPath := srcPath.Child("clusterTrustBundlePEM"); source.ClusterTrustBundle != nil {
if projPath := srcPath.Child("clusterTrustBundle"); source.ClusterTrustBundle != nil {
numSources++
usingName := source.ClusterTrustBundle.Name != nil
@@ -1221,7 +1221,7 @@ func validateProjectionSources(projection *core.ProjectedVolumeSource, projectio
}
}
if numSources > 1 {
allErrs = append(allErrs, field.Forbidden(srcPath, "may not specify more than 1 volume type"))
allErrs = append(allErrs, field.Forbidden(srcPath, "may not specify more than 1 volume type per source"))
}
}
return allErrs

4
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -28458,7 +28458,7 @@ func schema_k8sio_api_core_v1_ProjectedVolumeSource(ref common.ReferenceCallback
},
},
SchemaProps: spec.SchemaProps{
Description: "sources is the list of volume projections",
Description: "sources is the list of volume projections. Each entry in this list handles one source.",
Type: []string{"array"},
Items: &spec.SchemaOrArray{
Schema: &spec.Schema{
@@ -31779,7 +31779,7 @@ func schema_k8sio_api_core_v1_VolumeProjection(ref common.ReferenceCallback) com
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Projection that may be projected along with other supported volume types",
Description: "Projection that may be projected along with other supported volume types. Exactly one of these fields must be set.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"secret": {