openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rab...@apache.org
Subject [incubator-openwhisk-deploy-kube] branch master updated: Minor doc fixes and remove cleanup.sh (#142)
Date Tue, 09 Jan 2018 19:13:07 GMT
This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 9479a99  Minor doc fixes and remove cleanup.sh (#142)
9479a99 is described below

commit 9479a996515d9ba7a76c198db2c5db19e3faa9db
Author: Jim Crossley <jim@crossleys.org>
AuthorDate: Tue Jan 9 14:13:05 2018 -0500

    Minor doc fixes and remove cleanup.sh (#142)
---
 README.md                          |  5 +++--
 docs/setting_up_minikube/README.md |  5 ++---
 kubernetes/couchdb/README.md       |  4 ++--
 tools/admin/cleanup.sh             | 36 ------------------------------------
 4 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 8c61783..5525911 100644
--- a/README.md
+++ b/README.md
@@ -90,10 +90,11 @@ to define and invoke a sample OpenWhisk action in your favorite programming
lang
 
 At some point there might be a need to cleanup the Kubernetes environment.
 For this, we want to delete all the OpenWhisk deployments, services, jobs
-and whatever else might be there. We provide a script to do this:
+and whatever else might be there. This is easily accomplished by
+deleting the `openwhisk` namespace:
 
 ```
-./tools/admin/cleanup.sh
+kubectl delete namespace openwhisk
 ```
 
 # Issues
diff --git a/docs/setting_up_minikube/README.md b/docs/setting_up_minikube/README.md
index b1b5904..eb6c330 100644
--- a/docs/setting_up_minikube/README.md
+++ b/docs/setting_up_minikube/README.md
@@ -7,13 +7,12 @@ If you have a larger machine, you may want to provision more (especially
more me
 
 Start Minikube with:
 ```
-minikube start --cpus 2 --memory 4096 --kubernetes-version v1.7.4
+minikube start --cpus 2 --memory 4096 --kubernetes-version=v1.7.4
 ```
 
 Put the docker network in promiscuous mode.
 ```
-minikube ssh
-(%) sudo ip link set docker0 promisc on
+minikube ssh -- sudo ip link set docker0 promisc on
 ```
 
 Your Minikube cluster should now be ready to deploy OpenWhisk.
diff --git a/kubernetes/couchdb/README.md b/kubernetes/couchdb/README.md
index cda0a60..1622d06 100644
--- a/kubernetes/couchdb/README.md
+++ b/kubernetes/couchdb/README.md
@@ -52,8 +52,8 @@ successfully setup and configured CouchDB
 
 This indicates that the CouchDB instance is fully configured and ready to use.
 
-## Persistance
+## Persistence
 
-To create a persistant CouchDB instance, you will need
+To create a persistent CouchDB instance, you will need
 to create a [persistent volume](https://kubernetes.io/docs/concepts/storage/persistent-volumes/)
 for the [couchdb.yml](couchdb.yml).
diff --git a/tools/admin/cleanup.sh b/tools/admin/cleanup.sh
deleted file mode 100755
index 723ecdc..0000000
--- a/tools/admin/cleanup.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-# this script is used to completely remove the OpenWhisk deployment
-
-set -x
-
-# delete deployments
-kubectl -n openwhisk delete deployment couchdb
-kubectl -n openwhisk delete deployment apigateway
-kubectl -n openwhisk delete deployment zookeeper
-kubectl -n openwhisk delete deployment kafka
-kubectl -n openwhisk delete statefulsets controller
-kubectl -n openwhisk delete daemonset invoker
-kubectl -n openwhisk delete deployment nginx
-
-# delete configmaps
-kubectl -n openwhisk delete cm nginx
-kubectl -n openwhisk delete cm whisk.ingress
-
-# delete secrets
-kubectl -n openwhisk delete secret nginx
-kubectl -n openwhisk delete secret auth
-
-# delete ingress
-kubectl -n openwhisk delete ingress ow-ingress
-
-# delete services
-kubectl -n openwhisk delete service couchdb
-kubectl -n openwhisk delete service apigateway
-kubectl -n openwhisk delete service zookeeper
-kubectl -n openwhisk delete service kafka
-kubectl -n openwhisk delete service controller
-kubectl -n openwhisk delete service nginx
-
-# delete namespace
-kubectl delete namespace openwhisk

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Mime
View raw message