Skip to content

Commit 9cafb52

Browse files
committed
Update DO instructions for remote cluster
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
1 parent 83de7b2 commit 9cafb52

File tree

3 files changed

+35
-12
lines changed

3 files changed

+35
-12
lines changed

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,19 @@ If you're taking an instructor-led workshops then a link will be shared to join
3232

3333
## Pick your track
3434

35-
* Swarm track (this page)
35+
In Lab 1 you will pick your track and then throughout the labs look out for any special commands needed for the container orchestrator for your track.
3636

37-
The easiest and simplest way to learn about OpenFaaS is through Docker Swarm. The knowledge you build up and the functions you create are both transferrable and portable between Swarm and Kubernetes.
37+
### Docker Swarm (beginners)
3838

39-
* Kubernetes track (click link below)
39+
The easiest and simplest way to learn about OpenFaaS is by deploying Docker Swarm, this is because it is already built into the Docker distribution and has more limited extensibility.
4040

41-
You can also learn about OpenFaaS through Kubernetes. We have a preview available for learning OpenFaaS with Kubernetes. [Switch to the Kubernetes track](https://github.com/openfaas/workshop/tree/kubernetes-preview).
41+
The knowledge you build up and the functions you create are both transferrable and portable between Docker Swarm and Kubernetes.
42+
43+
### Kubernetes (intermediate)
44+
45+
You can also learn about Serverless on Kubernetes using OpenFaaS.
46+
47+
The recommendation from the OpenFaaS community is that you run Kubernetes in production, but all the knowledge you can is transferrable and functions do not have to be rebuilt.
4248

4349
## [Lab 1 - Prepare for OpenFaaS](./lab1.md)
4450

lab1.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ curl -sSL https://raw.githubusercontent.com/openfaas/faas/master/docker-compose.
4444
This should offset the impact on the workshop WiFi of multiple attendees trying to pull the images at the same time.
4545

4646
### Setup a single-node cluster
47-
If you're taking part in a workshop event then the organiser will probably ask you to use Docker Swarm because it's much easier to set up in a short period of time.
4847

49-
In order to set up OpenFaaS with Docker Swarm, go to [Lab 1a](./lab1a.md)
48+
If you're taking part in an instructor-lead event then the organiser may ask you to use Docker Swarm, because it's much quicker and easier to set up in a short period of time. For some workshops you will use Kubernetes, but if you are working independently then choice is entirely your own.
5049

51-
If you're going to use Kubernetes, follow [Lab 1b](./lab1b.md)
50+
* In order to set up OpenFaaS with Docker Swarm, go to [Lab 1a](./lab1a.md)
51+
52+
* If you're going to use Kubernetes, follow [Lab 1b](./lab1b.md)

lab1b.md

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ You can choose different options to run Kubernetes on your machine.
1212

1313
Before proceeding, [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
1414

15-
#### _With Minikube_
15+
#### Create a local cluster on your laptop
16+
17+
##### _Docker for Mac_
18+
19+
* [Install Docker for Mac](https://docs.docker.com/v17.12/docker-for-mac/install/)
20+
> Note that Kubernetes is only available in Docker for Mac 17.12 CE and higher
21+
22+
##### _With Minikube_
1623

1724
* To install Minikube download the proper installer from [latest release](https://github.com/kubernetes/minikube/releases) depending on your platform.
1825
* [Install Helm client](https://docs.helm.sh/using_helm/#installing-the-helm-client)
@@ -36,12 +43,21 @@ $ helm init
3643
The minikube VM is exposed to the host system via a host-only IP address. Check this IP with `minikube ip`.
3744
This is the IP you will later use for the gateway URL.
3845
39-
#### _Docker for Mac_
46+
#### Create a remote cluster on the cloud
4047
41-
* [Install Docker for Mac](https://docs.docker.com/v17.12/docker-for-mac/install/)
42-
> Note that Kubernetes is only available in Docker for Mac 17.12 CE and higher
48+
You can create a remote cluster in the cloud and enjoy the same experience as if you were developing locally whilst saving on RAM/CPU and battery. The costs for running a cluster for 1-2 days is minimal.
49+
50+
##### _Run on DigitalOcean's Kubernetes Service_
51+
52+
You can use free credits to create a cluster through DigitalOcean's UI.
53+
54+
The DigitalOcean dashboard will then guide you through how to configure your `kubectl` and `KUBECONFIG` file for use in the labs.
55+
56+
* [Claim your free credits - $100 in credit over 60 days](https://m.do.co/c/8d4e75e9886f)
57+
58+
> Note: Even if you have already claimed free credit, the running costs for a 2-3 node cluster for 24-48 hours is negligible.
4359
44-
#### _Run on GKE (Google Kubernetes Engine)_
60+
##### _Run on GKE (Google Kubernetes Engine)_
4561
4662
* Install [Google Cloud SDK](https://cloud.google.com/sdk/docs)
4763

0 commit comments

Comments
 (0)