remove devfile and plugin registries defaults

Signed-off-by: Michal Vala <mvala@redhat.com>
che-incubator · Jul 19, 2019 · 2bdb455 · 2bdb455
1 parent 2942905
commit 2bdb455
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/commands/server/start.ts b/src/commands/server/start.ts
@@ -53,13 +53,11 @@ export default class Start extends Command {
       env: 'CHE_TEMPLATES_FOLDER'
     }),
     'devfile-registry-url': string({
-      description: 'The URL of the Devfile registry.',
-      default: 'https://che-devfile-registry.openshift.io/',
+      description: 'The URL of the external Devfile registry.',
       env: 'CHE_WORKSPACE_DEVFILE__REGISTRY__URL'
     }),
     'plugin-registry-url': string({
-      description: 'The URL of the plugin registry.',
-      default: 'https://che-plugin-registry.openshift.io/v3',
+      description: 'The URL of the external plugin registry.',
       env: 'CHE_WORKSPACE_PLUGIN__REGISTRY__URL'
     }),
     cheboottimeout: string({

diff --git a/src/installers/helm.ts b/src/installers/helm.ts
@@ -195,18 +195,26 @@ error: E_COMMAND_FAILED`)
 
     let multiUserFlag = ''
     let tlsFlag = ''
-    let setOptions = ''
+    let setOptions = []
 
     if (flags.multiuser) {
       multiUserFlag = `-f ${destDir}values/multi-user.yaml`
     }
 
     if (flags.tls) {
-      setOptions = `--set global.cheDomain=${flags.domain} --set global.tls.email='${ctx.tlsEmail}'`
+      setOptions.push(`--set global.cheDomain=${flags.domain} --set global.tls.email='${ctx.tlsEmail}'`)
       tlsFlag = `-f ${destDir}values/tls.yaml`
     }
 
-    let command = `helm upgrade --install che --force --namespace ${flags.chenamespace} --set global.ingressDomain=${flags.domain} ${setOptions} --set cheImage=${flags.cheimage} --set global.cheWorkspacesNamespace=${flags.chenamespace} --set che.workspace.devfileRegistryUrl=${flags['devfile-registry-url']} --set che.workspace.pluginRegistryUrl=${flags['plugin-registry-url']} ${multiUserFlag} ${tlsFlag} ${destDir}`
+    if (flags['plugin-registry-url']) {
+      setOptions.push(`--set che.workspace.pluginRegistryUrl=${flags['plugin-registry-url']} --set chePluginRegistry.deploy=false`)
+    }
+
+    if (flags['devfile-registry-url']) {
+      setOptions.push(`--set che.workspace.devfileRegistryUrl=${flags['devfile-registry-url']} --set cheDevfileRegistry.deploy=false`)
+    }
+
+    let command = `helm upgrade --install che --force --namespace ${flags.chenamespace} --set global.ingressDomain=${flags.domain} ${setOptions.join(' ')} --set cheImage=${flags.cheimage} --set global.cheWorkspacesNamespace=${flags.chenamespace} ${multiUserFlag} ${tlsFlag} ${destDir}`
 
     let {code, stderr} = await execa.shell(command, { timeout: execTimeout, reject: false })
     // if process failed, check the following