From 865df759d1ea9e5c7133fb9ce87c49cf79228b05 Mon Sep 17 00:00:00 2001
From: Tony Li <tony.li@nytimes.com>
Date: Wed, 13 Sep 2017 21:14:05 -0400
Subject: [PATCH] consolidate gce ingress disabling methods

---
 docs/faq/gce.md                   | 33 +++++++++++++++++++++++++------
 examples/deployment/gce/README.md | 25 +----------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/docs/faq/gce.md b/docs/faq/gce.md
index 7230d2555..5ee2902e2 100644
--- a/docs/faq/gce.md
+++ b/docs/faq/gce.md
@@ -281,16 +281,37 @@ We plan to fix this [soon](https://github.com/kubernetes/kubernetes/issues/16337
 
 ## How do I disable the GCE Ingress controller?
 
-3 options:
+As of Kubernetes 1.3, GLBC runs as a static pod on the master.
+If you want to disable it, you have 3 options:
+
+### Soft disable
+
 1. Have it no-op based on the `ingress.class` annotation as shown [here](README.md#how-do-i-disable-an-ingress-controller)
+
+### Hard disable
+
 2. SSH into the GCE master node and delete the GLBC manifest file found at `/etc/kubernetes/manifests/glbc.manifest`
-3. Create the GKE cluster without it:
+3. Disable the addon in GKE:
+
+#### Disabling GCE ingress on cluster creation
+
+Disable the addon in GKE at cluster bring-up time through the `disable-addons` flag:
 
 ```console
-$ gcloud container clusters create mycluster --network "default" --num-nodes 1 \
---machine-type n1-standard-2 --zone $ZONE \
---disable-addons HttpLoadBalancing \
---disk-size 50 --scopes storage-full
+gcloud container clusters create mycluster --network "default" --num-nodes 1 \
+--machine-type n1-standard-2 \
+--zone $ZONE \
+--disk-size 50 \
+--scopes storage-full \
+--disable-addons HttpLoadBalancing
+```
+
+#### Disabling GCE ingress in an existing cluster
+
+Disable the addon in GKE for an existing cluster through the `update-addons` flag:
+
+```console
+gcloud container clusters update mycluster --update-addons HttpLoadBalancing=DISABLED
 ```
 
 ## What GCE resources are shared between Ingresses?
diff --git a/examples/deployment/gce/README.md b/examples/deployment/gce/README.md
index 3adb478dd..68eea05e9 100644
--- a/examples/deployment/gce/README.md
+++ b/examples/deployment/gce/README.md
@@ -10,30 +10,7 @@ controller.__
 
 ## Disabling the master controller
 
-As of Kubernetes 1.3, GLBC runs as a static pod on the master. If you want to
-totally disable it, you can ssh into the master node and delete the GLBC
-manifest file found at `/etc/kubernetes/manifests/glbc.manifest`.
-
-### Disabling GCE ingress on cluster creation
-
-Disable it on GKE at cluster bring-up time through the `disable-addons` flag:
-
-```console
-gcloud container clusters create mycluster --network "default" --num-nodes 1 \
---machine-type n1-standard-2 \
---zone $ZONE \
---disk-size 50 \
---scopes storage-full \
---disable-addons HttpLoadBalancing
-```
-
-### Disabling GCE ingress by existing cluster
-
-Disable it on GKE for an existing cluster through the `update-addons` flag:
-
-```console
-gcloud container clusters update mycluster --update-addons HttpLoadBalancing=DISABLED 
-```
+See the hard disable options [here](/docs/faq/gce.md#how-do-i-disable-the-gce-ingress-controller).
 
 ## Deploying a new controller