Merge 2.3 into 2.4

Author: soyuka

deployment/kubernetes.md

@@ -18,58 +18,72 @@ package manager) chart to deploy in a wink on any of these platforms.
 
 1. Build the PHP and Nginx Docker images:
 
-        docker build -t gcr.io/test-api-platform/php -t gcr.io/test-api-platform/php:latest api --target api_platform_php
-        docker build -t gcr.io/test-api-platform/nginx -t gcr.io/test-api-platform/nginx:latest api --target api_platform_nginx
-        docker build -t gcr.io/test-api-platform/varnish -t gcr.io/test-api-platform/varnish:latest api --target api_platform_varnish
+```
+docker build -t gcr.io/test-api-platform/php -t gcr.io/test-api-platform/php:latest api --target api_platform_php
+docker build -t gcr.io/test-api-platform/nginx -t gcr.io/test-api-platform/nginx:latest api --target api_platform_nginx
+docker build -t gcr.io/test-api-platform/varnish -t gcr.io/test-api-platform/varnish:latest api --target api_platform_varnish
+```
 
 2. Push your images to your Docker registry, example with [Google Container Registry](https://cloud.google.com/container-registry/):
 
-    Docker client versions <= 18.03:
-    
-        gcloud docker -- push gcr.io/test-api-platform/php
-        gcloud docker -- push gcr.io/test-api-platform/nginx
-        gcloud docker -- push gcr.io/test-api-platform/varnish
-        
-    Docker client versions > 18.03:
-    
-        gcloud auth configure-docker
-        docker push gcr.io/test-api-platform/php
-        docker push gcr.io/test-api-platform/nginx
-        docker push gcr.io/test-api-platform/varnish
+Docker client versions <= 18.03:
+
+```
+gcloud docker -- push gcr.io/test-api-platform/php
+gcloud docker -- push gcr.io/test-api-platform/nginx
+gcloud docker -- push gcr.io/test-api-platform/varnish
+```
+
+Docker client versions > 18.03:
+
+```
+gcloud auth configure-docker
+docker push gcr.io/test-api-platform/php
+docker push gcr.io/test-api-platform/nginx
+docker push gcr.io/test-api-platform/varnish
+```
 
 ## Deploying
 
 Firstly you need to update helm dependencies by running:
 
+```
     helm dependency update ./api/helm/api
+```
 
 You are now ready to deploy the API!
 
 Deploy your API to the container:
 
+```
     helm install ./api/helm/api --namespace=baz --name baz \
         --set php.repository=gcr.io/test-api-platform/php \
         --set nginx.repository=gcr.io/test-api-platform/nginx \
         --set secret=MyAppSecretKey \
         --set postgresql.postgresPassword=MyPgPassword \
         --set postgresql.persistence.enabled=true \
         --set corsAllowOrigin='^https?://[a-z\]*\.mywebsite.com$'
+```
 
 If you prefer to use a managed DBMS like [Heroku Postgres](https://www.heroku.com/postgres) or
 [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/) (recommended):
 
+```
     helm install --name api ./api/helm/api \
         # ...
         --set postgresql.enabled=false \
         --set postgresql.url=pgsql://username:password@host/database?serverVersion=9.6
+```
 
 If you want to use a managed Varnish such as [Fastly](https://www.fastly.com) for the invalidation cache mechanism
 provided by API Platform:
 
+```
     helm install --name api ./api/helm/api \
         # ...
         --set varnish.enabled=false \
         --set varnish.url=https://myvarnish.com
+```
 
 Finally, build the `client` and `admin` JavaScript apps and [deploy them on a static
 website hosting service](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#deployment).
@@ -78,21 +92,25 @@ website hosting service](https://github.com/facebookincubator/create-react-app/b
 
 Before running your application for the first time, be sure to create the database schema:
 
+```
     PHP_POD=$(kubectl --namespace=bar get pods -l app=php -o jsonpath="{.items[0].metadata.name}")
     kubectl --namespace=bar exec -it $PHP_POD -- bin/console doctrine:schema:create
+```
 
 ## Tiller RBAC Issue
 
 We noticed that some tiller RBAC trouble occurred. You can usually resolve it by running:
 
-    kubectl create serviceaccount --namespace kube-system tiller
-      serviceaccount "tiller" created
+```
+kubectl create serviceaccount --namespace kube-system tiller
+  serviceaccount "tiller" created
 
-    kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
-      clusterrolebinding "tiller-cluster-rule" created
+kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
+  clusterrolebinding "tiller-cluster-rule" created
 
-    kubectl patch deploy --namespace kube-system tiller-deploy -p '{"spec":{"template":{"spec":{"serviceAccount":"tiller"}}}}'
-      deployment "tiller-deploy" patched
+kubectl patch deploy --namespace kube-system tiller-deploy -p '{"spec":{"template":{"spec":{"serviceAccount":"tiller"}}}}'
+  deployment "tiller-deploy" patched
+```
 
 Please, see the [related issue](https://github.com/kubernetes/helm/issues/3130) for further details / information.
 You can also take a look at the [related documentation](https://github.com/kubernetes/helm/blob/master/docs/rbac.md)