Skip to content

Commit 88c70ee

Browse files
committed
fix liveness probe removal
1 parent 92e33ef commit 88c70ee

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

pkg/reconciler/common/workload_override.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func replaceProbes(override *base.WorkloadOverride, ps *corev1.PodTemplateSpec)
223223
}
224224
if *overrideProbe == (v1.Probe{}) {
225225
// Disable probe when users explicitly set the empty overrideProbe.
226-
containers[i].ReadinessProbe = nil
226+
containers[i].LivenessProbe = nil
227227
continue
228228
}
229229
if containers[i].LivenessProbe == nil {

pkg/reconciler/common/workload_override_test.go

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ func TestComponentsTransform(t *testing.T) {
529529
InitialDelaySeconds: 12,
530530
}}},
531531
}, {
532-
name: "empty probe drops probe",
532+
name: "empty readiness probe drops probe",
533533
override: []base.WorkloadOverride{
534534
{
535535
Name: "activator",
@@ -550,6 +550,28 @@ func TestComponentsTransform(t *testing.T) {
550550
}},
551551
},
552552
}},
553+
}, {
554+
name: "empty liveness probe drops probe",
555+
override: []base.WorkloadOverride{
556+
{
557+
Name: "activator",
558+
LivenessProbes: []base.ProbesRequirementsOverride{{
559+
Container: "activator",
560+
}}},
561+
},
562+
expDeployment: map[string]expDeployments{"activator": {
563+
expLabels: map[string]string{"serving.knative.dev/release": "v0.13.0"},
564+
expTemplateLabels: map[string]string{"serving.knative.dev/release": "v0.13.0", "app": "activator", "role": "activator"},
565+
expTemplateAnnotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "false"},
566+
expReplicas: 0,
567+
expReadinessProbe: &v1.Probe{
568+
ProbeHandler: v1.ProbeHandler{
569+
HTTPGet: &v1.HTTPGetAction{
570+
Port: intstr.IntOrString{IntVal: 8012},
571+
HTTPHeaders: []v1.HTTPHeader{{Name: "k-kubelet-probe", Value: "activator"}},
572+
}},
573+
},
574+
}},
553575
}, {
554576
name: "neither replicas in workload override nor global replicas",
555577
override: []base.WorkloadOverride{

0 commit comments

Comments
 (0)