From a41ffb81ee339752c699b368cdf36f98d07eacdc Mon Sep 17 00:00:00 2001
From: Chris LaRose <cjlarose@gmail.com>
Date: Mon, 23 Apr 2018 13:34:24 -0700
Subject: [PATCH 1/2] Add deployment instructions for Docker for Mac (Edge)

---
 deploy/README.md                            | 23 +++++++++++++++++++++
 deploy/provider/docker-for-mac/service.yaml | 19 +++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 deploy/provider/docker-for-mac/service.yaml

diff --git a/deploy/README.md b/deploy/README.md
index 4ec8d561e..01c97bdfd 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -6,6 +6,7 @@
 - [Install without RBAC roles](#install-without-rbac-roles)
 - [Install with RBAC roles](#install-with-rbac-roles)
 - [Custom Provider](#custom-provider)
+  - [Docker for Mac](#docker-for-mac)
   - [minikube](#minikube)
   - [AWS](#aws)
   - [GCE - GKE](#gce---gke)
@@ -62,6 +63,28 @@ curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/wi
 
 There are cloud provider specific yaml files.
 
+### Docker for Mac
+
+Kubernetes is available for Docker for Mac's Edge channel. Switch to the [Edge
+channel][edge] and [enable Kubernetes][enable].
+
+[edge]: https://docs.docker.com/docker-for-mac/install/
+[enable]: https://docs.docker.com/docker-for-mac/#kubernetes
+
+Patch the nginx ingress controller deployment to add the flag `--publish-service`
+
+```console
+kubectl patch deployment -n ingress-nginx nginx-ingress-controller --type='json' \
+    --patch="$(curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/publish-service-patch.yaml)"
+```
+
+Create a service
+
+```console
+curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/docker-for-mac/service.yaml \
+    | kubectl apply -f -
+```
+
 ### minikube
 
 For standard usage:
diff --git a/deploy/provider/docker-for-mac/service.yaml b/deploy/provider/docker-for-mac/service.yaml
new file mode 100644
index 000000000..8d2f71505
--- /dev/null
+++ b/deploy/provider/docker-for-mac/service.yaml
@@ -0,0 +1,19 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: ingress-nginx
+  namespace: ingress-nginx
+  labels:
+    app: ingress-nginx
+spec:
+  externalTrafficPolicy: Local
+  type: LoadBalancer
+  selector:
+    app: ingress-nginx
+  ports:
+  - name: http
+    port: 80
+    targetPort: http
+  - name: https
+    port: 443
+    targetPort: https

From 1ed256401f4d2a45b8b1bf668583fcfae8e4d375 Mon Sep 17 00:00:00 2001
From: Chris LaRose <cjlarose@gmail.com>
Date: Tue, 24 Apr 2018 15:23:52 -0700
Subject: [PATCH 2/2] Remove unnecessary externalTrafficPolicy on Docker for
 Mac service

---
 deploy/provider/docker-for-mac/service.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/provider/docker-for-mac/service.yaml b/deploy/provider/docker-for-mac/service.yaml
index 8d2f71505..4b4868aef 100644
--- a/deploy/provider/docker-for-mac/service.yaml
+++ b/deploy/provider/docker-for-mac/service.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     app: ingress-nginx
 spec:
-  externalTrafficPolicy: Local
   type: LoadBalancer
   selector:
     app: ingress-nginx