Remove swarm references

Closes: #185

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

README.md

@@ -14,7 +14,7 @@ Finally the labs cover more advanced topics and give suggestions for further lea
 
 ## Requirements:
 
-We walk through how to install these requirements in [Lab 1](./lab1.md). Please do [Lab 1](./lab1.md) before you attend an instructor-led workshop.  At the very least you should [install Docker](./lab1.md#docker) and [pre-pull the OpenFaaS images](./lab1.md#Pre-pull-the-system-images).
+We walk through how to install these requirements in [Lab 1](./lab1.md). Please do [Lab 1](./lab1.md) before you attend an instructor-led workshop.
 
 * Functions will be written in Python, so prior programming or scripting experience is preferred 
 * Install the recommended code-editor / IDE [VSCode](https://code.visualstudio.com/download)
@@ -36,13 +36,7 @@ If you're taking an instructor-led workshops then a link will be shared to join
 
 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.
 
-### Docker Swarm (beginners)
-
-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.
-
-The knowledge you build up and the functions you create are both transferrable and portable between Docker Swarm and Kubernetes.
-
-### Kubernetes (intermediate)
+### Kubernetes
 
 You can also learn about Serverless on Kubernetes using OpenFaaS.
 
@@ -51,7 +45,7 @@ The recommendation from the OpenFaaS community is that you run Kubernetes in pro
 ## [Lab 1 - Prepare for OpenFaaS](./lab1.md)
 
 * Install pre-requisites
-* Set up a single-node cluster with Docker Swarm or Kubernetes
+* Set up a single-node cluster with Kubernetes
 * Docker Hub account
 * OpenFaaS CLI
 * Deploy OpenFaaS
@@ -125,7 +119,7 @@ The recommendation from the OpenFaaS community is that you run Kubernetes in pro
 ## [Lab 10 - Advanced Feature - Secrets](./lab10.md)
 
 * Adapt issue-bot to use a secret
-  * Create a Swarm secret
+  * Create a Kubernetes secret with faas-cli
   * Access the secret within the function
 
 ## [Lab 11 - Advanced feature - Trust with HMAC](./lab11.md)

lab1.md

@@ -2,13 +2,13 @@
 
 <img src="https://github.com/openfaas/media/raw/master/OpenFaaS_Magnet_3_1_png.png" width="500px"></img>
 
-OpenFaaS requires a [Kubernetes](https://kubernetes.io) or [Docker Swarm](https://docs.docker.com/engine/swarm/) cluster to operate. You can use a single-node cluster or a multi-node cluster, whether that's on your laptop or in the cloud.
+OpenFaaS requires a [Kubernetes](https://kubernetes.io) cluster to operate. You can use a single-node cluster or a multi-node cluster, whether that's on your laptop or in the cloud.
 
 The basic primitive for any OpenFaaS function is a Docker image, which is built using the `faas-cli` tool-chain.
 
 ## Pre-requisites:
 
-Let's install Docker, the OpenFaaS CLI and pick Kubernetes or Swarm to proceed.
+Let's install Docker, the OpenFaaS CLI and setup Kubernetes.
 
 ### Docker
 
@@ -92,23 +92,6 @@ export OPENFAAS_PREFIX="" # Populate with your Docker Hub username
 
 ### Setup a single-node cluster
 
-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 be using Kubernetes.
-
-If you are working independently then choice is entirely your own.
-
-Start the first lab by picking one of the tracks below:
-
-* Docker Swarm: [Lab 1a](./lab1a.md)
+The labs use Kubernetes, and still have some references to Docker Swarm. Please ignore those references as Swarm is no longer supported by the OpenFaaS community. Some of the workshop labs will work for faasd, but you may need to alter the commands and we do not provide support for the workshop when taken with faasd.
 
 * Kubernetes: [Lab 1b](./lab1b.md)
-
-
-### Pre-pull the system images (only if using Swarm)
-
-Pull the most recent OpenFaaS images. 
-
-```sh
-curl -sSL https://raw.githubusercontent.com/openfaas/faas/master/docker-compose.yml | grep image | awk -F " " '{print $NF}' | xargs -L1 docker pull
-```
-
-This should offset the impact on the workshop WiFi of multiple attendees trying to pull the images at the same time.

lab1a.md

@@ -181,9 +181,11 @@ where `IP_ADDRESS` is your corresponding IP for Kubernetes.
 Or you may run this port-forwarding command in order to be able to access Grafana on `http://127.0.0.1:3000`:
 
 ```sh
-$ kubectl port-forward deployment/grafana 3000:3000 -n openfaas
+$ kubectl port-forward pod/grafana 3000:3000 -n openfaas
 ```
 
+If you're using Kubernetes 1.17 or older, use `deploy/grafana` instead of `pod/` in the command above.
+
 After the service has been created open Grafana in your browser, login with username `admin` password `admin` and navigate to the pre-made OpenFaaS dashboard at:
 
 

lab2.md

@@ -29,7 +29,6 @@ Docker：
 ## [Lab 1 - まずはOpenFaaSの準備](./lab1.md)
 
 * 必要なものをインストール
-* Docker Swarmを使ってシングルノードのクラスタをセットアップ
 * Docker Hubのアカウントについて
 * OpenFaaS CLI
 * OpenFaaSをデプロイ
@@ -100,7 +99,7 @@ Docker：
 
 ## [Lab 10 - 応用編 - secretの使い方](./lab10.md)
 * issue-botでsecretを使うようにしよう
-  * Swarmのsecretを作ろう
+  * のsecretを作ろう
   * functionからsecretにアクセスしよう
 
 [Lab 1](lab1.md) から順番に進めていくことができます。