global: deletes RJC

* Deletes RJC references because it runs as a sidecar. Signed-off-by: Rokas Maciulaitis <rokas.maciulaitis@cern.ch>
reanahub · Jun 21, 2019 · b631360 · b631360
1 parent ea3ff33
commit b631360
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 190 deletions.
diff --git a/docs/developerguide.rst b/docs/developerguide.rst
@@ -45,7 +45,6 @@ sources).
    $ ls -d $HOME/reana/sources
    reana-client
    reana-cluster
-   reana-job-controller
    reana-message-broker
    reana-server
    reana-workflow-controller
@@ -55,17 +54,17 @@ sources).
 
 .. code-block:: console
 
-   $ vim $HOME/reana/sources/reana-job-controller/reana_job_controller/app.py
+   $ vim $HOME/reana/sources/reana-workflow-controller/reana_workflow_controller/app.py
 
 4. Delete your pod and see a new pod being deployed with your changes:
 
 .. code-block:: console
 
-   $ kubectl get pods | grep job-controller
-   $ kubectl delete pod job-controller-2461563162-r4hgg
+   $ kubectl get pods | grep workflow-controller
+   $ kubectl delete pod workflow-controller-2461563162-r4hgg
    $ sleep 10 # wait some time...
-   $ kubectl get pods | grep job-controller
-   $ kubectl exec -i -t job-controller-2461563162-h9ptw /bin/bash
+   $ kubectl get pods | grep workflow-controller
+   $ kubectl exec -i -t workflow-controller-2461563162-h9ptw /bin/bash
 
 Using Minikube running on a remote host
 ---------------------------------------
@@ -172,19 +171,6 @@ After running ``minikube start`` on the remote host.
          - WDB_NO_BROWSER_AUTO_OPEN: "True"
          - FLASK_DEBUG: "1"
 
-     reana-job-controller:
-       type: "docker"
-       image: "reanahub/reana-job-controller:0.1.0"
-       mountpoints:
-         - type: hostPath
-           name: reana-job-controller-code
-           path: "/code/reana-job-controller:/code"
-       environment:
-         - REANA_STORAGE_BACKEND: "LOCAL"
-         - WDB_SOCKET_SERVER: "wdb"
-         - WDB_NO_BROWSER_AUTO_OPEN: "True"
-         - FLASK_DEBUG:  "1"
-
      reana-server:
        type: "docker"
        image: "reanahub/reana-server:0.1.0"
