Skip to content

Commit 9a0a0eb

Browse files
committed
refactor: disable probes if image or command is replaced
1 parent 19bb13a commit 9a0a0eb

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

pkg/devspace/services/podreplace/builder.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@ func replaceWorkingDir(ctx devspacecontext.Context, devPod *latest.DevPod, devCo
232232
return err
233233
}
234234

235+
container.ReadinessProbe = nil
236+
container.LivenessProbe = nil
237+
container.StartupProbe = nil
235238
container.WorkingDir = devContainer.WorkingDir
236239
podTemplate.Spec.Containers[index] = *container
237240
return nil
@@ -259,6 +262,11 @@ func replaceCommand(ctx devspacecontext.Context, devPod *latest.DevPod, devConta
259262
return err
260263
}
261264

265+
// make sure probes are not set for this container
266+
container.ReadinessProbe = nil
267+
container.LivenessProbe = nil
268+
container.StartupProbe = nil
269+
262270
// should we inject devspace restart helper?
263271
if injectRestartHelper {
264272
annotationName := restartHelperAnnotation + container.Name
@@ -318,9 +326,6 @@ func replaceCommand(ctx devspacecontext.Context, devPod *latest.DevPod, devConta
318326
if devContainer.Args != nil {
319327
container.Args = devContainer.Args
320328
}
321-
container.ReadinessProbe = nil
322-
container.LivenessProbe = nil
323-
container.StartupProbe = nil
324329
podTemplate.Spec.Containers[index] = *container
325330
return nil
326331
}
@@ -435,6 +440,9 @@ func replaceImage(ctx devspacecontext.Context, devPod *latest.DevPod, devContain
435440
return err
436441
}
437442

443+
container.ReadinessProbe = nil
444+
container.LivenessProbe = nil
445+
container.StartupProbe = nil
438446
container.Image = imageStr
439447
podTemplate.Spec.Containers[index] = *container
440448
return nil

0 commit comments

Comments
 (0)