Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Commit aa721c7

Browse files
Fix Kubernetes docs for zipkin options and namespaces
* added namespace, because it was removed from manifest * increased amount of memory for minikube * Removed zipkin from deployment and added kubectl apply to override core deployments
1 parent fb0fb97 commit aa721c7

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

deployment/kubernetes-minikube.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cd microservices-demo
2222
You can start Minikube by running:
2323

2424
```
25-
minikube start --memory 4096
25+
minikube start --memory 8192
2626
```
2727

2828
Check if it's running with `minikube status`, and make sure the Kubernetes dashboard is running on http://192.168.99.100:30000.
@@ -64,6 +64,11 @@ Deploy the Sock Shop application on Minikube
6464
kubectl create -f deploy/kubernetes/manifests/sock-shop-ns.yaml -f deploy/kubernetes/manifests
6565
```
6666

67+
To start Opentracing run the following command after deploying the sock shop
68+
```
69+
kubectl apply -f deploy/kubernetes/manifests-zipkin/zipkin-ns.yaml -f deploy/kubernetes/manifests-zipkin
70+
```
71+
6772
Wait for all the Sock Shop services to start:
6873

6974
```

deployment/kubernetes-start.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ This explains how to deploy the Sock Shop onto any existing Kubernetes cluster.
2020
1. [Clone the microservices-demo repository](https://github.com/microservices-demo/microservices-demo)
2121
2. Go to the *deploy/kubernetes* folder
2222
```
23+
kubectl create namespace sock-shop
2324
kubectl apply -f complete-demo.yaml
24-
```
25+
```

deployment/kubernetes.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,18 @@ You may optionally choose to configure Weave Flux which allows automatic deploym
141141
<!-- deploy-doc-start create-infrastructure -->
142142

143143
master_ip=$(terraform output -json | jq -r '.master_address.value')
144-
ssh -i ~/.ssh/deploy-docs-k8s.pem ubuntu@$master_ip KUBECONFIG=\$HOME/admin.conf kubectl apply -f /tmp/manifests/sock-shop-ns.yaml -f /tmp/manifests/zipkin-ns.yaml -f /tmp/manifests
144+
ssh -i ~/.ssh/deploy-docs-k8s.pem ubuntu@$master_ip KUBECONFIG=\$HOME/admin.conf kubectl apply -f /tmp/manifests/sock-shop-ns.yaml -f /tmp/manifests
145145

146146
<!-- deploy-doc-end -->
147147

148+
### Deploy Sock Shop with Opentracing (optional)
149+
To deploy with opentracing run after deploying the sock-shop
150+
151+
```
152+
master_ip=$(terraform output -json | jq -r '.master_address.value')
153+
ssh -i ~/.ssh/deploy-docs-k8s.pem ubuntu@$master_ip KUBECONFIG=\$HOME/admin.conf kubectl apply -f /tmp/manifests-zipkin/zipkin-ns.yaml -f /tmp/manifests-zipkin
154+
```
155+
148156
### Service autoscaling (optional)
149157
If you want all stateless services to scale automatically based on the CPU utilization, you can deploy all the manifests in the "deploy/kubernetes/autoscaling" directory.
150158
The autoscaling directory contains Kubernetes horizontal pod autoscalers for all the stateless services, and the Heapster monitoring application with it's depedencies.

0 commit comments

Comments
 (0)