Browse Source

Update to newer sock shop manifests

pull/2/head
Jesse Suen 6 years ago
parent
commit
852d97d96e
No known key found for this signature in database GPG Key ID: 90C911E8A6106562
  1. 1
      sock-shop/components/carts-db-dep.yaml
  2. 1
      sock-shop/components/carts-db-svc.yaml
  3. 24
      sock-shop/components/carts-dep.yaml
  4. 1
      sock-shop/components/catalogue-db-dep.yaml
  5. 1
      sock-shop/components/catalogue-db-svc.yaml
  6. 20
      sock-shop/components/catalogue-dep.yaml
  7. 1
      sock-shop/components/catalogue-svc.yaml
  8. 21
      sock-shop/components/front-end-dep.yaml
  9. 1
      sock-shop/components/front-end-svc.yaml
  10. 1
      sock-shop/components/orders-db-dep.yaml
  11. 1
      sock-shop/components/orders-db-svc.yaml
  12. 20
      sock-shop/components/orders-dep.yaml
  13. 1
      sock-shop/components/orders-svc.yaml
  14. 29
      sock-shop/components/params.libsonnet
  15. 21
      sock-shop/components/payment-dep.yaml
  16. 1
      sock-shop/components/payment-svc.yaml
  17. 48
      sock-shop/components/queue-master-dep.yaml
  18. 23
      sock-shop/components/queue-master-deploy.yaml
  19. 1
      sock-shop/components/queue-master-svc.yaml
  20. 13
      sock-shop/components/rabbitmq-dep.yaml
  21. 6
      sock-shop/components/rabbitmq-svc.yaml
  22. 36
      sock-shop/components/session-db-dep.yaml
  23. 11
      sock-shop/components/session-db-svc.yaml
  24. 20
      sock-shop/components/shipping-dep.yaml
  25. 2
      sock-shop/components/shipping-svc.yaml
  26. 4
      sock-shop/components/user-db-dep.yaml
  27. 2
      sock-shop/components/user-db-svc.yaml
  28. 20
      sock-shop/components/user-dep.yaml
  29. 3
      sock-shop/components/user-svc.yaml

1
sock-shop/components/carts-db-deploy.yaml → sock-shop/components/carts-db-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:

1
sock-shop/components/carts-db-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

24
sock-shop/components/carts-deploy.yaml → sock-shop/components/carts-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -17,13 +18,20 @@ spec:
containers: containers:
- name: carts - name: carts
image: weaveworksdemos/carts:0.4.8 image: weaveworksdemos/carts:0.4.8
ports:
- containerPort: 80
env: env:
- name: ZIPKIN - name: ZIPKIN
value: zipkin.jaeger.svc.cluster.local value: zipkin.jaeger.svc.cluster.local
- name: JAVA_OPTS - name: JAVA_OPTS
value: -Xms64m -Xmx128m -XX:PermSize=32m -XX:MaxPermSize=64m -XX:+UseG1GC -Djava.security.egd=file:/dev/urandom value: -Xms64m -Xmx128m -XX:PermSize=32m -XX:MaxPermSize=64m -XX:+UseG1GC -Djava.security.egd=file:/dev/urandom
resources:
limits:
cpu: 300m
memory: 500Mi
requests:
cpu: 300m
memory: 500Mi
ports:
- containerPort: 80
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 10001 runAsUser: 10001
@ -36,6 +44,18 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /tmp - mountPath: /tmp
name: tmp-volume name: tmp-volume
livenessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 180
periodSeconds: 3
volumes: volumes:
- name: tmp-volume - name: tmp-volume
emptyDir: emptyDir:

1
sock-shop/components/catalogue-db-deploy.yaml → sock-shop/components/catalogue-db-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:

1
sock-shop/components/catalogue-db-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

