Skip to content

Commit 9090896

Browse files
jasonrichardsmithCarlos León
jasonrichardsmith
authored and
Carlos León
committed
Zipkin as option in Kubernetes (microservices-demo#727)
* Remove namespace object and all zipkin objects (fix kubernetes/website#3214) * moved around some manifests to break out zipkin * moved down memory requirements for user
1 parent c1d58ca commit 9090896

16 files changed

+210
-148
lines changed

‎deploy/kubernetes/complete-demo.yaml

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
---
2-
apiVersion: v1
3-
kind: Namespace
4-
metadata:
5-
name: sock-shop
6-
---
7-
apiVersion: v1
8-
kind: Namespace
9-
metadata:
10-
name: zipkin
11-
---
121
apiVersion: extensions/v1beta1
132
kind: Deployment
143
metadata:
@@ -181,9 +170,6 @@ spec:
181170
containers:
182171
- name: catalogue
183172
image: weaveworksdemos/catalogue:0.3.5
184-
env:
185-
- name: ZIPKIN
186-
value: http://zipkin.zipkin.svc.cluster.local:9411/api/v1/spans
187173
ports:
188174
- containerPort: 80
189175
securityContext:
@@ -391,9 +377,6 @@ spec:
391377
image: weaveworksdemos/payment:0.4.3
392378
ports:
393379
- containerPort: 80
394-
env:
395-
- name: ZIPKIN
396-
value: http://zipkin.zipkin.svc.cluster.local:9411/api/v1/spans
397380
securityContext:
398381
runAsNonRoot: true
399382
runAsUser: 10001
@@ -641,8 +624,6 @@ spec:
641624
env:
642625
- name: MONGO_HOST
643626
value: user-db:27017
644-
- name: ZIPKIN
645-
value: http://zipkin.zipkin.svc.cluster.local:9411/api/v1/spans
646627
securityContext:
647628
runAsNonRoot: true
648629
runAsUser: 10001
@@ -669,118 +650,3 @@ spec:
669650
targetPort: 80
670651
selector:
671652
name: user
672-
---
673-
apiVersion: extensions/v1beta1
674-
kind: Deployment
675-
metadata:
676-
name: zipkin
677-
labels:
678-
name: zipkin
679-
namespace: zipkin
680-
spec:
681-
replicas: 1
682-
template:
683-
metadata:
684-
labels:
685-
name: zipkin
686-
spec:
687-
containers:
688-
- name: zipkin
689-
image: openzipkin/zipkin
690-
ports:
691-
- containerPort: 9411
692-
env:
693-
- name: STORAGE_TYPE
694-
value: mysql
695-
- name: MYSQL_HOST
696-
value: zipkin-mysql
697-
nodeSelector:
698-
beta.kubernetes.io/os: linux
699-
---
700-
apiVersion: v1
701-
kind: Service
702-
metadata:
703-
name: zipkin
704-
labels:
705-
name: zipkin
706-
namespace: zipkin
707-
spec:
708-
type: NodePort
709-
ports:
710-
# the port that this service should serve on
711-
- port: 9411
712-
targetPort: 9411
713-
nodePort: 30002
714-
selector:
715-
name: zipkin
716-
717-
---
718-
apiVersion: extensions/v1beta1
719-
kind: Deployment
720-
metadata:
721-
name: zipkin-mysql
722-
labels:
723-
name: zipkin-mysql
724-
namespace: zipkin
725-
spec:
726-
replicas: 1
727-
template:
728-
metadata:
729-
labels:
730-
name: zipkin-mysql
731-
spec:
732-
containers:
733-
- name: zipkin-mysql
734-
image: openzipkin/zipkin-mysql:1.20.0
735-
ports:
736-
- name: mysql
737-
containerPort: 3306
738-
nodeSelector:
739-
beta.kubernetes.io/os: linux
740-
---
741-
apiVersion: v1
742-
kind: Service
743-
metadata:
744-
name: zipkin-mysql
745-
labels:
746-
name: zipkin-mysql
747-
namespace: zipkin
748-
spec:
749-
ports:
750-
# the port that this service should serve on
751-
- port: 3306
752-
targetPort: 3306
753-
selector:
754-
name: zipkin-mysql
755-
756-
---
757-
apiVersion: extensions/v1beta1
758-
kind: Deployment
759-
metadata:
760-
name: zipkin-cron
761-
labels:
762-
name: zipkin-cron
763-
namespace: zipkin
764-
spec:
765-
replicas: 1
766-
template:
767-
metadata:
768-
labels:
769-
name: zipkin-cron
770-
spec:
771-
containers:
772-
- name: zipkin-cron
773-
image: openzipkin/zipkin-dependencies:1.4.0
774-
env:
775-
- name: STORAGE_TYPE
776-
value: mysql
777-
- name: MYSQL_HOST
778-
value: zipkin-mysql
779-
- name: MYSQL_USER
780-
value: zipkin
781-
- name: MYSQL_PASS
782-
value: zipkin
783-
command: ["crond"]
784-
args: ["-f"]
785-
nodeSelector:
786-
beta.kubernetes.io/os: linux

‎deploy/kubernetes/manifests-zipkin/catalogue-dep.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
apiVersion: extensions/v1beta1
3+
kind: Deployment
4+
metadata:
5+
name: catalogue
6+
labels:
7+
name: catalogue
8+
namespace: sock-shop
9+
spec:
10+
replicas: 1
11+
template:
12+
metadata:
13+
labels:
14+
name: catalogue
15+
spec:
16+
containers:
17+
- name: catalogue
18+
image: weaveworksdemos/catalogue:0.3.5
19+
env:
20+
- name: ZIPKIN
21+
value: http://zipkin.zipkin.svc.cluster.local:9411/api/v1/spans
22+
resources:
23+
limits:
24+
cpu: 100m
25+
memory: 100Mi
26+
requests:
27+
cpu: 100m
28+
memory: 100Mi
29+
ports:
30+
- containerPort: 80
31+
securityContext:
32+
runAsNonRoot: true
33+
runAsUser: 10001
34+
capabilities:
35+
drop:
36+
- all
37+
add:
38+
- NET_BIND_SERVICE
39+
readOnlyRootFilesystem: true
40+
livenessProbe:
41+
httpGet:
42+
path: /health
43+
port: 80
44+
initialDelaySeconds: 300
45+
periodSeconds: 3
46+
readinessProbe:
47+
httpGet:
48+
path: /health
49+
port: 80
50+
initialDelaySeconds: 180
51+
periodSeconds: 3
52+
nodeSelector:
53+
beta.kubernetes.io/os: linux

‎deploy/kubernetes/manifests-zipkin/catalogue-svc.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: catalogue
6+
labels:
7+
name: catalogue
8+
namespace: sock-shop
9+
spec:
10+
ports:
11+
# the port that this service should serve on
12+
- port: 80
13+
targetPort: 80
14+
selector:
15+
name: catalogue

‎deploy/kubernetes/manifests-zipkin/payment-dep.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
apiVersion: extensions/v1beta1
3+
kind: Deployment
4+
metadata:
5+
name: payment
6+
labels:
7+
name: payment
8+
namespace: sock-shop
9+
spec:
10+
replicas: 1
11+
template:
12+
metadata:
13+
labels:
14+
name: payment
15+
spec:
16+
containers:
17+
- name: payment
18+
image: weaveworksdemos/payment:0.4.3
19+
resources:
20+
limits:
21+
cpu: 100m
22+
memory: 100Mi
23+
requests:
24+
cpu: 100m
25+
memory: 100Mi
26+
ports:
27+
- containerPort: 80
28+
env:
29+
- name: ZIPKIN
30+
value: http://zipkin.zipkin.svc.cluster.local:9411/api/v1/spans
31+
securityContext:
32+
runAsNonRoot: true
33+
runAsUser: 10001
34+
capabilities:
35+
drop:
36+
- all
37+
add:
38+
- NET_BIND_SERVICE
39+
readOnlyRootFilesystem: true
40+
livenessProbe:
41+
httpGet:
42+
path: /health
43+
port: 80
44+
initialDelaySeconds: 300
45+
periodSeconds: 3
46+
readinessProbe:
47+
httpGet:
48+
path: /health
49+
port: 80
50+
initialDelaySeconds: 180
51+
periodSeconds: 3
52+
nodeSelector:
53+
beta.kubernetes.io/os: linux

‎deploy/kubernetes/manifests-zipkin/payment-svc.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: payment
6+
labels:
7+
name: payment
8+
namespace: sock-shop
9+
spec:
10+
ports:
11+
# the port that this service should serve on
12+
- port: 80
13+
targetPort: 80
14+
selector:
15+
name: payment

‎deploy/kubernetes/manifests-zipkin/user-dep.yaml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
apiVersion: extensions/v1beta1
3+
kind: Deployment
4+
metadata:
5+
name: user
6+
labels:
7+
name: user
8+
namespace: sock-shop
9+
spec:
10+
replicas: 1
11+
template:
12+
metadata:
13+
labels:
14+
name: user
15+
spec:
16+
containers:
17+
- name: user
18+
image: weaveworksdemos/user:0.4.4
19+
resources:
20+
limits:
21+
cpu: 300m
22+
memory: 100Mi
23+
requests:
24+
cpu: 100m
25+
memory: 100Mi
26+
ports:
27+
- containerPort: 80
28+
env:
29+
- name: MONGO_HOST
30+
value: user-db:27017
31+
- name: ZIPKIN
32+
value: http://zipkin.zipkin.svc.cluster.local:9411/api/v1/spans
33+
securityContext:
34+
runAsNonRoot: true
35+
runAsUser: 10001
36+
capabilities:
37+
drop:
38+
- all
39+
add:
40+
- NET_BIND_SERVICE
41+
readOnlyRootFilesystem: true
42+
livenessProbe:
43+
httpGet:
44+
path: /health
45+
port: 80
46+
initialDelaySeconds: 300
47+
periodSeconds: 3
48+
readinessProbe:
49+
httpGet:
50+
path: /health
51+
port: 80
52+
initialDelaySeconds: 180
53+
periodSeconds: 3
54+
nodeSelector:
55+
beta.kubernetes.io/os: linux

‎deploy/kubernetes/manifests-zipkin/user-svc.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: user
6+
labels:
7+
name: user
8+
namespace: sock-shop
9+
spec:
10+
ports:
11+
# the port that this service should serve on
12+
- port: 80
13+
targetPort: 80
14+
selector:
15+
name: user
16+

‎deploy/kubernetes/manifests/zipkin-cron-dep.yml renamed to ‎deploy/kubernetes/manifests-zipkin/zipkin-cron-dep.yml

File renamed without changes.

‎deploy/kubernetes/manifests/zipkin-dep.yaml renamed to ‎deploy/kubernetes/manifests-zipkin/zipkin-dep.yaml

File renamed without changes.

‎deploy/kubernetes/manifests/zipkin-mysql-dep.yaml renamed to ‎deploy/kubernetes/manifests-zipkin/zipkin-mysql-dep.yaml

File renamed without changes.

‎deploy/kubernetes/manifests/zipkin-mysql-svc.yaml renamed to ‎deploy/kubernetes/manifests-zipkin/zipkin-mysql-svc.yaml

File renamed without changes.

‎deploy/kubernetes/manifests/zipkin-ns.yaml renamed to ‎deploy/kubernetes/manifests-zipkin/zipkin-ns.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
{{- if .Values.zipkin.enabled -}}
2-
---
31
apiVersion: v1
42
kind: Namespace
53
metadata:
64
name: zipkin
7-
{{- end -}}

‎deploy/kubernetes/manifests/zipkin-svc.yaml renamed to ‎deploy/kubernetes/manifests-zipkin/zipkin-svc.yaml

File renamed without changes.

‎deploy/kubernetes/manifests/catalogue-dep.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ spec:
1616
containers:
1717
- name: catalogue
1818
image: weaveworksdemos/catalogue:0.3.5
19-
env:
20-
- name: ZIPKIN
21-
value: http://zipkin.zipkin.svc.cluster.local:9411/api/v1/spans
2219
resources:
2320
limits:
2421
cpu: 100m

0 commit comments

Comments
 (0)