From 1260585641f91349fead50650945043cc3c835bb Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Tue, 12 Nov 2024 16:59:26 +0100
Subject: [PATCH] chore: Update dependencies (#2946)

* chore: Update dependencies

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 README.md                                                 | 8 ++++----
 src/flags.ts                                              | 4 ++--
 .../eclipse-che/eclipse-che-operator-installer.ts         | 1 +
 test/e2e/e2e-upgrade-channel.test.ts                      | 4 ++--
 test/e2e/e2e-upgrade-version.test.ts                      | 4 ++--
 test/e2e/e2e.test.ts                                      | 2 +-
 yarn.lock                                                 | 4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 8ea8d23d2..ffae9126d 100644
--- a/README.md
+++ b/README.md
@@ -389,10 +389,10 @@ FLAGS
       [default: 60000] Waiting time for Pod rechecking error (in milliseconds)
 
   --k8spodreadytimeout=<value>
-      [default: 60000] Waiting time for Pod Ready condition (in milliseconds)
+      [default: 120000] Waiting time for Pod Ready condition (in milliseconds)
 
   --k8spodwaittimeout=<value>
-      [default: 60000] Waiting time for Pod scheduled condition (in milliseconds)
+      [default: 120000] Waiting time for Pod scheduled condition (in milliseconds)
 
   --olm-channel=<value>
       Olm channel to install Eclipse Che, f.e. stable.
@@ -476,8 +476,8 @@ FLAGS
   --batch                               Batch mode. Running a command without end user interaction.
   --k8spoddownloadimagetimeout=<value>  [default: 1200000] Waiting time for Pod downloading image (in milliseconds)
   --k8spoderrorrechecktimeout=<value>   [default: 60000] Waiting time for Pod rechecking error (in milliseconds)
-  --k8spodreadytimeout=<value>          [default: 60000] Waiting time for Pod Ready condition (in milliseconds)
-  --k8spodwaittimeout=<value>           [default: 60000] Waiting time for Pod scheduled condition (in milliseconds)
+  --k8spodreadytimeout=<value>          [default: 120000] Waiting time for Pod Ready condition (in milliseconds)
+  --k8spodwaittimeout=<value>           [default: 120000] Waiting time for Pod scheduled condition (in milliseconds)
   --skip-kubernetes-health-check        Skip Kubernetes health check
   --telemetry=<option>                  Enable or disable telemetry. This flag skips a prompt and enable/disable
                                         telemetry
diff --git a/src/flags.ts b/src/flags.ts
index 7444c6ee0..e4bf1f206 100644
--- a/src/flags.ts
+++ b/src/flags.ts
@@ -82,7 +82,7 @@ export const CHE_OPERATOR_CR_YAML  = Flags.string({
   default: '',
 })
 
-export const DEFAULT_POD_WAIT_TIMEOUT = '60000'
+export const DEFAULT_POD_WAIT_TIMEOUT = '120000'
 export const K8S_POD_WAIT_TIMEOUT_FLAG = 'k8spodwaittimeout'
 export const K8S_POD_WAIT_TIMEOUT  = Flags.string({
   description: 'Waiting time for Pod scheduled condition (in milliseconds)',
@@ -97,7 +97,7 @@ export const K8S_POD_DOWNLOAD_IMAGE_TIMEOUT  = Flags.string({
 })
 
 export const DEFAULT_K8S_POD_READY_TIMEOUT_EMBEDDED_PLUGIN_REGISTRY = '600000'
-export const DEFAULT_K8S_POD_READY_TIMEOUT = '60000'
+export const DEFAULT_K8S_POD_READY_TIMEOUT = '120000'
 export const K8S_POD_READY_TIMEOUT_FLAG = 'k8spodreadytimeout'
 export const K8S_POD_READY_TIMEOUT  = Flags.string({
   description: 'Waiting time for Pod Ready condition (in milliseconds)',
diff --git a/src/tasks/installers/eclipse-che/eclipse-che-operator-installer.ts b/src/tasks/installers/eclipse-che/eclipse-che-operator-installer.ts
index e4e5ac3f8..1fb2f9395 100644
--- a/src/tasks/installers/eclipse-che/eclipse-che-operator-installer.ts
+++ b/src/tasks/installers/eclipse-che/eclipse-che-operator-installer.ts
@@ -38,6 +38,7 @@ export class EclipseCheOperatorInstaller implements Installer {
         tasks.add(EclipseCheTasks.getCreateOrUpdateRbacTasks(true))
         if (!flags[SKIP_CERT_MANAGER_FLAG]) {
           tasks.add(CertManager.getWaitCertManagerTask())
+          tasks.add(CommonTasks.getWaitTask(5000))
         }
 
         tasks.add(EclipseCheTasks.getCreateOrUpdateCertificateTask(true))
diff --git a/test/e2e/e2e-upgrade-channel.test.ts b/test/e2e/e2e-upgrade-channel.test.ts
index 0aae0a9cb..d4bf66c26 100644
--- a/test/e2e/e2e-upgrade-channel.test.ts
+++ b/test/e2e/e2e-upgrade-channel.test.ts
@@ -32,8 +32,8 @@ describe('Upgrade channel test', () => {
         `--chenamespace=${EclipseChe.NAMESPACE}`,
         '--che-operator-cr-patch-yaml=test/e2e/resources/minikube-checluster-patch.yaml',
         '--telemetry=off',
-        '--k8spodwaittimeout=240000',
-        '--k8spodreadytimeout=240000',
+        '--k8spodwaittimeout=600000',
+        '--k8spodreadytimeout=600000',
       ])
 
       await helper.waitForCheServerImageTag(helper.getNewVersion(), TIMEOUT_MS)
diff --git a/test/e2e/e2e-upgrade-version.test.ts b/test/e2e/e2e-upgrade-version.test.ts
index 5bb946e0f..a1de4e19b 100644
--- a/test/e2e/e2e-upgrade-version.test.ts
+++ b/test/e2e/e2e-upgrade-version.test.ts
@@ -26,7 +26,7 @@ describe('Test Che upgrade', () => {
     it(`Deploy Che using operator installer and self signed certificates`, async () => {
       // uses installed chectl (from a stable channel)
       // see github workflow
-      let deployCommand = `chectl server:deploy --batch --platform=${PLATFORM} --chenamespace=${NAMESPACE} --telemetry=off --k8spodwaittimeout=240000 --k8spodreadytimeout=240000`
+      let deployCommand = `chectl server:deploy --batch --platform=${PLATFORM} --chenamespace=${NAMESPACE} --telemetry=off --k8spodwaittimeout=600000 --k8spodreadytimeout=600000`
       if (PLATFORM === 'minikube') {
         deployCommand += ' --che-operator-cr-patch-yaml=test/e2e/resources/minikube-checluster-patch.yaml'
       }
@@ -40,7 +40,7 @@ describe('Test Che upgrade', () => {
       // scale deployments down to free up some resources
       await helper.runCliCommand('kubectl', ['scale', 'deployment', 'che', '--replicas=0', `-n ${NAMESPACE}`])
       await helper.runCliCommand(binChectl, ['server:update', '-y', `-n ${NAMESPACE}`, '--telemetry=off'])
-      await helper.runCliCommand(binChectl, ['server:start', `-n ${NAMESPACE}`, '--telemetry=off'])
+      await helper.runCliCommand(binChectl, ['server:start', `-n ${NAMESPACE}`, '--telemetry=off', '--k8spodwaittimeout=600000', '--k8spodreadytimeout=600000'])
       await helper.waitForCheServerImageTag(helper.getNewVersion(), UPDATE_CHE_TIMEOUT_MS)
     })
 
diff --git a/test/e2e/e2e.test.ts b/test/e2e/e2e.test.ts
index 6fa0e38cf..b31dd0fa6 100644
--- a/test/e2e/e2e.test.ts
+++ b/test/e2e/e2e.test.ts
@@ -24,7 +24,7 @@ const binChectl = E2eHelper.getChectlBinaries()
 const PLATFORM = process.env.PLATFORM || ''
 
 function getDeployCommand(): string {
-  let command = `${binChectl} server:deploy --batch --platform=${PLATFORM} --chenamespace=${EclipseChe.NAMESPACE} --telemetry=off --k8spodwaittimeout=240000 --k8spodreadytimeout=240000`
+  let command = `${binChectl} server:deploy --batch --platform=${PLATFORM} --chenamespace=${EclipseChe.NAMESPACE} --telemetry=off --k8spodwaittimeout=600000 --k8spodreadytimeout=600000`
   if (PLATFORM === 'minikube') {
     command += ' --che-operator-cr-patch-yaml=test/e2e/resources/minikube-checluster-patch.yaml'
   }
diff --git a/yarn.lock b/yarn.lock
index 25f23fa02..52d6e9f4e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3683,7 +3683,7 @@ detect-newline@^3.0.0:
 
 "devworkspace-operator@https://github.com/devfile/devworkspace-operator#main":
   version "0.0.0"
-  resolved "https://github.com/devfile/devworkspace-operator#ff723835cc3ed38c9f8a5fbf36dcfddf1890ac9c"
+  resolved "https://github.com/devfile/devworkspace-operator#10faaa74b7774d08f32cffbb9b7b7ba3ab68c438"
 
 dezalgo@^1.0.0:
   version "1.0.4"
@@ -3744,7 +3744,7 @@ ecc-jsbn@~0.1.1:
 
 "eclipse-che-operator@https://github.com/eclipse-che/che-operator#main":
   version "0.0.0"
-  resolved "https://github.com/eclipse-che/che-operator#f71d2e8279fb12933a511178eebdac25abde05af"
+  resolved "https://github.com/eclipse-che/che-operator#8d6be15eb0563845fac5041a23643fab2dce29d0"
 
 editorconfig@^0.15.0:
   version "0.15.3"