20
sock-shop/components/catalogue-deploy.yaml → sock-shop/components/catalogue-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -17,6 +18,13 @@ spec:
containers: containers:
- name: catalogue - name: catalogue
image: weaveworksdemos/catalogue:0.3.5 image: weaveworksdemos/catalogue:0.3.5
resources:
limits:
cpu: 100m
memory: 100Mi
requests:
cpu: 100m
memory: 100Mi
ports: ports:
- containerPort: 80 - containerPort: 80
securityContext: securityContext:
@ -28,5 +36,17 @@ spec:
add: add:
- NET_BIND_SERVICE - NET_BIND_SERVICE
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
livenessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 180
periodSeconds: 3
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux

1
sock-shop/components/catalogue-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

21
sock-shop/components/front-end-deploy.yaml → sock-shop/components/front-end-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -16,11 +17,17 @@ spec:
- name: front-end - name: front-end
image: weaveworksdemos/front-end:0.3.12 image: weaveworksdemos/front-end:0.3.12
resources: resources:
limits:
cpu: 300m
memory: 1000Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 100Mi memory: 300Mi
ports: ports:
- containerPort: 8079 - containerPort: 8079
env:
- name: SESSION_REDIS
value: "true"
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 10001 runAsUser: 10001
@ -28,5 +35,17 @@ spec:
drop: drop:
- all - all
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
livenessProbe:
httpGet:
path: /
port: 8079
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /
port: 8079
initialDelaySeconds: 30
periodSeconds: 3
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux

1
sock-shop/components/front-end-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

1
sock-shop/components/orders-db-deploy.yaml → sock-shop/components/orders-db-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:

1
sock-shop/components/orders-db-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

20
sock-shop/components/orders-deploy.yaml → sock-shop/components/orders-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -22,6 +23,13 @@ spec:
value: zipkin.jaeger.svc.cluster.local value: zipkin.jaeger.svc.cluster.local
- name: JAVA_OPTS - name: JAVA_OPTS
value: -Xms64m -Xmx128m -XX:PermSize=32m -XX:MaxPermSize=64m -XX:+UseG1GC -Djava.security.egd=file:/dev/urandom value: -Xms64m -Xmx128m -XX:PermSize=32m -XX:MaxPermSize=64m -XX:+UseG1GC -Djava.security.egd=file:/dev/urandom
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 200m
memory: 500Mi
ports: ports:
- containerPort: 80 - containerPort: 80
securityContext: securityContext:
@ -36,6 +44,18 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /tmp - mountPath: /tmp
name: tmp-volume name: tmp-volume
livenessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 180
periodSeconds: 3
volumes: volumes:
- name: tmp-volume - name: tmp-volume
emptyDir: emptyDir:

1
sock-shop/components/orders-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

29
sock-shop/components/params.libsonnet

@ -6,31 +6,32 @@
components: { components: {
// Component-level parameters, defined initially from 'ks prototype use ...' // Component-level parameters, defined initially from 'ks prototype use ...'
// Each object below should correspond to a component in the components/ directory // Each object below should correspond to a component in the components/ directory
"carts-db-deploy": {}, "carts-db-dep": {},
"carts-db-svc": {}, "carts-db-svc": {},
"carts-deploy": {}, "carts-dep": {},
"carts-svc": {}, "catalogue-db-dep": {},
"catalogue-db-deploy": {},
"catalogue-db-svc": {}, "catalogue-db-svc": {},
"catalogue-deploy": {}, "catalogue-dep": {},
"catalogue-svc": {}, "catalogue-svc": {},
"front-end-deploy": {}, "front-end-dep": {},
"front-end-svc": {}, "front-end-svc": {},
"orders-db-deploy": {}, "orders-db-dep": {},
"orders-db-svc": {}, "orders-db-svc": {},
"orders-deploy": {}, "orders-dep": {},
"orders-svc": {}, "orders-svc": {},
"payment-deploy": {}, "payment-dep": {},
"payment-svc": {}, "payment-svc": {},
"queue-master-deploy": {}, "queue-master-dep": {},
"queue-master-svc": {}, "queue-master-svc": {},
"rabbitmq-deploy": {}, "rabbitmq-dep": {},
"rabbitmq-svc": {}, "rabbitmq-svc": {},
"shipping-deploy": {}, "session-db-dep": {},
"session-db-svc": {},
"shipping-dep": {},
"shipping-svc": {}, "shipping-svc": {},
"user-db-deploy": {}, "user-db-dep": {},
"user-db-svc": {}, "user-db-svc": {},
"user-deploy": {}, "user-dep": {},
"user-svc": {}, "user-svc": {},
}, },
} }

