This is an automated email from the ASF dual-hosted git repository.
gfournier 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 348d61d19 fix(e2e): Ensures Maven proxy test is not infra dependant
348d61d19 is described below
commit 348d61d194e5321af21d11514d205ef6c833e7dc
Author: Gaelle Fournier <[email protected]>
AuthorDate: Fri May 31 13:11:42 2024 +0200
fix(e2e): Ensures Maven proxy test is not infra dependant
---
e2e/advanced/maven_http_proxy_test.go | 51 ++++++++++++++++++++++++++++++-----
1 file changed, 45 insertions(+), 6 deletions(-)
diff --git a/e2e/advanced/maven_http_proxy_test.go
b/e2e/advanced/maven_http_proxy_test.go
index 4dd7a8af2..87e7dcae1 100644
--- a/e2e/advanced/maven_http_proxy_test.go
+++ b/e2e/advanced/maven_http_proxy_test.go
@@ -151,8 +151,6 @@ func TestMavenProxy(t *testing.T) {
// Install Camel K with the HTTP proxy
operatorID := "camel-k-maven-proxy"
- g.Expect(CopyCamelCatalog(t, ctx, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ctx, ns,
operatorID)).To(Succeed())
olm, olmErr := olm.IsAPIAvailable(TestClient(t))
installed, inErr :=
kubernetes.IsAPIResourceInstalled(TestClient(t),
configv1.GroupVersion.String(), reflect.TypeOf(configv1.Proxy{}).Name())
permission, pErr := kubernetes.CheckPermission(ctx,
TestClient(t), configv1.GroupName, reflect.TypeOf(configv1.Proxy{}).Name(), "",
"cluster", "edit")
@@ -210,10 +208,6 @@ func TestMavenProxy(t *testing.T) {
g.Expect(err).To(Succeed())
g.Expect(proxies.Items).To(HaveLen(1))
- logs := Logs(t, ctx, ns, proxies.Items[0].Name,
corev1.PodLogOptions{})()
- g.Expect(logs).NotTo(BeEmpty())
- g.Expect(logs).To(ContainSubstring("\"CONNECT
repo.maven.apache.org:443 HTTP/1.1\" 200"))
-
// Clean up
g.Expect(Kamel(t, ctx, "delete", "--all", "-n",
ns).Execute()).To(Succeed())
g.Expect(TestClient(t).Delete(ctx, deployment)).To(Succeed())
@@ -223,6 +217,51 @@ func TestMavenProxy(t *testing.T) {
})
}
+func TestMavenProxyNotPresent(t *testing.T) {
+ t.Parallel()
+
+ WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
+ hostname := fmt.Sprintf("%s.%s.svc", "proxy", ns)
+
+ svc := Service(t, ctx, TestDefaultNamespace, "kubernetes")()
+ g.Expect(svc).NotTo(BeNil())
+ // It may be needed to populate the values from the cluster,
machine and service network CIDRs
+ noProxy := []string{
+ ".cluster.local",
+ ".svc",
+ "localhost",
+ }
+ noProxy = append(noProxy, svc.Spec.ClusterIPs...)
+
+ // Install Camel K with the HTTP proxy that does not exists
+ operatorID := "camel-k-maven-no-proxy"
+ olm, olmErr := olm.IsAPIAvailable(TestClient(t))
+ installed, inErr :=
kubernetes.IsAPIResourceInstalled(TestClient(t),
configv1.GroupVersion.String(), reflect.TypeOf(configv1.Proxy{}).Name())
+ permission, pErr := kubernetes.CheckPermission(ctx,
TestClient(t), configv1.GroupName, reflect.TypeOf(configv1.Proxy{}).Name(), "",
"cluster", "edit")
+ olmInstall := pErr == nil && olmErr == nil && inErr == nil &&
olm && installed && permission
+ if olmInstall {
+ // ENV values should be injected by the OLM
+ g.Expect(KamelInstallWithID(t, ctx, operatorID,
ns)).To(Succeed())
+ } else {
+ g.Expect(KamelInstallWithID(t, ctx, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=http://%s";, hostname),
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","))).To(Succeed())
+ }
+
+ g.Eventually(PlatformPhase(t, ctx, ns),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ // Run the Integration
+ name := RandomizedSuffixName("java")
+ g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/Java.java", "--name", name).Execute()).To(Succeed())
+
+ // Should not be able to build
+ g.Eventually(IntegrationPhase(t, ctx, ns,
name)).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns, name,
v1.IntegrationConditionKitAvailable)).
+ Should(Equal(corev1.ConditionFalse))
+
+ // Clean up
+ g.Expect(Kamel(t, ctx, "delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
+}
+
func newHTTPDConfigMap(ns, hostname string) *corev1.ConfigMap {
return &corev1.ConfigMap{
TypeMeta: metav1.TypeMeta{
