fix(operator): fix deploying on K8s with operator and TLS

Signed-off-by: Sergii Leshchenko <sleshche@redhat.com>
che-incubator · Aug 2, 2019 · eae1e1a · eae1e1a
1 parent 3985843
commit eae1e1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -196,8 +196,10 @@ OPTIONS
   -p, --platform=platform                      [default: minikube] Type of Kubernetes platform. Valid values are
                                                "minikube", "minishift", "k8s", "openshift", "microk8s".
 
-  -s, --tls                                    Enable TLS encryption. Note that `che-tls` with TLS certificate must be
+  -s, --tls                                    Enable TLS encryption. 
+                                               Note that for kubernetes `che-tls` with TLS certificate must be
                                                created in the configured namespace.
+                                               For OpenShift, router will use default cluster certificates.
 
   --self-signed-cert                           Authorize usage of self signed certificates for encryption.
 

diff --git a/src/api/kube.ts b/src/api/kube.ts
@@ -759,6 +759,9 @@ export class KubeHelper {
       yamlCr.spec.server.cheImageTag = imageAndTag.length === 2 ? imageAndTag[1] : 'latest'
       yamlCr.spec.auth.openShiftoAuth = flags['os-oauth']
       yamlCr.spec.server.tlsSupport = flags.tls
+      if (flags.tls) {
+        yamlCr.spec.k8s.tlsSecretName = `che-tls`
+      }
       yamlCr.spec.server.selfSignedCert = flags['self-signed-cert']
       yamlCr.spec.k8s.ingressDomain = flags.domain
       let pluginRegistryUrl = flags['plugin-registry-url']

diff --git a/src/commands/server/start.ts b/src/commands/server/start.ts
@@ -86,7 +86,9 @@ export default class Start extends Command {
     }),
     tls: flags.boolean({
       char: 's',
-      description: 'Enable TLS encryption. Note that `che-tls` with TLS certificate must be created in the configured namespace.',
+      description: `Enable TLS encryption.
+                    Note that for kubernetes 'che-tls' with TLS certificate must be created in the configured namespace. 
+                    For OpenShift, router will use default cluster certificates.`,
       default: false
     }),
     'self-signed-cert': flags.boolean({