Skip to content

Added function for startup probe #397

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
chatton merged 1 commit into from
Mar 24, 2021
Merged

Added function for startup probe #397

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions pkg/kube/container/container_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ func TestContainer(t *testing.T) {
probes.WithFailureThreshold(15),
probes.WithPeriodSeconds(10),
)),
WithStartupProbe(
probes.Apply(
probes.WithExecCommand([]string{"startup-exec"}),
probes.WithFailureThreshold(20),
probes.WithPeriodSeconds(30),
),
),
WithResourceRequirements(resourcerequirements.Defaults()),
WithCommand([]string{"container-cmd"}),
WithEnvs(
Expand Down Expand Up @@ -71,6 +78,11 @@ func TestContainer(t *testing.T) {
assert.Equal(t, int32(10), liveNessProbe.PeriodSeconds)
assert.Equal(t, "liveness-exec", liveNessProbe.Exec.Command[0])

startupProbe := c.StartupProbe
assert.Equal(t, int32(20), startupProbe.FailureThreshold)
assert.Equal(t, int32(30), startupProbe.PeriodSeconds)
assert.Equal(t, "startup-exec", startupProbe.Exec.Command[0])

assert.Equal(t, c.Resources, resourcerequirements.Defaults())

assert.Len(t, c.Command, 1)
Expand Down
14 changes: 12 additions & 2 deletions pkg/kube/container/containers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,22 @@ func WithReadinessProbe(probeFunc func(*corev1.Probe)) Modification {
}

// WithLivenessProbe modifies the container's Liveness Probe
func WithLivenessProbe(readinessProbeFunc func(*corev1.Probe)) Modification {
func WithLivenessProbe(livenessProbeFunc func(*corev1.Probe)) Modification {
return func(container *corev1.Container) {
if container.LivenessProbe == nil {
container.LivenessProbe = &corev1.Probe{}
}
readinessProbeFunc(container.LivenessProbe)
livenessProbeFunc(container.LivenessProbe)
}
}

// WithStartupProbe modifies the container's Startup Probe
func WithStartupProbe(startupProbeFunc func(*corev1.Probe)) Modification {
return func(container *corev1.Container) {
if container.StartupProbe == nil {
container.StartupProbe = &corev1.Probe{}
}
startupProbeFunc(container.StartupProbe)
}
}

Expand Down