From 4fdfed7745614f6c66eb4cb64368c5f2610f8c9e Mon Sep 17 00:00:00 2001 From: lburgazzoli Date: Wed, 6 Mar 2019 21:23:47 +0100 Subject: [PATCH] fix: do not add probes to knative services --- pkg/trait/probes.go | 6 ------ pkg/trait/probes_test.go | 9 ++------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkg/trait/probes.go b/pkg/trait/probes.go index 2ece7bbf2f..4fb582d2c1 100644 --- a/pkg/trait/probes.go +++ b/pkg/trait/probes.go @@ -24,7 +24,6 @@ import ( "github.com/apache/camel-k/pkg/util" "k8s.io/apimachinery/pkg/util/intstr" - serving "github.com/knative/serving/pkg/apis/serving/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" ) @@ -81,11 +80,6 @@ func (t *probesTrait) Apply(e *Environment) error { deployment.Spec.Template.Spec.Containers[0].LivenessProbe = t.newLivenessProbe() deployment.Spec.Template.Spec.Containers[0].ReadinessProbe = t.newReadinessProbe() }) - - e.Resources.VisitKnativeService(func(service *serving.Service) { - service.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.LivenessProbe = t.newLivenessProbe() - service.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.ReadinessProbe = t.newReadinessProbe() - }) } return nil diff --git a/pkg/trait/probes_test.go b/pkg/trait/probes_test.go index 8250de9677..82c95cf609 100644 --- a/pkg/trait/probes_test.go +++ b/pkg/trait/probes_test.go @@ -127,11 +127,6 @@ func TestProbesOnKnativeService(t *testing.T) { err = tr.Apply(&e) assert.Nil(t, err) - assert.Equal(t, "", target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.LivenessProbe.HTTPGet.Host) - assert.Equal(t, int32(9191), target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.LivenessProbe.HTTPGet.Port.IntVal) - assert.Equal(t, "/health", target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.LivenessProbe.HTTPGet.Path) - assert.Equal(t, "", target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.ReadinessProbe.HTTPGet.Host) - assert.Equal(t, int32(9191), target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.ReadinessProbe.HTTPGet.Port.IntVal) - assert.Equal(t, "/health", target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.ReadinessProbe.HTTPGet.Path) - assert.Equal(t, int32(4321), target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.ReadinessProbe.TimeoutSeconds) + assert.Nil(t, target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.LivenessProbe) + assert.Nil(t, target.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.ReadinessProbe) }