Skip to content
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

Disable readiness probe in case of debug Eclipse Che Server #160

Merged
merged 3 commits into from
Feb 4, 2020
Merged

Disable readiness probe in case of debug Eclipse Che Server #160

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcdf076
Disable readeness probe in case of debug
tolusha Jan 30, 2020
4c43c43
Fix
tolusha Feb 2, 2020
4dc738e
Fix
tolusha Feb 3, 2020
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
42 changes: 24 additions & 18 deletions pkg/deploy/deployment_che.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,24 +135,6 @@ func NewCheDeployment(cr *orgv1.CheCluster, cheImage string, cheTag string, cmRe
corev1.ResourceMemory: resource.MustParse(memLimit),
},
},
ReadinessProbe: &corev1.Probe{
Handler: corev1.Handler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/api/system/state",
Port: intstr.IntOrString{
Type: intstr.Int,
IntVal: int32(8080),
},
Scheme: corev1.URISchemeHTTP,
},
},
// After POD start, the POD will be seen as ready after a minimum of 15 seconds and we expect it to be seen as ready until a maximum of 200 seconds
// 200 s = InitialDelaySeconds + PeriodSeconds * (FailureThreshold - 1) + TimeoutSeconds
InitialDelaySeconds: 25,
FailureThreshold: 18,
TimeoutSeconds: 5,
PeriodSeconds: 10,
},
LivenessProbe: &corev1.Probe{
Handler: corev1.Handler{
HTTPGet: &corev1.HTTPGetAction{
Expand Down Expand Up @@ -197,6 +179,30 @@ func NewCheDeployment(cr *orgv1.CheCluster, cheImage string, cheTag string, cmRe
},
},
}

// configure readiness probe if debug isn't set
cheDebug := util.GetValue(cr.Spec.Server.CheDebug, DefaultCheDebug)
if cheDebug == "false" {
tolusha marked this conversation as resolved.
Show resolved Hide resolved
cheDeployment.Spec.Template.Spec.Containers[0].ReadinessProbe = &corev1.Probe{
Handler: corev1.Handler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/api/system/state",
Port: intstr.IntOrString{
Type: intstr.Int,
IntVal: int32(8080),
},
Scheme: corev1.URISchemeHTTP,
},
},
// After POD start, the POD will be seen as ready after a minimum of 15 seconds and we expect it to be seen as ready until a maximum of 200 seconds
// 200 s = InitialDelaySeconds + PeriodSeconds * (FailureThreshold - 1) + TimeoutSeconds
InitialDelaySeconds: 25,
FailureThreshold: 18,
TimeoutSeconds: 5,
PeriodSeconds: 10,
}
}

if !isOpenshift {
runAsUser, err := strconv.ParseInt(util.GetValue(cr.Spec.K8s.SecurityContextRunAsUser, DefaultSecurityContextRunAsUser), 10, 64)
if err != nil {
Expand Down