You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2022/11/17 02:49:17 UTC
[camel-k] 04/04: feat(e2e): add test for Ready condition message propagated from health checks
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d22de12a6595b6160df54ca608f16370647e5aba
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Wed Nov 16 18:51:38 2022 +0900
feat(e2e): add test for Ready condition message propagated from health checks
---
e2e/global/common/traits/files/NeverReady.java | 29 ++++++++++++++
e2e/global/common/traits/health_test.go | 52 +++++++++++++++++++++-----
2 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/e2e/global/common/traits/files/NeverReady.java b/e2e/global/common/traits/files/NeverReady.java
new file mode 100644
index 000000000..957641457
--- /dev/null
+++ b/e2e/global/common/traits/files/NeverReady.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class NeverReady extends RouteBuilder {
+ @Override
+ public void configure() throws Exception {
+ from("timer:tick").id("never-ready")
+ .to("controlbus:route?routeId=never-ready&action=stop&async=true")
+ .setHeader("m").constant("string!")
+ .setBody().simple("Magic${header.m}")
+ .log("${body}");
+ }
+}
diff --git a/e2e/global/common/traits/health_test.go b/e2e/global/common/traits/health_test.go
index e69d84c35..20d398652 100644
--- a/e2e/global/common/traits/health_test.go
+++ b/e2e/global/common/traits/health_test.go
@@ -27,6 +27,7 @@ import (
"fmt"
"os"
"testing"
+ "time"
. "github.com/onsi/gomega"
@@ -52,6 +53,7 @@ func TestHealthTrait(t *testing.T) {
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
t.Run("Readiness condition with stopped route", func(t *testing.T) {
+ name := "java"
Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
"-t", "health.enabled=true",
// Enable Jolokia for the test to stop the Camel route
@@ -60,12 +62,13 @@ func TestHealthTrait(t *testing.T) {
"-t", "jolokia.protocol=http",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, "java"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, "java")()
+ pod := IntegrationPod(ns, name)()
// Stop the Camel route
request := map[string]string{
@@ -84,7 +87,8 @@ func TestHealthTrait(t *testing.T) {
Expect(response).To(ContainSubstring(`"status":200`))
// Check the ready condition has turned falsy
- Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
// And it contains details about the runtime state
//
@@ -98,12 +102,42 @@ func TestHealthTrait(t *testing.T) {
// status: "False"
// type: Ready
//
- Eventually(IntegrationCondition(ns, "java", v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
- WithTransform(IntegrationConditionMessage, HavePrefix(fmt.Sprintf("[Pod %s runtime is not ready: map[check.kind:READINESS route.id:route1 route.status:Stopped]", pod.Name))),
+ WithTransform(IntegrationConditionMessage, HavePrefix(
+ fmt.Sprintf(
+ "[Pod %s runtime is not ready: map[check.kind:READINESS route.id:route1 route.status:Stopped]",
+ pod.Name))),
))
// Check the Integration is still in running phase
- Eventually(IntegrationPhase(ns, "java"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+
+ // Clean-up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Readiness condition with never ready route", func(t *testing.T) {
+ name := "never-ready"
+ Expect(KamelRunWithID(operatorID, ns, "files/NeverReady.java",
+ "-t", "health.enabled=true",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Consistently(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), 1*time.Minute).
+ Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+
+ pod := IntegrationPod(ns, name)()
+
+ // Check that the error message is propagated from health checks even if deployment never becomes ready
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionErrorReason)),
+ WithTransform(IntegrationConditionMessage, HavePrefix(
+ fmt.Sprintf(
+ "[Pod %s runtime is not ready: map[check.kind:READINESS route.id:never-ready route.status:Stopped]",
+ pod.Name))),
+ ))
// Clean-up
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())