Skip to content

kubernetes: replace probe's InitialDelay with StartupProbe #4124

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

Open
z0rc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

kubernetes: replace probe's InitialDelay with StartupProbe #4124

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
41 changes: 26 additions & 15 deletions driver/kubernetes/manifest/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ const (
rootVolumePath = "/var/lib/buildkit"
persistentVolumeClaimName = "buildkitd"

probeFailureThreshold = 3
probeInitialDelaySeconds = 5
probePeriodSeconds = 30
probeSuccessThreshold = 1
probeTimeoutSeconds = 60
probeFailureThreshold = 3
probePeriodSeconds = 30
probeSuccessThreshold = 1
probeTimeoutSeconds = 60

startupProbeFailureThreshold = 24
startupProbePeriodSeconds = 5
)

type ErrReservedAnnotationPlatform struct{}
Expand Down Expand Up @@ -120,29 +122,38 @@ func NewDeployment(opt *DeploymentOpt) (d *appsv1.Deployment, s *appsv1.Stateful
SecurityContext: &corev1.SecurityContext{
Privileged: &privileged,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: probeHandlerCommand,
},
},
FailureThreshold: startupProbeFailureThreshold,
PeriodSeconds: startupProbePeriodSeconds,
SuccessThreshold: probeSuccessThreshold,
TimeoutSeconds: probeTimeoutSeconds,
},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: probeHandlerCommand,
},
},
FailureThreshold: probeFailureThreshold,
InitialDelaySeconds: probeInitialDelaySeconds,
PeriodSeconds: probePeriodSeconds,
SuccessThreshold: probeSuccessThreshold,
TimeoutSeconds: probeTimeoutSeconds,
FailureThreshold: probeFailureThreshold,
PeriodSeconds: probePeriodSeconds,
SuccessThreshold: probeSuccessThreshold,
TimeoutSeconds: probeTimeoutSeconds,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: probeHandlerCommand,
},
},
FailureThreshold: probeFailureThreshold,
InitialDelaySeconds: probeInitialDelaySeconds,
PeriodSeconds: probePeriodSeconds,
SuccessThreshold: probeSuccessThreshold,
TimeoutSeconds: probeTimeoutSeconds,
FailureThreshold: probeFailureThreshold,
PeriodSeconds: probePeriodSeconds,
SuccessThreshold: probeSuccessThreshold,
TimeoutSeconds: probeTimeoutSeconds,
},
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{},
Expand Down
16 changes: 16 additions & 0 deletions driver/kubernetes/manifest/manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,19 @@ func TestNonRootlessMemoryVolume(t *testing.T) {
require.NotNil(t, vol.EmptyDir.SizeLimit)
require.Equal(t, "2Gi", vol.EmptyDir.SizeLimit.String())
}

func TestProbes(t *testing.T) {
d, _, _, err := NewDeployment(newBaseOpt())
require.NoError(t, err)
require.NotNil(t, d)

container := d.Spec.Template.Spec.Containers[0]
require.NotNil(t, container.StartupProbe)
require.Equal(t, int32(startupProbePeriodSeconds), container.StartupProbe.PeriodSeconds)
require.Equal(t, int32(startupProbeFailureThreshold), container.StartupProbe.FailureThreshold)

// An initial delay would make kubelet skip the readiness check it
// triggers right after the startup probe succeeds.
require.Zero(t, container.ReadinessProbe.InitialDelaySeconds)
require.Zero(t, container.LivenessProbe.InitialDelaySeconds)
}
Loading