From ae619953fbc04c8f87f1b2463dfad66f7b8690bc Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Thu, 3 Apr 2025 16:54:44 +0200
Subject: [PATCH] [tests] Fix e2e tests (dependencies and timeouts)

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
---
 hack/e2e.sh                                    | 2 +-
 packages/apps/tenant/Chart.yaml                | 2 +-
 packages/apps/tenant/templates/monitoring.yaml | 4 ++++
 packages/apps/versions_map                     | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hack/e2e.sh b/hack/e2e.sh
index bb7eefdf..7f80c5bc 100755
--- a/hack/e2e.sh
+++ b/hack/e2e.sh
@@ -352,5 +352,5 @@ kubectl patch -n cozy-system cm/cozystack --type=merge -p '{"data":{
   "oidc-enabled": "true"
 }}'
 
-timeout 60 sh -c 'until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator; do sleep 1; done'
+timeout 120 sh -c 'until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator; do sleep 1; done'
 kubectl wait --timeout=10m --for=condition=ready -n cozy-keycloak hr keycloak keycloak-configure keycloak-operator
diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml
index bba14724..5582dc71 100644
--- a/packages/apps/tenant/Chart.yaml
+++ b/packages/apps/tenant/Chart.yaml
@@ -4,4 +4,4 @@ description: Separated tenant namespace
 icon: /logos/tenant.svg
 
 type: application
-version: 1.9.1
+version: 1.9.2
diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml
index e62cb507..82684346 100644
--- a/packages/apps/tenant/templates/monitoring.yaml
+++ b/packages/apps/tenant/templates/monitoring.yaml
@@ -46,4 +46,8 @@ spec:
         resources: {}
     oncall:
       enabled: false
+  {{- if .Values.ingress }}
+  dependsOn:
+    - name: ingress
+  {{- end }}
 {{- end }}
diff --git a/packages/apps/versions_map b/packages/apps/versions_map
index 9812a49d..f22fe47e 100644
--- a/packages/apps/versions_map
+++ b/packages/apps/versions_map
@@ -128,7 +128,8 @@ tenant 1.6.8 bc95159a
 tenant 1.7.0 24fa7222
 tenant 1.8.0 160e4e2a
 tenant 1.9.0 728743db
-tenant 1.9.1 HEAD
+tenant 1.9.1 de19450f
+tenant 1.9.2 HEAD
 virtual-machine 0.1.4 f2015d65
 virtual-machine 0.1.5 263e47be
 virtual-machine 0.2.0 c0685f43