This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c0ab9b92a758bddf43f20aea28379f612209921b Author: Pasquale Congiusti <[email protected]> AuthorDate: Thu Jun 20 14:52:07 2024 +0200 chore(e2e): add rest client call timeout --- e2e/advanced/operator_metrics_test.go | 4 +++- e2e/common/traits/health_test.go | 3 +++ e2e/common/traits/jolokia_test.go | 7 ++++--- e2e/common/traits/prometheus_test.go | 2 ++ pkg/controller/build/monitor_pod.go | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/e2e/advanced/operator_metrics_test.go b/e2e/advanced/operator_metrics_test.go index 61ab56179..ca84c2704 100644 --- a/e2e/advanced/operator_metrics_test.go +++ b/e2e/advanced/operator_metrics_test.go @@ -73,7 +73,9 @@ func TestMetrics(t *testing.T) { g.Expect(logs).NotTo(BeEmpty()) response, err := TestClient(t).CoreV1().RESTClient().Get(). - AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/metrics", pod.Namespace, pod.Name)).DoRaw(ctx) + AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/metrics", pod.Namespace, pod.Name)). + Timeout(30 * time.Second). + DoRaw(ctx) g.Expect(err).To(BeNil()) metrics, err := parsePrometheusData(response) g.Expect(err).To(BeNil()) diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go index bd0b8b302..2a3f8d8b4 100644 --- a/e2e/common/traits/health_test.go +++ b/e2e/common/traits/health_test.go @@ -86,6 +86,7 @@ func TestHealthTrait(t *testing.T) { response, err := TestClient(t).CoreV1().RESTClient().Post(). AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)). + Timeout(30 * time.Second). Body(body). DoRaw(ctx) g.Expect(err).To(BeNil()) @@ -167,6 +168,7 @@ func TestHealthTrait(t *testing.T) { response, err := TestClient(t).CoreV1().RESTClient().Post(). AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)). + Timeout(30 * time.Second). Body(body). DoRaw(ctx) g.Expect(err).To(BeNil()) @@ -262,6 +264,7 @@ func TestHealthTrait(t *testing.T) { response, err := TestClient(t).CoreV1().RESTClient().Post(). AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)). + Timeout(30 * time.Second). Body(body). DoRaw(ctx) diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go index e2454b5de..0f147a156 100644 --- a/e2e/common/traits/jolokia_test.go +++ b/e2e/common/traits/jolokia_test.go @@ -26,6 +26,7 @@ import ( "context" "fmt" "testing" + "time" . "github.com/onsi/gomega" @@ -45,8 +46,6 @@ func TestJolokiaTrait(t *testing.T) { "-t", "jolokia.use-ssl-client-authentication=false", "-t", "jolokia.protocol=http", "-t", "jolokia.extended-client-check=false", - // TODO check if the WA is valid - "--build-property", "jolokia=true", ).Execute()).To(Succeed()) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) @@ -54,7 +53,9 @@ func TestJolokiaTrait(t *testing.T) { pod := IntegrationPod(t, ctx, ns, name) response, err := TestClient(t).CoreV1().RESTClient().Get(). - AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)).DoRaw(ctx) + AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)). + Timeout(30 * time.Second). + DoRaw(ctx) g.Expect(err).To(BeNil()) g.Expect(response).To(ContainSubstring(`"status":200`)) }) diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go index 940a32a08..418296e50 100644 --- a/e2e/common/traits/prometheus_test.go +++ b/e2e/common/traits/prometheus_test.go @@ -26,6 +26,7 @@ import ( "context" "fmt" "testing" + "time" . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" @@ -58,6 +59,7 @@ func TestPrometheusTrait(t *testing.T) { t.Run("Metrics endpoint works", func(t *testing.T) { pod := IntegrationPod(t, ctx, ns, "java") response, err := TestClient(t).CoreV1().RESTClient().Get(). + Timeout(30 * time.Second). AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/q/metrics", ns, pod().Name)).DoRaw(ctx) if err != nil { assert.Fail(t, err.Error()) diff --git a/pkg/controller/build/monitor_pod.go b/pkg/controller/build/monitor_pod.go index ff0ee3165..5febc6118 100644 --- a/pkg/controller/build/monitor_pod.go +++ b/pkg/controller/build/monitor_pod.go @@ -214,6 +214,7 @@ func (action *monitorPodAction) sigterm(ctx context.Context, pod *corev1.Pod) er Resource("pods"). Namespace(pod.Namespace). Name(pod.Name). + Timeout(1*time.Minute). SubResource("exec"). Param("container", container.Name)