@@ -475,7 +461,6 @@ Stop current cluster (``minikube``, which if you didn't change it, is the defaul
 
     $ kubectl get pods
     NAME                                     READY     STATUS    RESTARTS   AGE
-    job-controller-2899072941-5c8ph          1/1       Running   0          7m
     message-broker-1926055025-4jjdm          1/1       Running   0          7m
     server-1390351625-dxk52                  1/1       Running   0          7m
     wdb-3285397567-1c8p0                     1/1       Running   0          7m
@@ -568,7 +553,6 @@ Check that all components are created:
 
     $ kubectl get pods
     NAME                                     READY     STATUS              RESTARTS   AGE
-    job-controller-3021378878-htkvv          1/1       Running             0          5m
     message-broker-3641009106-c2rzx          1/1       Running             0          17m
     server-2623620487-15pqq                  1/1       Running             0          17m
     wdb-3285397567-cs8tv                     1/1       Running             0          17m
@@ -622,7 +606,6 @@ If we list now the pods, we can see that they are the original ones:
 
     $ kubectl get pods
     NAME                                     READY     STATUS    RESTARTS   AGE
-    job-controller-2899072941-5c8ph          1/1       Running   1          58m
     message-broker-1926055025-4jjdm          1/1       Running   1          58m
     server-1390351625-dxk52                  1/1       Running   1          58m
     wdb-3285397567-1c8p0                     1/1       Running   1          58m

diff --git a/docs/userguide.rst b/docs/userguide.rst
@@ -198,7 +198,6 @@ what is defined in REANA cluster specifications file via the ``verify`` command:
 
    $ reana-cluster verify components
    COMPONENT               IMAGE
-   job-controller          match
    message-broker          match
    server                  match
    workflow-controller     match
@@ -214,7 +213,6 @@ running the ``status`` command:
 .. code-block:: console
 
    $ reana-cluster status
-   job-controller          Running
    message-broker          Running
    server                  Running
    workflow-controller     Running

diff --git a/reana_cluster/backends/kubernetes/k8s.py b/reana_cluster/backends/kubernetes/k8s.py
@@ -220,32 +220,25 @@ def generate_configuration(cls, cluster_spec, cvmfs=False, cephfs=False,
 
                 components = cluster_spec['components']
                 rs_img = components['reana-server']['image']
-                rjc_img = components['reana-job-controller']['image']
                 rwfc_img = components['reana-workflow-controller']['image']
                 rmb_img = components['reana-message-broker']['image']
 
                 rs_environment = components['reana-server']\
                     .get('environment', [])
-                rjc_environment = components['reana-job-controller'] \
-                    .get('environment', [])
                 rwfc_environment = components['reana-workflow-controller'] \
                     .get('environment', [])
                 rmb_environment = components['reana-message-broker'] \
                     .get('environment', [])
 
                 rs_environment = components['reana-server']\
                     .get('environment', [])
-                rjc_environment = components['reana-job-controller'] \
-                    .get('environment', [])
                 rwfc_environment = components['reana-workflow-controller'] \
                     .get('environment', [])
                 rmb_environment = components['reana-message-broker'] \
                     .get('environment', [])
 
                 rs_mountpoints = components['reana-server']\
                     .get('mountpoints', [])
-                rjc_mountpoints = components['reana-job-controller']\
-                    .get('mountpoints', [])
                 rwfc_mountpoints = components['reana-workflow-controller']\
                     .get('mountpoints', [])
                 rmb_mountpoints = components['reana-message-broker'] \
@@ -259,15 +252,12 @@ def generate_configuration(cls, cluster_spec, cvmfs=False, cephfs=False,
                                url),
                            CEPHFS_VOLUME_SIZE=cephfs_volume_size or 1,
                            SERVER_IMAGE=rs_img,
-                           JOB_CONTROLLER_IMAGE=rjc_img,
                            WORKFLOW_CONTROLLER_IMAGE=rwfc_img,
                            MESSAGE_BROKER_IMAGE=rmb_img,
                            RS_MOUNTPOINTS=rs_mountpoints,
-                           RJC_MOUNTPOINTS=rjc_mountpoints,
                            RWFC_MOUNTPOINTS=rwfc_mountpoints,
                            RMB_MOUNTPOINTS=rmb_mountpoints,
                            RS_ENVIRONMENT=rs_environment,
-                           RJC_ENVIRONMENT=rjc_environment,
                            RWFC_ENVIRONMENT=rwfc_environment,
                            RMB_ENVIRONMENT=rmb_environment,
                            )
@@ -344,8 +334,7 @@ def init(self, traefik):
                     # service-account-token in order to create new Pods.
 
                     components_k8s_token = \
-                        ['reana-server', 'job-controller',
-                         'workflow-controller']
+                        ['reana-server', 'workflow-controller']
                     if manifest['metadata']['name'] in components_k8s_token:
                         manifest = self._add_service_acc_key_to_component(
                             manifest)

diff --git a/reana_cluster/backends/kubernetes/templates/backend_conf.yaml b/reana_cluster/backends/kubernetes/templates/backend_conf.yaml
@@ -1,9 +1,7 @@
-{% include 'deployments/job-controller-template.yaml' %}
 {% include 'deployments/message-broker-template.yaml' %}
 {% include 'deployments/server-template.yaml' %}
 {% include 'deployments/workflow-controller-template.yaml' %}
 {% include 'deployments/db-template.yaml' %}
-{% include 'services/job-controller-template.yaml' %}
 {% include 'services/message-broker-template.yaml' %}
 {% include 'services/server-template.yaml' %}
 {% include 'services/workflow-controller-template.yaml' %}

diff --git a/reana_cluster/backends/kubernetes/templates/deployments/job-controller-template.yaml b/reana_cluster/backends/kubernetes/templates/deployments/job-controller-template.yaml
diff --git a/reana_cluster/backends/kubernetes/templates/services/job-controller-template.yaml b/reana_cluster/backends/kubernetes/templates/services/job-controller-template.yaml
diff --git a/reana_cluster/cli/__init__.py b/reana_cluster/cli/__init__.py
@@ -83,7 +83,6 @@ def cli(ctx, loglevel, skip_validation, file,
             cephfs_volume_size = None
             click.echo(click.style('CEPHFS volume size will not be set because'
                                    ' missing `--cephfs` flag', fg='yellow'))
-
         ctx.obj = Config()
 
         cluster_type = cluster_spec['cluster']['type']

diff --git a/reana_cluster/cli/cluster.py b/reana_cluster/cli/cluster.py
@@ -249,7 +249,7 @@ def cli_verify_components(ctx):
     '--component',
     default=None,
     help='Specify for which component you want the status'
-         'e.g. job-controller.')
+         'e.g. workflow-controller.')
 @click.pass_context
 def status(ctx, component):
     """Display the status of cluster components and if the cluster is ready."""

