Merge remote-tracking branch 'upstream/master'

This commit is contained in:
André Bauer 2017-12-09 12:38:43 +01:00
commit 2d904768f3

View File

@ -5,7 +5,7 @@ beta and not ready for production.
## Prerequisites ## Prerequisites
- Kubernetes 1.8.x Cluster with at least on node, 2 CPUs and 4 GB of RAM - Kubernetes 1.8.x Cluster with at least 1 worker node, 2 CPUs and 6 GB of RAM
- Change the ingress to your needs - Change the ingress to your needs
@ -17,7 +17,7 @@ beta and not ready for production.
* https://kubernetes.io/docs/tasks/tools/install-kubectl/ * https://kubernetes.io/docs/tasks/tools/install-kubectl/
* Install Minkube * Install Minkube
* https://github.com/kubernetes/minikube * https://github.com/kubernetes/minikube
* minikube start --memory=4096 --cpus=2 * minikube start --memory=6144 --cpus=2
* minikube addons enable ingress * minikube addons enable ingress
* echo "$(minikube ip) zammad.example.com" | sudo tee -a /etc/hosts * echo "$(minikube ip) zammad.example.com" | sudo tee -a /etc/hosts
* kubectl apply -f . * kubectl apply -f .