21
sock-shop/components/payment-deploy.yaml → sock-shop/components/payment-dep.yaml

@ -1,4 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -18,6 +18,13 @@ spec:
containers: containers:
- name: payment - name: payment
image: weaveworksdemos/payment:0.4.3 image: weaveworksdemos/payment:0.4.3
resources:
limits:
cpu: 100m
memory: 100Mi
requests:
cpu: 99m
memory: 100Mi
ports: ports:
- containerPort: 80 - containerPort: 80
securityContext: securityContext:
@ -29,5 +36,17 @@ spec:
add: add:
- NET_BIND_SERVICE - NET_BIND_SERVICE
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
livenessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 180
periodSeconds: 3
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux

1
sock-shop/components/payment-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

48
sock-shop/components/queue-master-dep.yaml

@ -0,0 +1,48 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: queue-master
labels:
name: queue-master
spec:
replicas: 1
selector:
matchLabels:
name: queue-master
template:
metadata:
labels:
name: queue-master
spec:
containers:
- name: queue-master
image: weaveworksdemos/queue-master:0.3.1
env:
- name: ZIPKIN
value: zipkin.jaeger.svc.cluster.local
- name: JAVA_OPTS
value: -Xms64m -Xmx128m -XX:PermSize=32m -XX:MaxPermSize=64m -XX:+UseG1GC -Djava.security.egd=file:/dev/urandom
resources:
limits:
cpu: 300m
memory: 500Mi
requests:
cpu: 300m
memory: 500Mi
ports:
- containerPort: 80
livenessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 180
periodSeconds: 3
nodeSelector:
beta.kubernetes.io/os: linux

23
sock-shop/components/queue-master-deploy.yaml

@ -1,23 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: queue-master
labels:
name: queue-master
spec:
replicas: 1
selector:
matchLabels:
name: queue-master
template:
metadata:
labels:
name: queue-master
spec:
containers:
- name: queue-master
image: weaveworksdemos/queue-master:0.3.1
ports:
- containerPort: 80
nodeSelector:
beta.kubernetes.io/os: linux

1
sock-shop/components/queue-master-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

13
sock-shop/components/rabbitmq-deploy.yaml → sock-shop/components/rabbitmq-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -13,12 +14,17 @@ spec:
metadata: metadata:
labels: labels:
name: rabbitmq name: rabbitmq
annotations:
prometheus.io/scrape: "false"
spec: spec:
containers: containers:
- name: rabbitmq - name: rabbitmq
image: rabbitmq:3.6.8 image: rabbitmq:3.6.8-management
ports: ports:
- containerPort: 15672
name: management
- containerPort: 5672 - containerPort: 5672
name: rabbitmq
securityContext: securityContext:
capabilities: capabilities:
drop: drop:
@ -29,5 +35,10 @@ spec:
- SETUID - SETUID
- DAC_OVERRIDE - DAC_OVERRIDE
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
- name: rabbitmq-exporter
image: kbudde/rabbitmq-exporter
ports:
- containerPort: 9090
name: exporter
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux

6
sock-shop/components/rabbitmq-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@ -8,6 +9,11 @@ spec:
ports: ports:
# the port that this service should serve on # the port that this service should serve on
- port: 5672 - port: 5672
name: rabbitmq
targetPort: 5672 targetPort: 5672
- port: 9090
name: exporter
targetPort: exporter
protocol: TCP
selector: selector:
name: rabbitmq name: rabbitmq

36
sock-shop/components/session-db-dep.yaml

