greenwave role: fix yaml syntax

This commit is contained in:
Matt Jia 2017-10-10 10:07:01 +10:00
parent f753144e69
commit b3c1b089d9
No known key found for this signature in database
GPG key ID: 496C2CDC1EF01F5D
3 changed files with 172 additions and 175 deletions

View file

@ -1,84 +1,84 @@
apiVersion: v1
kind: DeploymentConfig
metadata:
name: greenwave-web
labels:
app: greenwave
service: web
spec:
replicas: 2
selector:
app: greenwave
service: web
template:
metadata:
labels:
app: greenwave
service: web
spec:
containers:
- name: web
image: registry/greenwave:latest
ports:
- containerPort: 8080
volumeMounts:
- apiVersion: v1
kind: DeploymentConfig
metadata:
name: greenwave-web
labels:
app: greenwave
service: web
spec:
replicas: 2
selector:
app: greenwave
service: web
template:
metadata:
labels:
app: greenwave
service: web
spec:
containers:
- name: web
image: registry/greenwave:latest
ports:
- containerPort: 8080
volumeMounts:
- name: config-volume
mountPath: /etc/greenwave
readOnly: true
readinessProbe:
timeoutSeconds: 1
initialDelaySeconds: 5
httpGet:
path: /healthcheck
port: 8080
livenessProbe:
timeoutSeconds: 1
initialDelaySeconds: 30
httpGet:
path: /healthcheck
port: 8080
resources:
limits:
memory: 384Mi
volumes:
- name: config-volume
mountPath: /etc/greenwave
readOnly: true
readinessProbe:
timeoutSeconds: 1
initialDelaySeconds: 5
httpGet:
path: /healthcheck
port: 8080
livenessProbe:
timeoutSeconds: 1
initialDelaySeconds: 30
httpGet:
path: /healthcheck
port: 8080
resources:
limits:
memory: 384Mi
volumes:
- name: config-volume
configMap:
name: greenwave-configmap
configMap:
name: greenwave-configmap
# For fedmsg consumers
apiVersion: v1
kind: DeploymentConfig
metadata:
name: greenwave-fedmsg-consumers
labels:
app: greenwave
service: fedmsg-consumers
spec:
replicas: 1
selector:
service: fedmsg-consumers
template:
metadata:
labels:
app: greenwave
service: fedmsg-consumers
spec:
containers:
- name: fedmsg-consumers
image: 172.30.53.136:5000/greenwave/greenwave:latest
ports:
- containerPort: 8081
command: /usr/bin/fedmsg-hub
volumeMounts:
- apiVersion: v1
kind: DeploymentConfig
metadata:
name: greenwave-fedmsg-consumers
labels:
app: greenwave
service: fedmsg-consumers
spec:
replicas: 1
selector:
service: fedmsg-consumers
template:
metadata:
labels:
app: greenwave
service: fedmsg-consumers
spec:
containers:
- name: fedmsg-consumers
image: registry/greenwave:latest
ports:
- containerPort: 8081
command: /usr/bin/fedmsg-hub
volumeMounts:
- name: fedmsg-config-volume
mountPath: /etc/fedmsg.d
readOnly: true
resources:
limits:
memory: 384Mi
volumes:
- name: fedmsg-config-volume
mountPath: /etc/fedmsg.d
readOnly: true
resources:
limits:
memory: 384Mi
volumes:
- name: fedmsg-config-volume
configMap:
name: greenwave-fedmsg-configmap
configMap:
name: greenwave-fedmsg-configmap
triggers:
- type: ImageChange
imageChangeParams:

View file

@ -1,28 +1,28 @@
apiVersion: v1
kind: Service
metadata:
name: greenwave-web
labels:
app: greenwave
spec:
selector:
app: greenwave
service: web
ports:
- name: web
port: 8080
targetPort: 8080
apiVersion: v1
kind: Service
metadata:
name: fedmsg-consumers
labels:
app: greenwave
spec:
selector:
app: greenwave
service: fedmsg-consumers
ports:
- name: fedmsg-consumers
port: 8081
targetPort: 8081
- apiVersion: v1
kind: Service
metadata:
name: greenwave-web
labels:
app: greenwave
spec:
selector:
app: greenwave
service: web
ports:
- name: web
port: 8080
targetPort: 8080
- apiVersion: v1
kind: Service
metadata:
name: fedmsg-consumers
labels:
app: greenwave
spec:
selector:
app: greenwave
service: fedmsg-consumers
ports:
- name: fedmsg-consumers
port: 8081
targetPort: 8081

File diff suppressed because one or more lines are too long