Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/apis/serving/k8s_validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,11 +545,17 @@ func validateSidecarContainer(ctx context.Context, container corev1.Container, v
errs = errs.Also(apis.CheckDisallowedFields(*container.ReadinessProbe,
*ProbeMask(&corev1.Probe{})).ViaField("readinessProbe"))
}
if container.StartupProbe != nil {
errs = errs.Also(apis.CheckDisallowedFields(*container.StartupProbe,
*ProbeMask(&corev1.Probe{})).ViaField("startupProbe"))
}
} else if cfg.Features.MultiContainerProbing == config.Enabled {
// Liveness Probes
errs = errs.Also(validateProbe(container.LivenessProbe, nil, false).ViaField("livenessProbe"))
// Readiness Probes
errs = errs.Also(validateReadinessProbe(container.ReadinessProbe, nil, false).ViaField("readinessProbe"))
// Startup Probes
errs = errs.Also(validateProbe(container.StartupProbe, nil, false).ViaField("startupProbe"))
}

return errs.Also(validate(ctx, container, volumes))
Expand Down Expand Up @@ -591,6 +597,8 @@ func ValidateUserContainer(ctx context.Context, container corev1.Container, volu
errs = errs.Also(validateProbe(container.LivenessProbe, &port, true).ViaField("livenessProbe"))
// Readiness Probes
errs = errs.Also(validateReadinessProbe(container.ReadinessProbe, &port, true).ViaField("readinessProbe"))
// Startup Probes
errs = errs.Also(validateProbe(container.StartupProbe, &port, true).ViaField("startupProbe"))
return errs.Also(validate(ctx, container, volumes))
}

Expand Down
6 changes: 4 additions & 2 deletions pkg/apis/serving/k8s_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2189,7 +2189,8 @@ func TestSidecarContainerValidation(t *testing.T) {
TerminationGracePeriodSeconds: ptr.Int64(10),
},
},
want: apis.ErrDisallowedFields("livenessProbe", "readinessProbe", "readinessProbe.failureThreshold", "readinessProbe.periodSeconds", "readinessProbe.successThreshold", "readinessProbe.timeoutSeconds"),
want: apis.ErrDisallowedFields("livenessProbe", "readinessProbe", "readinessProbe.failureThreshold", "readinessProbe.periodSeconds", "readinessProbe.successThreshold", "readinessProbe.timeoutSeconds",
"startupProbe", "startupProbe.failureThreshold", "startupProbe.periodSeconds", "startupProbe.successThreshold", "startupProbe.terminationGracePeriodSeconds", "startupProbe.timeoutSeconds"),
}, {
name: "invalid probes (no port defined)",
c: corev1.Container{
Expand Down Expand Up @@ -2255,7 +2256,7 @@ func TestSidecarContainerValidation(t *testing.T) {
TerminationGracePeriodSeconds: ptr.Int64(10),
},
},
want: nil,
want: apis.ErrDisallowedFields("startupProbe", "startupProbe.failureThreshold", "startupProbe.periodSeconds", "startupProbe.successThreshold", "startupProbe.terminationGracePeriodSeconds", "startupProbe.timeoutSeconds"),
}, {
name: "valid with startup probe and multi container probing",
c: corev1.Container{
Expand All @@ -2268,6 +2269,7 @@ func TestSidecarContainerValidation(t *testing.T) {
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/",
Port: intstr.FromInt32(5000),
},
},
TerminationGracePeriodSeconds: ptr.Int64(10),
Expand Down
Loading