fix(minishift-addon): do not wait for local registries

fix eclipse-che/che#14136 Chectl was waiting for ever the pod Change-Id: I4a1b61104842e9433350fe08444a7fe5165e68de Signed-off-by: Florent Benoit <[email protected]>
che-incubator · Aug 9, 2019 · 3bed253 · 3bed253
1 parent 992a742
commit 3bed253
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/commands/server/start.ts b/src/commands/server/start.ts
@@ -286,14 +286,14 @@ export default class Start extends Command {
       })
     }
 
-    if (!flags['devfile-registry-url']) {
+    if (!flags['devfile-registry-url'] && flags.installer !== 'minishift-addon') {
       cheBootstrapSubTasks.add({
         title: 'Devfile registry pod bootstrap',
         task: () => this.podStartTasks(this.getDevfileRegistrySelector(), flags.chenamespace)
       })
     }
 
-    if (!flags['plugin-registry-url']) {
+    if (!flags['plugin-registry-url'] && flags.installer !== 'minishift-addon') {
       cheBootstrapSubTasks.add({
         title: 'Plugin registry pod bootstrap',
         task: () => this.podStartTasks(this.getPluginRegistrySelector(), flags.chenamespace)

diff --git a/src/installers/minishift-addon.ts b/src/installers/minishift-addon.ts
@@ -123,8 +123,12 @@ export class MinishiftAddonHelper {
     args = args.concat(['--addon-env', `NAMESPACE=${flags.chenamespace}`])
     args = args.concat(['--addon-env', `CHE_IMAGE_REPO=${imageRepo}`])
     args = args.concat(['--addon-env', `CHE_IMAGE_TAG=${imageTag}`])
-    args = args.concat(['--addon-env', `CHE_WORKSPACE_DEVFILE__REGISTRY__URL=${flags['devfile-registry-url']}`])
-    args = args.concat(['--addon-env', `CHE_WORKSPACE_PLUGIN__REGISTRY__URL=${flags['plugin-registry-url']}`])
+    if (flags['devfile-registry-url']) {
+      args = args.concat(['--addon-env', `CHE_WORKSPACE_DEVFILE__REGISTRY__URL=${flags['devfile-registry-url']}`])
+    }
+    if (flags['plugin-registry-url']) {
+      args = args.concat(['--addon-env', `CHE_WORKSPACE_PLUGIN__REGISTRY__URL=${flags['plugin-registry-url']}`])
+    }
     args = args.concat(['che'])
     const { cmd,
             code,