@ -0,0 +1,36 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: session-db
labels:
name: session-db
spec:
replicas: 1
selector:
matchLabels:
name: session-db
template:
metadata:
labels:
name: session-db
annotations:
prometheus.io.scrape: "false"
spec:
containers:
- name: session-db
image: redis:alpine
ports:
- name: redis
containerPort: 6379
securityContext:
capabilities:
drop:
- all
add:
- CHOWN
- SETGID
- SETUID
readOnlyRootFilesystem: true
nodeSelector:
beta.kubernetes.io/os: linux

11
sock-shop/components/carts-svc.yaml → sock-shop/components/session-db-svc.yaml

@ -1,13 +1,14 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: carts name: session-db
labels: labels:
name: carts name: session-db
spec: spec:
ports: ports:
# the port that this service should serve on # the port that this service should serve on
- port: 80 - port: 6379
targetPort: 80 targetPort: 6379
selector: selector:
name: carts name: session-db

20
sock-shop/components/shipping-deploy.yaml → sock-shop/components/shipping-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -22,6 +23,13 @@ spec:
value: zipkin.jaeger.svc.cluster.local value: zipkin.jaeger.svc.cluster.local
- name: JAVA_OPTS - name: JAVA_OPTS
value: -Xms64m -Xmx128m -XX:PermSize=32m -XX:MaxPermSize=64m -XX:+UseG1GC -Djava.security.egd=file:/dev/urandom value: -Xms64m -Xmx128m -XX:PermSize=32m -XX:MaxPermSize=64m -XX:+UseG1GC -Djava.security.egd=file:/dev/urandom
resources:
limits:
cpu: 300m
memory: 500Mi
requests:
cpu: 300m
memory: 500Mi
ports: ports:
- containerPort: 80 - containerPort: 80
securityContext: securityContext:
@ -36,6 +44,18 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /tmp - mountPath: /tmp
name: tmp-volume name: tmp-volume
livenessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 180
periodSeconds: 3
volumes: volumes:
- name: tmp-volume - name: tmp-volume
emptyDir: emptyDir:

2
sock-shop/components/shipping-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@ -11,3 +12,4 @@ spec:
targetPort: 80 targetPort: 80
selector: selector:
name: shipping name: shipping

4
sock-shop/components/user-db-deploy.yaml → sock-shop/components/user-db-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -16,7 +17,8 @@ spec:
spec: spec:
containers: containers:
- name: user-db - name: user-db
image: weaveworksdemos/user-db:0.4.0 image: weaveworksdemos/user-db:0.3.0
ports: ports:
- name: mongo - name: mongo
containerPort: 27017 containerPort: 27017

2
sock-shop/components/user-db-svc.yaml

@ -1,3 +1,4 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@ -11,3 +12,4 @@ spec:
targetPort: 27017 targetPort: 27017
selector: selector:
name: user-db name: user-db

20
sock-shop/components/user-deploy.yaml → sock-shop/components/user-dep.yaml

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -17,6 +18,13 @@ spec:
containers: containers:
- name: user - name: user
image: weaveworksdemos/user:0.4.7 image: weaveworksdemos/user:0.4.7
resources:
limits:
cpu: 300m
memory: 100Mi
requests:
cpu: 100m
memory: 100Mi
ports: ports:
- containerPort: 80 - containerPort: 80
env: env:
@ -31,5 +39,17 @@ spec:
add: add:
- NET_BIND_SERVICE - NET_BIND_SERVICE
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
livenessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 300
periodSeconds: 3
readinessProbe:
httpGet:
path: /health
port: 80
initialDelaySeconds: 180
periodSeconds: 3
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux

3
sock-shop/components/user-svc.yaml

@ -1,10 +1,10 @@
---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: user name: user
labels: labels:
name: user name: user
namespace: sock-shop
spec: spec:
ports: ports:
# the port that this service should serve on # the port that this service should serve on
@ -12,3 +12,4 @@ spec:
targetPort: 80 targetPort: 80
selector: selector:
name: user name: user

Loading…
Cancel
Save