This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 39205920ad8a9d493e2e455c2f286c15f7bff345 Author: Antonin Stefanutti <[email protected]> AuthorDate: Tue Jan 11 13:24:48 2022 +0100 fix(e2e): assert downward API in environment trait tests --- e2e/common/traits/environment_test.go | 39 ++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/e2e/common/traits/environment_test.go b/e2e/common/traits/environment_test.go index d17bc5a..efd1ad2 100644 --- a/e2e/common/traits/environment_test.go +++ b/e2e/common/traits/environment_test.go @@ -76,7 +76,18 @@ func TestEnvironmentTrait(t *testing.T) { Expect(IntegrationPod(ns, "java")()).To(WithTransform(podEnvVars, And( ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}), - ContainElement(corev1.EnvVar{Name: "NAMESPACE", Value: ns}), + ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.namespace", + }, + }}), + ContainElement(corev1.EnvVar{Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.name", + }, + }}), ContainElement(corev1.EnvVar{Name: "HTTP_PROXY", Value: httpProxy}), ContainElement(corev1.EnvVar{Name: "NO_PROXY", Value: strings.Join(noProxy, ",")}), ))) @@ -92,7 +103,18 @@ func TestEnvironmentTrait(t *testing.T) { Expect(IntegrationPod(ns, "java")()).To(WithTransform(podEnvVars, And( ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}), - ContainElement(corev1.EnvVar{Name: "NAMESPACE", Value: ns}), + ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.namespace", + }, + }}), + ContainElement(corev1.EnvVar{Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.name", + }, + }}), ContainElement(corev1.EnvVar{Name: "HTTP_PROXY", Value: "http://custom.proxy"}), ContainElement(corev1.EnvVar{Name: "NO_PROXY", Value: strings.Join(noProxy, ",")}), ))) @@ -108,7 +130,18 @@ func TestEnvironmentTrait(t *testing.T) { Expect(IntegrationPod(ns, "java")()).To(WithTransform(podEnvVars, And( ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}), - ContainElement(corev1.EnvVar{Name: "NAMESPACE", Value: ns}), + ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.namespace", + }, + }}), + ContainElement(corev1.EnvVar{Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.name", + }, + }}), Not(ContainElement(corev1.EnvVar{Name: "HTTP_PROXY", Value: httpProxy})), Not(ContainElement(corev1.EnvVar{Name: "NO_PROXY", Value: strings.Join(noProxy, ",")})), )))
