greenwave role: fix the OpenShift templates

This commit is contained in:
Matt Jia 2017-10-10 13:26:33 +10:00
parent 027d598ae8
commit 257f1d2874
No known key found for this signature in database
GPG key ID: 496C2CDC1EF01F5D
6 changed files with 188 additions and 180 deletions

View file

@ -1,13 +1,12 @@
--- ---
objects: apiVersion: v1
- apiVersion: v1 kind: DeploymentConfig
kind: DeploymentConfig metadata:
metadata:
name: greenwave-web name: greenwave-web
labels: labels:
app: greenwave app: greenwave
service: web service: web
spec: spec:
replicas: 2 replicas: 2
selector: selector:
app: greenwave app: greenwave
@ -46,15 +45,26 @@ objects:
- name: config-volume - name: config-volume
configMap: configMap:
name: greenwave-configmap name: greenwave-configmap
triggers:
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- web
from:
kind: ImageStreamTag
name: greenwave:latest
- type: ConfigChange
---
# For fedmsg consumers # For fedmsg consumers
- apiVersion: v1 apiVersion: v1
kind: DeploymentConfig kind: DeploymentConfig
metadata: metadata:
name: greenwave-fedmsg-consumers name: greenwave-fedmsg-consumers
labels: labels:
app: greenwave app: greenwave
service: fedmsg-consumers service: fedmsg-consumers
spec: spec:
replicas: 1 replicas: 1
selector: selector:
service: fedmsg-consumers service: fedmsg-consumers
@ -69,7 +79,8 @@ objects:
image: registry/greenwave:latest image: registry/greenwave:latest
ports: ports:
- containerPort: 8081 - containerPort: 8081
command: /usr/bin/fedmsg-hub command:
- '/usr/bin/fedmsg-hub'
volumeMounts: volumeMounts:
- name: fedmsg-config-volume - name: fedmsg-config-volume
mountPath: /etc/fedmsg.d mountPath: /etc/fedmsg.d
@ -86,9 +97,9 @@ objects:
imageChangeParams: imageChangeParams:
automatic: true automatic: true
containerNames: containerNames:
- web
- fedmsg-consumers - fedmsg-consumers
from: from:
kind: ImageStreamTag kind: ImageStreamTag
name: greenwave:latest name: greenwave:latest
- type: ConfigChange - type: ConfigChange

View file

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

View file

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

View file

@ -1,12 +1,11 @@
--- ---
objects: apiVersion: v1
- apiVersion: v1 kind: Service
kind: Service metadata:
metadata:
name: greenwave-web name: greenwave-web
labels: labels:
app: greenwave app: greenwave
spec: spec:
selector: selector:
app: greenwave app: greenwave
service: web service: web
@ -14,13 +13,14 @@ objects:
- name: web - name: web
port: 8080 port: 8080
targetPort: 8080 targetPort: 8080
- apiVersion: v1 ---
kind: Service apiVersion: v1
metadata: kind: Service
metadata:
name: fedmsg-consumers name: fedmsg-consumers
labels: labels:
app: greenwave app: greenwave
spec: spec:
selector: selector:
app: greenwave app: greenwave
service: fedmsg-consumers service: fedmsg-consumers

View file

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

File diff suppressed because one or more lines are too long