This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 73e663df8 test(e2e): cover environment trait configuration (#6967)
73e663df8 is described below
commit 73e663df8e7b1c87547597ce96886cabb776daf7
Author: Sanjeev Kumar <[email protected]>
AuthorDate: Tue Nov 17 16:55:42 2026 +0530
test(e2e): cover environment trait configuration (#6967)
* test(e2e): add environment trait route fixture
* test(e2e): cover environment trait configuration
* test(e2e): tighten environment variable assertions
* test(e2e): rely on runtime checks for downward API values
* test(e2e): verify integration metadata with container metadata disabled
* test(e2e): address environment trait review feedback
* test(e2e): check environment variables directly in pod
* test(e2e): include API version in field selectors
---
e2e/common/traits/environment_test.go | 116 ++++++++++++++++++++++++++
e2e/common/traits/files/EnvironmentTrait.java | 27 ++++++
2 files changed, 143 insertions(+)
diff --git a/e2e/common/traits/environment_test.go
b/e2e/common/traits/environment_test.go
new file mode 100644
index 000000000..076becd3f
--- /dev/null
+++ b/e2e/common/traits/environment_test.go
@@ -0,0 +1,116 @@
+//go:build integration
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go ->
Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+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.
+*/
+
+package common
+
+import (
+ "context"
+ "testing"
+
+ . "github.com/onsi/gomega"
+
+ corev1 "k8s.io/api/core/v1"
+
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+)
+
+func TestEnvironmentTrait(t *testing.T) {
+ t.Parallel()
+
+ WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
+ t.Run("custom variables and container metadata are available to
the route", func(t *testing.T) {
+ name := RandomizedSuffixName("environment-enabled")
+ customValue := "environment-trait-e2e-value"
+
+ g.Expect(KamelRun(t, ctx, ns,
"files/EnvironmentTrait.java",
+ "--name", name,
+ "-t",
"environment.vars=CAMEL_K_TEST_VALUE="+customValue,
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady), TestTimeoutMedium).
+ Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns, name),
TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+
+ pod := IntegrationPod(t, ctx, ns, name)()
+ g.Expect(pod).NotTo(BeNil())
+ g.Expect(pod.Spec.Containers).To(HaveLen(1))
+
+
g.Expect(pod.Spec.Containers[0].Env).To(ContainElement(corev1.EnvVar{
+ Name: "NAMESPACE",
+ ValueFrom: &corev1.EnvVarSource{
+ FieldRef:
&corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"},
+ },
+ }))
+
g.Expect(pod.Spec.Containers[0].Env).To(ContainElement(corev1.EnvVar{
+ Name: "POD_NAME",
+ ValueFrom: &corev1.EnvVarSource{
+ FieldRef:
&corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.name"},
+ },
+ }))
+
g.Expect(pod.Spec.Containers[0].Env).To(ContainElement(corev1.EnvVar{
+ Name: "CAMEL_K_INTEGRATION",
+ Value: name,
+ }))
+
g.Expect(pod.Spec.Containers[0].Env).To(ContainElement(corev1.EnvVar{
+ Name: "CAMEL_K_TEST_VALUE",
+ Value: customValue,
+ }))
+
+ expectedMessage := "namespace=" + ns + ";pod=" +
pod.Name + ";integration=" + name + ";custom=" + customValue
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutMedium).Should(ContainSubstring(expectedMessage))
+ })
+
+ t.Run("container metadata and proxy propagation can be
disabled", func(t *testing.T) {
+ name := RandomizedSuffixName("environment-disabled")
+ customValue := "environment-trait-disabled-value"
+
+ g.Expect(KamelRun(t, ctx, ns,
"files/EnvironmentTrait.java",
+ "--name", name,
+ "-t", "environment.container-meta=false",
+ "-t", "environment.http-proxy=false",
+ "-t",
"environment.vars=CAMEL_K_TEST_VALUE="+customValue,
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady), TestTimeoutMedium).
+ Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns, name),
TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+
+ pod := IntegrationPod(t, ctx, ns, name)()
+ g.Expect(pod).NotTo(BeNil())
+ g.Expect(pod.Spec.Containers).To(HaveLen(1))
+
+
g.Expect(pod.Spec.Containers[0].Env).NotTo(ContainElement(HaveField("Name",
Equal("NAMESPACE"))))
+
g.Expect(pod.Spec.Containers[0].Env).NotTo(ContainElement(HaveField("Name",
Equal("POD_NAME"))))
+
g.Expect(pod.Spec.Containers[0].Env).NotTo(ContainElement(HaveField("Name",
Equal("HTTP_PROXY"))))
+
g.Expect(pod.Spec.Containers[0].Env).NotTo(ContainElement(HaveField("Name",
Equal("HTTPS_PROXY"))))
+
g.Expect(pod.Spec.Containers[0].Env).NotTo(ContainElement(HaveField("Name",
Equal("NO_PROXY"))))
+
g.Expect(pod.Spec.Containers[0].Env).To(ContainElement(corev1.EnvVar{
+ Name: "CAMEL_K_TEST_VALUE",
+ Value: customValue,
+ }))
+
+ expectedMessage := "integration=" + name + ";custom=" +
customValue
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutMedium).Should(ContainSubstring(expectedMessage))
+ })
+ })
+}
diff --git a/e2e/common/traits/files/EnvironmentTrait.java
b/e2e/common/traits/files/EnvironmentTrait.java
new file mode 100644
index 000000000..607030a03
--- /dev/null
+++ b/e2e/common/traits/files/EnvironmentTrait.java
@@ -0,0 +1,27 @@
+/*
+ * 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 EnvironmentTrait extends RouteBuilder {
+ @Override
+ public void configure() throws Exception {
+ from("timer:environment?period=1000")
+
.setBody().simple("namespace=${env.NAMESPACE};pod=${env.POD_NAME};integration=${env.CAMEL_K_INTEGRATION};custom=${env.CAMEL_K_TEST_VALUE}")
+ .log("${body}");
+ }
+}