Merge 1dfe181 into e5e649e

reanahub · Aug 15, 2019 · 8674e4b · 8674e4b
2 parents e5e649e + 1dfe181
commit 8674e4b
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 1 deletion.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -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>`_
diff --git a/reana_cluster/backends/kubernetes/templates/backend_conf.yaml b/reana_cluster/backends/kubernetes/templates/backend_conf.yaml
@@ -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' %}

diff --git a/reana_cluster/backends/kubernetes/templates/deployments/cache-template.yaml b/reana_cluster/backends/kubernetes/templates/deployments/cache-template.yaml
@@ -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
diff --git a/reana_cluster/backends/kubernetes/templates/deployments/server-template.yaml b/reana_cluster/backends/kubernetes/templates/deployments/server-template.yaml
@@ -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 %}
@@ -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() %}

diff --git a/reana_cluster/backends/kubernetes/templates/deployments/workflow-controller-template.yaml b/reana_cluster/backends/kubernetes/templates/deployments/workflow-controller-template.yaml
@@ -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 %}

diff --git a/reana_cluster/backends/kubernetes/templates/ingress/reana-ingress.yaml b/reana_cluster/backends/kubernetes/templates/ingress/reana-ingress.yaml
@@ -16,6 +16,38 @@ spec:
         backend:
           serviceName: server
           servicePort: 80
+      - path: /gitlab
+        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:

diff --git a/reana_cluster/backends/kubernetes/templates/services/cache-template.yaml b/reana_cluster/backends/kubernetes/templates/services/cache-template.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: cache
+spec:
+  type: NodePort
+  selector:
+    app: cache
+  ports:
+  - port: 6379
+    targetPort: 6379
+    protocol: TCP
diff --git a/reana_cluster/configurations/reana-cluster-minikube-dev.yaml b/reana_cluster/configurations/reana-cluster-minikube-dev.yaml
@@ -1,6 +1,7 @@
 cluster:
   type: "kubernetes"
   version: "v1.14.0"
+  reana_url: mb-rodrigdi.cern.ch
   db_config: &db_base_config
     - REANA_DB_NAME: "reana"
     - REANA_DB_USERNAME: "reana"
@@ -27,6 +28,8 @@ components:
       - WDB_SOCKET_SERVER: "wdb"
       - WDB_NO_BROWSER_AUTO_OPEN: "True"
       - FLASK_ENV:  "development"
+      - REANA_GITLAB_HOST: "mb-rodrigdi.cern.ch:8443"
+      - REANA_GITLAB_OAUTH_REDIRECT_URL: "https://mb-rodrigdi.cern.ch/gitlab/"
 
   reana-server:
     type: "docker"
@@ -41,6 +44,11 @@ components:
       - WDB_SOCKET_SERVER: "wdb"
       - WDB_NO_BROWSER_AUTO_OPEN: "True"
       - FLASK_ENV:  "development"
+      - REANA_GITLAB_HOST: "mb-rodrigdi.cern.ch:8443"
+      - REANA_GITLAB_OAUTH_APP_ID: "4598b23c9fdbdf74ceed2884051d7645d16198866317ee989943f438da493c00"
+      - REANA_GITLAB_OAUTH_APP_SECRET: "dd07bd636bb0d2ed5260dc8980f578b5ff4eac42710bd682f3ff7c1ec1547634"
+      - CERN_CONSUMER_SECRET: "EfguscEz3qWnf5AuYbKTf6q4ypU53Y8ERd2Xpfevp241"
+      - CERN_CONSUMER_KEY: "mb-rodrigdi-reana"
 
   reana-message-broker:
     type: "docker"