fix(messages): Improve warn messages (#714)

* Improve warn messages Signed-off-by: Anatoliy Bazko <[email protected]>
che-incubator · May 19, 2020 · 5b59b4e · 5b59b4e
1 parent 7bd5404
commit 5b59b4e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/src/commands/server/start.ts b/src/commands/server/start.ts
@@ -27,7 +27,7 @@ import { InstallerTasks } from '../../tasks/installers/installer'
 import { ApiTasks } from '../../tasks/platforms/api'
 import { CommonPlatformTasks } from '../../tasks/platforms/common-platform-tasks'
 import { PlatformTasks } from '../../tasks/platforms/platform'
-import { isOpenshiftPlatformFamily } from '../../util'
+import { isOpenshiftPlatformFamily, isStableVersion } from '../../util'
 
 export default class Start extends Command {
   static description = 'start Eclipse Che server'
@@ -414,9 +414,8 @@ export default class Start extends Command {
    * and `operator` for other cases.
    */
   async setDefaultInstaller(flags: any): Promise<void> {
-    const cheVersion = DEFAULT_CHE_OPERATOR_IMAGE.split(':')[1]
     const kubeHelper = new KubeHelper(flags)
-    if (flags.platform === 'openshift' && await kubeHelper.isOpenShift4() && cheVersion !== 'nightly' && cheVersion !== 'latest') {
+    if (flags.platform === 'openshift' && await kubeHelper.isOpenShift4() && isStableVersion(flags)) {
       flags.installer = 'olm'
     } else {
       flags.installer = 'operator'

diff --git a/src/tasks/installers/helm.ts b/src/tasks/installers/helm.ts
@@ -21,7 +21,7 @@ import { KubeHelper } from '../../api/kube'
 import { VersionHelper } from '../../api/version'
 import { CHE_TLS_SECRET_NAME } from '../../constants'
 import { CertManagerTasks } from '../../tasks/component-installers/cert-manager'
-import { generatePassword } from '../../util'
+import { generatePassword, isStableVersion } from '../../util'
 
 export class HelmTasks {
   protected kubeHelper: KubeHelper
@@ -34,7 +34,9 @@ export class HelmTasks {
    * Returns list of tasks which perform preflight platform checks.
    */
   startTasks(flags: any, command: Command): Listr {
-    command.warn('You can also use features rich \'OLM\' installer to deploy Eclipse Che.')
+    if (isStableVersion(flags)) {
+      command.warn('Consider using the more reliable \'OLM\' installer when deploying a stable release of Eclipse Che (--installer=olm).')
+    }
     return new Listr([
       {
         title: 'Verify if helm is installed',

diff --git a/src/tasks/installers/olm.ts b/src/tasks/installers/olm.ts
@@ -30,7 +30,7 @@ export class OLMTasks {
   startTasks(flags: any, command: Command): Listr {
     const kube = new KubeHelper(flags)
     if (this.isNightlyChectlChannel() && !flags['catalog-source-yaml']) {
-      command.warn('OLM catalog hasn\'t got nightly channel, that\'s why will be deployed stable Eclipse Che.')
+      command.warn('A nightly channel for Eclipse Che is not available on OpenShift OLM catalog, the latest stable release will be deployed instead. To get a nightly release of Eclipse Che use the `operator` installer (--installer=operator).')
     }
     return new Listr([
       this.isOlmPreInstalledTask(command, kube),

diff --git a/src/tasks/installers/operator.ts b/src/tasks/installers/operator.ts
@@ -16,6 +16,7 @@ import * as Listr from 'listr'
 
 import { KubeHelper } from '../../api/kube'
 import { CHE_CLUSTER_CR_NAME } from '../../constants'
+import { isStableVersion } from '../../util'
 
 import { checkTlsCertificate, copyOperatorResources, createEclipseCheCluster, createNamespaceTask } from './common-tasks'
 
@@ -33,7 +34,9 @@ export class OperatorTasks {
    */
   startTasks(flags: any, command: Command): Listr {
     const kube = new KubeHelper(flags)
-    command.warn('You can also use features rich \'OLM\' installer to deploy Eclipse Che.')
+    if (isStableVersion(flags)) {
+      command.warn('Consider using the more reliable \'OLM\' installer when deploying a stable release of Eclipse Che (--installer=olm).')
+    }
     return new Listr([
       copyOperatorResources(flags, command.config.cacheDir),
       createNamespaceTask(flags),

diff --git a/src/util.ts b/src/util.ts
@@ -10,6 +10,8 @@
 
 import * as commandExists from 'command-exists'
 
+import { DEFAULT_CHE_OPERATOR_IMAGE } from './constants'
+
 export const KUBERNETES_CLI = 'kubectl'
 export const OPENSHIFT_CLI = 'oc'
 
@@ -64,3 +66,12 @@ export function generatePassword(passwodLength: number, charactersSet = '') {
 export function base64Decode(arg: string): string {
   return Buffer.from(arg, 'base64').toString('ascii')
 }
+
+/**
+ * Indicates if stable version of `chectl` is used.
+ */
+export function isStableVersion(flags: any): boolean {
+  const operatorImage = flags['che-operator-image'] || DEFAULT_CHE_OPERATOR_IMAGE
+  const cheVersion = operatorImage.split(':')[1]
+  return cheVersion !== 'nightly' && cheVersion !== 'latest'
+}
diff --git a/yarn.lock b/yarn.lock
@@ -1525,11 +1525,11 @@ ecc-jsbn@~0.1.1:
 
 "eclipse-che-operator@git://github.com/eclipse/che-operator#master":
   version "0.0.0"
-  resolved "git://github.com/eclipse/che-operator#8a4e1d5edfd26f74418c1fca03a590321418d429"
+  resolved "git://github.com/eclipse/che-operator#e7ed1e5fa647f173f39e49332610bb41836e6056"
 
 "eclipse-che@git://github.com/eclipse/che#master":
   version "0.0.0"
-  resolved "git://github.com/eclipse/che#998c413ab70d20d67b5f0a4462d25b97e6812d7f"
+  resolved "git://github.com/eclipse/che#fb063a970d0999915f18a8d4a19835a38a4a74b5"
 
 editorconfig@^0.15.0:
   version "0.15.3"