From 3ca59720cdd59d0cbfe5fc0d5c477b85844603a7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2019 11:54:46 -0400
Subject: [PATCH] Fix install CRD steps on various pages (#4680) (#4690)

* Fix install CRD steps on various pages

* Fix ordering to create namespace first

(cherry picked from commit d71d90bed831cc7bbab550f649a72892ba14e57c)
---
 content/docs/examples/multicluster/gke/index.md        |  2 +-
 .../kubernetes/install/multicluster/gateways/index.md  | 10 ++++++----
 content/docs/tasks/security/vault-ca/index.md          |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/content/docs/examples/multicluster/gke/index.md b/content/docs/examples/multicluster/gke/index.md
index f93c9c2484..30f1fde487 100644
--- a/content/docs/examples/multicluster/gke/index.md
+++ b/content/docs/examples/multicluster/gke/index.md
@@ -112,9 +112,9 @@ the `default` namespace:
 
 {{< text bash >}}
 $ kubectl config use-context "gke_${proj}_${zone}_cluster-1"
-$ kubectl apply -f install/kubernetes/helm/istio-init/files/crd/
 $ helm template install/kubernetes/helm/istio --name istio --namespace istio-system > $HOME/istio_master.yaml
 $ kubectl create ns istio-system
+$ helm template install/kubernetes/helm/istio-init --name istio-init --namespace istio-system | kubectl apply -f -
 $ kubectl apply -f $HOME/istio_master.yaml
 $ kubectl label namespace default istio-injection=enabled
 {{< /text >}}
diff --git a/content/docs/setup/kubernetes/install/multicluster/gateways/index.md b/content/docs/setup/kubernetes/install/multicluster/gateways/index.md
index c192416b66..07cd4fd102 100644
--- a/content/docs/setup/kubernetes/install/multicluster/gateways/index.md
+++ b/content/docs/setup/kubernetes/install/multicluster/gateways/index.md
@@ -94,11 +94,13 @@ on **each** Kubernetes cluster.
             --from-file=@samples/certs/cert-chain.pem@
         {{< /text >}}
 
-    * Install Istio's CRDs:
+    * Install all the Istio
+    [Custom Resource Definitions](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/#customresourcedefinitions)
+    (CRDs) using `kubectl apply`, and wait a few seconds for the CRDs to be committed in the Kubernetes API-server:
 
-        {{< text bash >}}
-        $ kubectl apply -f install/kubernetes/helm/istio-init/files/crd/
-        {{< /text >}}
+    {{< text bash >}}
+    $ helm template install/kubernetes/helm/istio-init --name istio-init --namespace istio-system | kubectl apply -f -
+    {{< /text >}}
 
     * {{< boilerplate verify-crds >}}
 
diff --git a/content/docs/tasks/security/vault-ca/index.md b/content/docs/tasks/security/vault-ca/index.md
index 8623925a08..b9f1e8ce50 100644
--- a/content/docs/tasks/security/vault-ca/index.md
+++ b/content/docs/tasks/security/vault-ca/index.md
@@ -28,7 +28,7 @@ to Node Agent, which returns the signed certificate to the Istio proxy.
     {{< text bash >}}
     $ kubectl create clusterrolebinding cluster-admin-binding --clusterrole=cluster-admin --user="$(gcloud config get-value core/account)"
     $ kubectl create namespace istio-system
-    $ kubectl apply -f install/kubernetes/helm/istio-init/files/crd/
+    $ helm template install/kubernetes/helm/istio-init --name istio-init --namespace istio-system | kubectl apply -f -
     $ helm template \
         --name=istio \
         --namespace=istio-system \