Skip to content
This repository has been archived by the owner on Jan 29, 2024. It is now read-only.

Commit

Permalink
Merge cf2a070 into e5e649e
Browse files Browse the repository at this point in the history
  • Loading branch information
leticiawanderley committed Aug 15, 2019
2 parents e5e649e + cf2a070 commit eee8cb0
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS.rst
Expand Up @@ -8,6 +8,7 @@ The list of contributors in alphabetical order:
- `Dinos Kousidis <https://orcid.org/0000-0002-4914-4289>`_
- `Harri Hirvonsalo <https://orcid.org/0000-0002-5503-510X>`_
- `Jan Okraska <https://orcid.org/0000-0002-1416-3244>`_
- `Leticia Wanderley <https://orcid.org/0000-0003-4649-6630>`_
- `Rokas Maciulaitis <https://orcid.org/0000-0003-1064-6967>`_
- `Sinclert Perez <https://www.linkedin.com/in/sinclert>`_
- `Tibor Simko <https://orcid.org/0000-0001-7202-5803>`_
2 changes: 2 additions & 0 deletions reana_cluster/backends/kubernetes/templates/backend_conf.yaml
Expand Up @@ -2,10 +2,12 @@
{% include 'deployments/server-template.yaml' %}
{% include 'deployments/workflow-controller-template.yaml' %}
{% include 'deployments/db-template.yaml' %}
{% include 'deployments/cache-template.yaml' %}
{% include 'services/message-broker-template.yaml' %}
{% include 'services/server-template.yaml' %}
{% include 'services/workflow-controller-template.yaml' %}
{% include 'services/db-template.yaml' %}
{% include 'services/cache-template.yaml' %}
{% include 'clusterrole/service-reader.yaml' %}
{% include 'clusterrolebinding/service-reader.yaml' %}
{% include 'ingress/reana-ingress.yaml' %}
Expand Down
@@ -0,0 +1,17 @@
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: cache
spec:
replicas: 1
template:
metadata:
labels:
app: cache
spec:
containers:
- name: cache
image: redis:5.0.5
ports:
- containerPort: 6379
Expand Up @@ -15,7 +15,7 @@ spec:
image: {{SERVER_IMAGE}}
{% if DEBUG %}
command: ["/bin/sh","-c"]
args: ["set -e; flask db init; flask users create_default info@reana.io; flask run --host=0.0.0.0"]
args: ["set -e; ./scripts/setup; invenio run -h 0.0.0.0 -p 5000"]
tty: true
stdin: true
{% endif %}
Expand All @@ -32,6 +32,10 @@ spec:
- containerPort: 5000
name: http
env:
{% if REANA_URL %}
- name: REANA_URL
value: {{REANA_URL}}
{% endif %}
{% set environment=RS_ENVIRONMENT %}
{% for envvar in environment %}
{% for key, value in envvar.items() %}
Expand Down
Expand Up @@ -34,6 +34,10 @@ spec:
- containerPort: 5000
name: http
env:
{% if REANA_URL %}
- name: REANA_URL
value: {{REANA_URL}}
{% endif %}
- name: REANA_DEPLOYMENT_TYPE
value: {{DEPLOYMENT}}
{% if CEPHFS %}
Expand Down
Expand Up @@ -16,6 +16,34 @@ spec:
backend:
serviceName: server
servicePort: 80
- path: /oauth
backend:
serviceName: server
servicePort: 80
- path: /account
backend:
serviceName: server
servicePort: 80
- path: /lost-password
backend:
serviceName: server
servicePort: 80
- path: /confirm
backend:
serviceName: server
servicePort: 80
- path: /login
backend:
serviceName: server
servicePort: 80
- path: /logout
backend:
serviceName: server
servicePort: 80
- path: /sign-up
backend:
serviceName: server
servicePort: 80
{% if UI %}
- path: /
backend:
Expand Down
@@ -0,0 +1,13 @@
---
apiVersion: v1
kind: Service
metadata:
name: cache
spec:
type: NodePort
selector:
app: cache
ports:
- port: 6379
targetPort: 6379
protocol: TCP

0 comments on commit eee8cb0

Please sign in to comment.