fix: ensure correct working directory and increase retry timeout (#1882)

(cherry picked from commit 4ab74e0)

Author: j-zimnowoda

src/cmd/apply.ts

@@ -12,7 +12,7 @@ import { getCurrentVersion, getImageTag, writeValuesToFile } from 'src/common/va
 import { HelmArguments, getParsedArgs, helmOptions, setParsedArgs } from 'src/common/yargs'
 import { ProcessOutputTrimmed } from 'src/common/zx-enhance'
 import { Argv, CommandModule } from 'yargs'
-import { $, nothrow } from 'zx'
+import { $, cd } from 'zx'
 import { applyAsApps } from './apply-as-apps'
 import {
   cloneOtomiChartsInGitea,
@@ -146,12 +146,11 @@ const apply = async (): Promise<void> => {
   if (!argv.label && !argv.file) {
     await retry(async (bail) => {
       try {
+        cd(rootDir)
         await applyAll()
       } catch (e) {
         d.error(e)
-        await nothrow($`helm uninstall wait-for-otomi-realm -n maintenance`)
-        await nothrow($`kubectl delete job wait-for-otomi-realm -n maintenance`)
-        d.info(`Retrying in ${retryOptions.maxRetryTime} ms`)
+        d.info(`Retrying in ${retryOptions.maxTimeout} ms`)
         throw e
       }
     }, retryOptions)

src/common/k8s.ts

@@ -1,5 +1,6 @@
 /* eslint-disable no-loop-func */
 /* eslint-disable no-await-in-loop */
+import { CoreV1Api, V1Secret } from '@kubernetes/client-node'
 import retry, { Options } from 'async-retry'
 import { AnyAaaaRecord, AnyARecord } from 'dns'
 import { resolveAny } from 'dns/promises'
@@ -16,7 +17,6 @@ import { env } from './envalid'
 import { hfValues } from './hf'
 import { parser } from './yargs'
 import { askYesNo } from './zx-enhance'
-import { CoreV1Api, V1Secret } from '@kubernetes/client-node'
 
 export const secretId = `secret/otomi/${DEPLOYMENT_PASSWORDS_SECRET}`
 
@@ -212,7 +212,7 @@ type WaitTillAvailableOptions = Options & {
 
 export const waitTillGitRepoAvailable = async (repoUrl): Promise<void> => {
   const retryOptions: Options = {
-    retries: 10,
+    retries: 20,
     maxTimeout: 30000,
   }
   const d = terminal('common:k8s:waitTillGitRepoAvailable')
@@ -222,7 +222,7 @@ export const waitTillGitRepoAvailable = async (repoUrl): Promise<void> => {
       // the ls-remote exist with zero even if repo is empty
       await $`git ls-remote ${repoUrl}`
     } catch (e) {
-      d.warn(e.message)
+      d.warn(`The ${repoUrl} is not yet reachable. Retrying in ${retryOptions.maxTimeout} ms`)
       throw e
     }
   }, retryOptions)