Skip to content

Support exec probe for the realtime readiness probe #2190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2021
Merged

Support exec probe for the realtime readiness probe #2190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions pkg/types/spec/validations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,9 @@ func containersValidation(kind userconfig.Kind) *cr.StructFieldValidation {
probeValidation("LivenessProbe", true),
}

if kind != userconfig.TaskAPIKind {
if kind == userconfig.RealtimeAPIKind {
validations = append(validations, probeValidation("ReadinessProbe", true))
} else if kind == userconfig.AsyncAPIKind || kind == userconfig.BatchAPIKind {
validations = append(validations, probeValidation("ReadinessProbe", false))
}

Expand Down Expand Up @@ -760,13 +762,14 @@ func validateContainers(
}

if container.ReadinessProbe != nil {
if err := validateProbe(*container.ReadinessProbe, true); err != nil {
supportsExecProbe := kind == userconfig.RealtimeAPIKind
if err := validateProbe(*container.ReadinessProbe, supportsExecProbe); err != nil {
return errors.Wrap(err, s.Index(i), userconfig.ReadinessProbeKey)
}
}

if container.LivenessProbe != nil {
if err := validateProbe(*container.LivenessProbe, false); err != nil {
if err := validateProbe(*container.LivenessProbe, true); err != nil {
return errors.Wrap(err, s.Index(i), userconfig.LivenessProbeKey)
}
}
Expand All @@ -776,7 +779,7 @@ func validateContainers(
return nil
}

func validateProbe(probe userconfig.Probe, isReadinessProbe bool) error {
func validateProbe(probe userconfig.Probe, supportsExecProbe bool) error {
numSpecifiedProbes := 0
if probe.HTTPGet != nil {
numSpecifiedProbes++
Expand All @@ -790,7 +793,7 @@ func validateProbe(probe userconfig.Probe, isReadinessProbe bool) error {

if numSpecifiedProbes != 1 {
validProbes := []string{userconfig.HTTPGetKey, userconfig.TCPSocketKey}
if !isReadinessProbe {
if supportsExecProbe {
validProbes = append(validProbes, userconfig.ExecKey)
}
return ErrorSpecifyExactlyOneField(numSpecifiedProbes, validProbes...)
Expand Down