Make opinionated openshift/route and make bodhi use it

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2018-04-17 20:12:08 +02:00
parent 6783d34e8e
commit 5dbc18df8d
4 changed files with 30 additions and 19 deletions

View file

@ -63,10 +63,12 @@
app: bodhi
file: service.yml
objectname: service.yml
- role: openshift/object
- role: openshift/route
app: bodhi
template: route.yml
objectname: route.yml
routename: bodhi-web
host: "bodhi{{ env_suffix }}.fedoraproject.org"
serviceport: web
servicename: bodhi-web
- role: openshift/object
app: bodhi
file: deploymentconfig.yml

View file

@ -1,16 +0,0 @@
apiVersion: v1
kind: Route
metadata:
name: bodhi-web
labels:
app: bodhi
spec:
host: "bodhi{{ env_suffix }}.fedoraproject.org"
port:
targetPort: web
to:
kind: Service
name: bodhi-web
tls:
termination: edge
insecureEdgeTerminationPolicy: Redirect

View file

@ -0,0 +1,7 @@
---
- name: route-{{routename}}.yml
include_role:
name: openshift/object
vars:
objectname: route-{{routename}}.yml
template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml"

View file

@ -0,0 +1,18 @@
apiVersion: v1
kind: Route
metadata:
name: {{ routename }}
labels:
app: {{ app }}
spec:
{% if host is defined %}
host: {{ host }}
{% endif %}
port:
targetPort: {{ serviceport }}
to:
kind: Service
name: {{ servicename }}
tls:
termination: edge
insecureEdgeTerminationPolicy: Redirect