Commit d4018825 authored by Luc Bourdot's avatar Luc Bourdot
Browse files

Merge branch 'scrumblr' into 'master'

scrumblr & ethercalc

See merge request !2
parents d787c40f 14219833
kind: Deployment
apiVersion: extensions/v1beta1 # for versions before 1.9.0 use apps/v1beta2
metadata:
name: ethercalc
labels:
service: ethercalc
spec:
replicas: 1
strategy: {}
selector:
matchLabels:
service: ethercalc
replicas: 1 # tells deployment to run 2 pods matching the template
template:
metadata:
labels:
service: ethercalc
spec:
containers:
- name: scrumblr
image: audreyt/ethercalc:latest
ports:
- containerPort: 8000
name: ethercalc
protocol: TCP
resources: {}
---
kind: Service
apiVersion: v1
metadata:
name: ethercalc
spec:
type: NodePort
selector:
service: ethercalc
ports:
- port: 80
targetPort: 8000
protocol: TCP
......@@ -4,24 +4,24 @@ metadata:
name: redis
labels:
service: redis
namespace: hackathon
spec:
replicas: 1
strategy: {}
selector:
matchLabels:
service: redis
app: redis
role: master
tier: backend
replicas: 1 # tells deployment to run 2 pods matching the template
template:
metadata:
labels:
service: redis
app: redis
role: master
tier: backend
spec:
containers:
- env:
- name: GET_HOSTS_FROM
value: dns
name: redis
- name: redis
image: redis:latest
ports:
- containerPort: 6379
......@@ -33,10 +33,17 @@ kind: Service
apiVersion: v1
metadata:
name: redis
namespace: hackathon
labels:
app: redis
role: master
tier: backend
spec:
selector:
service: redis
app: redis
role: master
tier: backend
ports:
- port: 6379
targetPort: 6379
\ No newline at end of file
targetPort: 6379
protocol: TCP
\ No newline at end of file
......@@ -4,7 +4,6 @@ metadata:
name: scrumblr
labels:
service: scrumblr
namespace: hackathon
spec:
replicas: 1
strategy: {}
......@@ -26,13 +25,13 @@ spec:
- name: REDIS_PORT_6379_TCP_ADDR
value: redis
- name: REDIS_PORT_6379_TCP_PORT
value: "6375"
- name: GET_HOSTS_FROM
value: dns
value: "6379"
name: scrumblr
image: timmit/scrumblr:latest
ports:
- containerPort: 8080
name: scrumblr
protocol: TCP
resources: {}
......@@ -43,11 +42,11 @@ kind: Service
apiVersion: v1
metadata:
name: scrumblr
namespace: hackathon
spec:
type: NodePort
selector:
service: scrumblr
ports:
- port: 8080
- port: 80
targetPort: 8080
protocol: TCP
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment