Skip to content

Bug 1792015: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required #301

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
openshift-merge-robot merged 1 commit into from
Mar 6, 2020
Merged

Bug 1792015: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required #301

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: 4 additions & 9 deletions lib/resourcemerge/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,8 @@ func ensureContainer(modified *bool, existing *corev1.Container, required corev1
ensureVolumeMount(modified, existingCurr, required)
}

if required.LivenessProbe != nil {
ensureProbePtr(modified, &existing.LivenessProbe, required.LivenessProbe)
}
if required.ReadinessProbe != nil {
ensureProbePtr(modified, &existing.ReadinessProbe, required.ReadinessProbe)
}
ensureProbePtr(modified, &existing.LivenessProbe, required.LivenessProbe)
ensureProbePtr(modified, &existing.ReadinessProbe, required.ReadinessProbe)

// our security context should always win
ensureSecurityContextPtr(modified, &existing.SecurityContext, required.SecurityContext)
Expand All @@ -168,11 +164,10 @@ func ensureEnvFromSource(modified *bool, existing *[]corev1.EnvFromSource, requi
}

func ensureProbePtr(modified *bool, existing **corev1.Probe, required *corev1.Probe) {
// if we have no required, then we don't care what someone else has set
if required == nil {
if *existing == nil && required == nil {
return
}
if *existing == nil {
if *existing == nil || required == nil {
*modified = true
*existing = required
return
Expand Down