Merge pull request #119 from jfilipcz/README-update-to-cover-gitlab-c…

…onfig Gitlab Readme and default password update
rht-labs · May 19, 2022 · ccdbd1d · ccdbd1d
2 parents 389a979 + 3a3a964
commit ccdbd1d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/tooling/README.md b/tooling/README.md
@@ -18,7 +18,26 @@ This chart is capable of deploying the following:
 
 This content is also made available as [Helm Releases](http://rht-labs.com/enablement-framework/) if you prefer to use that method. Otherwise, continue below.
 
-## Installation
+## Installation - "production"
+*NOTE*: tl500-base chart deploys Gitlab, and assumes user already has an LDAP integrated with target cluster as Oauth. If that's not the case, user will need to supply LDAP integration parameters (see values.yaml file for details)
+*NOTE#2* tl500-course-content is dependant on tl500-base, make sure to use the same version for both charts
+
+1. Install TL500 Base
+```bash
+helm repo add enablement-framework https://rht-labs.com/enablement-framework 
+helm repo update
+helm install tl500-base enablement-framework/tl500-base --version XYZ
+```
+
+2. Install TL500 Course Content
+```bash
+helm repo add enablement-framework https://rht-labs.com/enablement-framework 
+helm repo update
+helm install tl500-course-content enablement-framework/tl500-course-content --version XYZ
+```
+
+## Installation - development
+*NOTE*: tl500-base chart deploys Gitlab, and assumes user already has an LDAP integrated with target cluster as Oauth. If that's not the case, user will need to supply LDAP integration parameters (see values.yaml file for details)
 
 1. Install TL500 Base
 ```bash

diff --git a/tooling/charts/tl500-base/templates/gitlab/deployments.yaml b/tooling/charts/tl500-base/templates/gitlab/deployments.yaml
@@ -61,7 +61,7 @@ spec:
         env:
         - name: GITLAB_OMNIBUS_CONFIG
           value:
-            root_pass='{{ $.Values.gitlab.root_password | default "Password123" }}';
+            root_pass='{{ $.Values.gitlab.root_password | default "kJ4e9qLkm4pOhQnbn7nE" }}';
             external_url "https://{{ $.Values.gitlab_app_name }}.{{ include "tl500.app_domain" . }}";
             nginx['listen_port']=80;
             nginx['listen_https']=false;

diff --git a/tooling/charts/tl500-base/values.yaml b/tooling/charts/tl500-base/values.yaml
@@ -78,7 +78,7 @@ logging:
 
 gitlab:
   namespace: tl500-gitlab
-  root_password: Password123
+  root_password: 7aydhn160bOrrsGEbnd172rE
   imagestreams:
     - name: "gitlab-ce"
       tag_name: "gitlab-12.8.7"
@@ -127,4 +127,4 @@ gitops-operator:
   ignoreHelmHooks: false
 
 tl500-teamsters:
-  enabled: true
+  enabled: true