Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 21 deletions

diff --git a/doc/development/database_debugging.md b/doc/development/database_debugging.md
index e577ba6ec8f..46cb869fea3 100644
--- a/doc/development/database_debugging.md
+++ b/doc/development/database_debugging.md
@@ -41,8 +41,8 @@ Access the database via one of these commands (they all get you to the same plac
 
 ```ruby
 gdk psql -d gitlabhq_development
-bundle exec rails dbconsole RAILS_ENV=development
-bundle exec rails db RAILS_ENV=development
+bundle exec rails dbconsole -e development
+bundle exec rails db -e development
 ```
 
 - `\q`: Quit/exit
diff --git a/doc/development/import_project.md b/doc/development/import_project.md
index 0701279ddea..78efc6ce2ab 100644
--- a/doc/development/import_project.md
+++ b/doc/development/import_project.md
@@ -78,7 +78,7 @@ The last option is to import a project using a Rails console:
    gitlab-rails console
 
    # For installations from source
-   sudo -u git -H bundle exec rails console RAILS_ENV=production
+   sudo -u git -H bundle exec rails console -e production
    ```
 
 1. Create a project and run `Project::TreeRestorer`:
diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md
index efa58cbeae3..9eb5d5add8a 100644
--- a/doc/development/testing_guide/review_apps.md
+++ b/doc/development/testing_guide/review_apps.md
@@ -136,28 +136,18 @@ browser performance testing using a
 
 ### Node pools
 
-Both `review-apps-ce` and `review-apps-ee` clusters are currently set up with
-two node pools:
+The `review-apps-ee` and `review-apps-ce` clusters are currently set up with
+the following node pools:
 
-- a node pool of non-preemptible `n1-standard-2` (2 vCPU, 7.5 GB memory) nodes
-  dedicated to the `tiller` deployment (see below) with a single node.
-- a node pool of preemptible `n1-standard-2` (2 vCPU, 7.5 GB memory) nodes,
-  with a minimum of 1 node and a maximum of 250 nodes.
+- `review-apps-ee` of preemptible `e2-highcpu-16` (16 vCPU, 16 GB memory) nodes with autoscaling
+- `review-apps-ce` of preemptible `n1-standard-8` (8 vCPU, 16 GB memory) nodes with autoscaling
 
-### Helm/Tiller
+### Helm
 
-The Helm/Tiller version used is defined in the
-[`registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base` image](https://gitlab.com/gitlab-org/gitlab-build-images/blob/master/Dockerfile.gitlab-charts-build-base#L4)
+The Helm version used is defined in the
+[`registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3-kubectl1.14` image](https://gitlab.com/gitlab-org/gitlab-build-images/-/blob/master/Dockerfile.gitlab-helm3-kubectl1.14#L7)
 used by the `review-deploy` and `review-stop` jobs.
 
-The `tiller` deployment (the Helm server) is deployed to a dedicated node pool
-that has the `app=helm` label and a specific
-[taint](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)
-to prevent other pods from being scheduled on this node pool.
-
-This is to ensure Tiller isn't affected by "noisy" neighbors that could put
-their node under pressure.
-
 ## How to
 
 ### Get access to the GCP Review Apps cluster
@@ -241,7 +231,7 @@ due to Helm or Kubernetes trying to recreate the components.
 
 **Where to look for further debugging:**
 
-Look at a recent `review-deploy` job log, and at the Tiller logs.
+Look at a recent `review-deploy` job log.
 
 **Useful commands:**