diff --git a/reana_cluster/config.py b/reana_cluster/config.py
@@ -34,11 +34,9 @@
 reana_env_exportable_info_components = ['reana-server']
 """Components which information will be produced by ``reana-client env``."""
 
-reana_cluster_ready_necessary_components = ['job-controller',
+reana_cluster_ready_necessary_components = ['workflow-controller',
                                             'message-broker',
-                                            'server',
-                                            'workflow-controller',
-                                            ]
+                                            'server']
 """Components which must be running for the cluster status to be ready."""
 
 traefik_release_name = 'reana-traefik'

diff --git a/reana_cluster/configurations/reana-cluster-dev.yaml b/reana_cluster/configurations/reana-cluster-dev.yaml
@@ -31,21 +31,6 @@ components:
       - WDB_NO_BROWSER_AUTO_OPEN: "True"
       - FLASK_ENV:  "development"
 
-  reana-job-controller:
-    type: "docker"
-    image: "reanahub/reana-job-controller:latest"
-    mountpoints:
-      - type: hostPath
-        name: reana-job-controller-code
-        path: "/code/reana-job-controller:/code"
-    environment:
-      - <<: *db_base_config
-      - SHARED_VOLUME_PATH: "/var/reana"
-      - REANA_STORAGE_BACKEND: "LOCAL"
-      - WDB_SOCKET_SERVER: "wdb"
-      - WDB_NO_BROWSER_AUTO_OPEN: "True"
-      - FLASK_ENV:  "development"
-
   reana-server:
     type: "docker"
     image: "reanahub/reana-server:latest"

diff --git a/reana_cluster/configurations/reana-cluster-latest.yaml b/reana_cluster/configurations/reana-cluster-latest.yaml
@@ -16,13 +16,6 @@ components:
       - SHARED_VOLUME_PATH: "/var/reana"
       - ORGANIZATIONS: "default,alice,atlas,cms,lhcb"
 
-  reana-job-controller:
-    type: "docker"
-    image: "reanahub/reana-job-controller:latest"
-    environment:
-      - <<: *db_base_config
-      - SHARED_VOLUME_PATH: "/var/reana"
-
   reana-server:
     type: "docker"
     image: "reanahub/reana-server:latest"

diff --git a/reana_cluster/configurations/reana-cluster.yaml b/reana_cluster/configurations/reana-cluster.yaml
@@ -24,12 +24,6 @@ components:
       - REANA_WORKFLOW_ENGINE_IMAGE_YADAGE: "reanahub/reana-workflow-engine-yadage:0.5.0"
       - REANA_WORKFLOW_ENGINE_IMAGE_SERIAL: "reanahub/reana-workflow-engine-serial:0.5.0"
 
-  reana-job-controller:
-    type: "docker"
-    image: "reanahub/reana-job-controller:0.5.1"
-    environment:
-      - <<: *db_base_config
-
   reana-server:
     type: "docker"
     image: "reanahub/reana-server:0.5.0"