github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Declaratively validate RC.Spec.Replicas optionality

Browse Source 
The existing test run both declarative and manual validation and it
still passes.
This commit is contained in:
Tim Hockin 2024-12-19 10:34:42 -08:00 committed by Joe Betz
parent 21b3da7e5a
commit 0f4786536f
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/core/v1/zz_generated.validations.go generated
View File

@ -89,6 +89,11 @@ func Validate_ReplicationControllerSpec(ctx context.Context, op operation.Operat
// field corev1.ReplicationControllerSpec.Replicas // field corev1.ReplicationControllerSpec.Replicas
errs = append(errs, errs = append(errs,
func(fldPath *field.Path, obj, oldObj *int32) (errs field.ErrorList) { func(fldPath *field.Path, obj, oldObj *int32) (errs field.ErrorList) {
// optional fields with default values are effectively required
if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj); len(e) != 0 {
errs = append(errs, e...)
return // do not proceed
}
errs = append(errs, validate.Minimum(ctx, op, fldPath, obj, oldObj, 0)...) errs = append(errs, validate.Minimum(ctx, op, fldPath, obj, oldObj, 0)...)
return return
}(fldPath.Child("replicas"), obj.Replicas, safe.Field(oldObj, func(oldObj *corev1.ReplicationControllerSpec) *int32 { return oldObj.Replicas }))...) }(fldPath.Child("replicas"), obj.Replicas, safe.Field(oldObj, func(oldObj *corev1.ReplicationControllerSpec) *int32 { return oldObj.Replicas }))...)

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

@ -6322,7 +6322,7 @@ func ValidateReplicationControllerSpec(spec, oldSpec *core.ReplicationController
allErrs = append(allErrs, ValidateNonnegativeField(int64(spec.MinReadySeconds), fldPath.Child("minReadySeconds"))...) allErrs = append(allErrs, ValidateNonnegativeField(int64(spec.MinReadySeconds), fldPath.Child("minReadySeconds"))...)
allErrs = append(allErrs, ValidateNonEmptySelector(spec.Selector, fldPath.Child("selector"))...) allErrs = append(allErrs, ValidateNonEmptySelector(spec.Selector, fldPath.Child("selector"))...)
if spec.Replicas == nil { if spec.Replicas == nil {
allErrs = append(allErrs, field.Required(fldPath.Child("replicas"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("replicas"), "").MarkCoveredByDeclarative())
} else { } else {
allErrs = append(allErrs, ValidateNonnegativeField(int64(*spec.Replicas), fldPath.Child("replicas")).MarkCoveredByDeclarative()...) allErrs = append(allErrs, ValidateNonnegativeField(int64(*spec.Replicas), fldPath.Child("replicas")).MarkCoveredByDeclarative()...)
} }

1
staging/src/k8s.io/api/core/v1/generated.proto
View File

@ -5085,6 +5085,7 @@ message ReplicationControllerSpec {
// Defaults to 1. // Defaults to 1.
// More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#what-is-a-replicationcontroller // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#what-is-a-replicationcontroller
// +optional // +optional
// +k8s:optional
// +default=1 // +default=1
// +k8s:minimum=0 // +k8s:minimum=0
optional int32 replicas = 1; optional int32 replicas = 1;

1
staging/src/k8s.io/api/core/v1/types.go
View File

@ -5107,6 +5107,7 @@ type ReplicationControllerSpec struct {
// Defaults to 1. // Defaults to 1.
// More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#what-is-a-replicationcontroller // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#what-is-a-replicationcontroller
// +optional // +optional
// +k8s:optional
// +default=1 // +default=1
// +k8s:minimum=0 // +k8s:minimum=0
Replicas *int32 `json:"replicas,omitempty" protobuf:"varint,1,opt,name=replicas"` Replicas *int32 `json:"replicas,omitempty" protobuf:"varint,1,opt,name=replicas"`