fix: fix dex configuration, set identity provider in checluster (#1864)

* fix: fix dex configuration, set identity provider in checluster Signed-off-by: Michal Vala <[email protected]> * don't show warning message when native user mode enabled Signed-off-by: Michal Vala <[email protected]>
che-incubator · Nov 30, 2021 · 9db7957 · 9db7957
1 parent e4abc4e
commit 9db7957
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/resources/dex/configmap.yaml b/resources/dex/configmap.yaml
@@ -21,7 +21,7 @@ data:
     staticClients:
     - id: {{CLIENT_ID}}
       redirectURIs:
-      - 'https://che-{{NAMESPACE}}.{{DOMAIN}}/oauth/callback'
+      - 'https://{{DOMAIN}}/oauth/callback'
       name: 'Eclipse Che'
       secret: {{CLIENT_SECRET}}
     enablePasswordDB: true

diff --git a/src/commands/server/deploy.ts b/src/commands/server/deploy.ts
@@ -339,7 +339,7 @@ export default class Deploy extends Command {
     await this.setPlaformDefaults(flags, ctx)
     await this.config.runHook(DEFAULT_ANALYTIC_HOOK_NAME, { command: Deploy.id, flags })
 
-    if (!flags.batch && isKubernetesPlatformFamily(flags.platform) && (isDevWorkspaceEnabled(ctx) || flags['workspace-engine'] === 'dev-workspace')) {
+    if (!flags.batch && isKubernetesPlatformFamily(flags.platform) && (isDevWorkspaceEnabled(ctx) || flags['workspace-engine'] === 'dev-workspace') && !isNativeUserModeEnabled(ctx)) {
       if (!await cli.confirm('DevWorkspace is experimental feature. It requires direct access to the underlying infrastructure REST API.\nThis results in huge privilege escalation. Do you want to proceed? [y/n]')) {
         cli.exit(0)
       }

diff --git a/src/tasks/component-installers/dex.ts b/src/tasks/component-installers/dex.ts
@@ -207,6 +207,10 @@ export class DexTasks {
                   await this.kube.createServiceFromFile(yamlFilePath, DexTasks.NAMESPACE_NAME)
                   task.title = `${task.title}...[OK]`
                 }
+
+                // set service in a CR
+                ctx[ChectlContext.CR_PATCH] = ctx[ChectlContext.CR_PATCH] || {}
+                merge(ctx[ChectlContext.CR_PATCH], { spec: { auth: { identityProviderURL: 'http://dex.dex:5556' } } })
               },
             },
             {
@@ -271,7 +275,6 @@ export class DexTasks {
                   const yamlFilePath = this.getDexResourceFilePath('configmap.yaml')
                   let yamlContent = fs.readFileSync(yamlFilePath).toString()
                   yamlContent = yamlContent.replace(new RegExp(TemplatePlaceholders.DOMAIN, 'g'), this.flags.domain)
-                  yamlContent = yamlContent.replace(new RegExp(TemplatePlaceholders.CHE_NAMESPACE, 'g'), this.flags.chenamespace)
                   yamlContent = yamlContent.replace(new RegExp(TemplatePlaceholders.CLIENT_ID, 'g'), DexTasks.CLIENT_ID)
                   // generate client secret
                   const clientSecret = crypto.randomBytes(32).toString('base64')