From daacdbb81576e1318504e9d73a16536aba330784 Mon Sep 17 00:00:00 2001
From: Amit Watve <amwat@google.com>
Date: Tue, 10 Dec 2019 23:34:56 -0800
Subject: [PATCH] Minor fixes and add a basic example.

---
 site/content/docs/user/ingress-nginx.md |  56 ---------
 site/content/docs/user/ingress.md       | 144 ++++++++++++++++++++++++
 2 files changed, 144 insertions(+), 56 deletions(-)
 delete mode 100644 site/content/docs/user/ingress-nginx.md
 create mode 100644 site/content/docs/user/ingress.md

diff --git a/site/content/docs/user/ingress-nginx.md b/site/content/docs/user/ingress-nginx.md
deleted file mode 100644
index 00b00580a4..0000000000
--- a/site/content/docs/user/ingress-nginx.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Ingress Nginx
-
-Ingress Nginx in kind works by exposing ports `80(http)` and `443(https)`
-from the host to the nginx controller using hostPorts.
-
-## Create A Cluster with Ingress Nginx
-
-The following shell script will create a kind cluster deploy 
-the standard ingress-nginx components and apply the necessary patches.
-
-```bash 
-#!/bin/sh
-set -o errexit
-
-# Create cluster with hostPorts opened for http and https
-cat <<EOF | kind create cluster --config=-
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
-- role: control-plane
-  extraPortMappings:
-  - containerPort: 80
-    hostPort: 80
-  - containerPort: 443
-    hostPort: 443
-EOF
-
-# Apply the mandatory ingress-nginx components 
-# https://kubernetes.github.io/ingress-nginx/deploy/#prerequisite-generic-deployment-command
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/mandatory.yaml
-
-# Apply kind specific patches
-kubectl patch deployments -n ingress-nginx nginx-ingress-controller -p "$(cat<<EOF
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx-ingress-controller
-        ports:
-        - containerPort: 80
-        # Proxy the host port 80 for http
-          hostPort: 80
-        - containerPort: 443
-        # Proxy the host port 443 for https
-          hostPort: 443
-      nodeSelector:
-        # schedule it on the control-plane node
-        node-role.kubernetes.io/master: ''
-      tolerations:
-      # tolerate the the control-plane taints
-      - key: node-role.kubernetes.io/master
-        operator: Equal
-        effect: NoSchedule
-EOF
-)"
-```
\ No newline at end of file
diff --git a/site/content/docs/user/ingress.md b/site/content/docs/user/ingress.md
new file mode 100644
index 0000000000..445776b2b3
--- /dev/null
+++ b/site/content/docs/user/ingress.md
@@ -0,0 +1,144 @@
+---
+title: Ingress"
+menu:
+  main:
+    parent: "user"
+    identifier: "user-ingress"
+    weight: 3
+---
+# Ingress
+
+[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) in kind can be setup by exposing ports `80(http)` and `443(https)`
+from the host to the ingress controller using hostPorts.
+
+## Create A Cluster with Ingress NGINX
+
+The following shell script will create a kind cluster, deploy 
+the standard ingress-nginx components, and apply the necessary patches.
+
+```bash 
+#!/bin/sh
+set -o errexit
+
+# Create cluster with hostPorts opened for http and https
+cat <<EOF | kind create cluster --config=-
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+  extraPortMappings:
+  - containerPort: 80
+    hostPort: 80
+  - containerPort: 443
+    hostPort: 443
+EOF
+
+# Apply the mandatory ingress-nginx components 
+# https://kubernetes.github.io/ingress-nginx/deploy/#prerequisite-generic-deployment-command
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/mandatory.yaml
+
+# Apply kind specific patches
+kubectl patch deployments -n ingress-nginx nginx-ingress-controller -p "$(cat<<EOF
+spec:
+  template:
+    spec:
+      containers:
+      - name: nginx-ingress-controller
+        ports:
+        - containerPort: 80
+        # Proxy the host port 80 for http
+          hostPort: 80
+        - containerPort: 443
+        # Proxy the host port 443 for https
+          hostPort: 443
+      nodeSelector:
+        # schedule it on the control-plane node
+        node-role.kubernetes.io/master: ''
+      tolerations:
+      # tolerate the the control-plane taints
+      - key: node-role.kubernetes.io/master
+        operator: Equal
+        effect: NoSchedule
+EOF
+)"
+```
+
+## Using the Ingress
+
+The following example creates simple http-echo services 
+and an Ingress object to route to these services.
+
+```bash
+cat <<EOF | kubectl apply -f -
+kind: Pod
+apiVersion: v1
+metadata:
+  name: foo-app
+  labels:
+    app: foo
+spec:
+  containers:
+    - name: foo-app
+      image: hashicorp/http-echo
+      args:
+        - "-text=foo"
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: foo-service
+spec:
+  selector:
+    app: foo
+  ports:
+    - port: 5678 # Default port used by the image
+---
+kind: Pod
+apiVersion: v1
+metadata:
+  name: bar-app
+  labels:
+    app: bar
+spec:
+  containers:
+    - name: bar-app
+      image: hashicorp/http-echo
+      args:
+        - "-text=bar"
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: bar-service
+spec:
+  selector:
+    app: bar
+  ports:
+    - port: 5678 # Default port used by the image
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: example-ingress
+  annotations:
+    ingress.kubernetes.io/rewrite-target: /
+spec:
+  rules:
+  - http:
+      paths:
+        - path: /foo
+          backend:
+            serviceName: foo-service
+            servicePort: 5678
+        - path: /bar
+          backend:
+            serviceName: bar-service
+            servicePort: 5678
+---
+EOF
+```
+Now verify that the ingress works
+```bash
+curl localhost/foo
+curl localhost/bar
+```