Merge pull request #51 from pomo-mondreganto/kube

Deploy to kubernetes

.dockerignore

@@ -1,11 +1,10 @@
 .DS_Store
 .idea
 
-front/node_modules
+/front/node_modules
 
 /control.py
-/requirements.txt
 /README.md
 .mypy_cache
-
-docker_volumes
+/cli
+/docker_volumes

.github/workflows/tests.yml

@@ -33,8 +33,6 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: '3.7'
-          architecture: 'x64'
-
       - name: Setup tests
         run: python tests/setup_forcad.py
       - name: Install requirements
@@ -71,7 +69,6 @@ jobs:
           python-version: '3.7'
       - name: Install dependencies
         run: pip install flake8
-
       - name: Run linters
         uses: wearerequired/lint-action@v1
         with:
@@ -90,7 +87,6 @@ jobs:
       - name: Install dependencies
         working-directory: front
         run: yarn install
-
       - name: Run linters
         uses: wearerequired/lint-action@v1
         with:
@@ -100,3 +96,39 @@ jobs:
           prettier: true
           eslint_dir: front/src
           prettier_dir: front/src
+
+  test_kube:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Install skaffold
+        run: |
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.19.0/skaffold-linux-amd64
+          chmod +x skaffold
+          sudo mv skaffold /usr/local/bin
+      - name: Setup Minikube
+        uses: manusa/[email protected]
+        with:
+          minikube version: 'v1.17.1'
+          kubernetes version: 'v1.19.3'
+          github token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install cli requirements
+        run: pip install -r cli/requirements.txt
+      - name: Copy test config
+        run: python tests/setup_forcad.py
+      - name: Setup configuration
+        run: ./control.py kube setup
+      - name: Kustomize build
+        uses: karancode/kustomize-github-action@master
+        with:
+          kustomize_version: '3.9.2'
+          kustomize_build_dir: 'deploy'
+        env:
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Skaffold build
+        run: ./control.py kube build

.gitignore

@@ -18,3 +18,7 @@ node_modules/
 
 /.version
 /release
+deploy/secrets/*
+!deploy/secrets/.keep
+
+deploy/kustomization.yml

backend/services/admin/viewsets/__init__.py

@@ -4,7 +4,7 @@
 from .tasks import TaskApi
 from .teams import TeamApi
 from .teamtasks import TeamTaskApi
-from .utils import admin_bp
+from .views import admin_bp
 
 TeamApi(admin_bp, auth=True)
 TaskApi(admin_bp, auth=True)

backend/services/admin/viewsets/utils.py

@@ -1,6 +1,4 @@
-from flask import Blueprint, jsonify, make_response, abort
-
-admin_bp = Blueprint('admin_api', __name__)
+from flask import jsonify, make_response, abort
 
 
 def make_err_response(err, status=400):

backend/services/admin/viewsets/views.py

@@ -0,0 +1,8 @@
+from flask import Blueprint, jsonify
+
+admin_bp = Blueprint('admin_api', __name__)
+
+
+@admin_bp.route('/health/')
+def health_check():
+    return jsonify({'status': 'ok'})

backend/services/api/views.py

@@ -40,6 +40,6 @@ def get_team_history(team_id):
     return jsonify(teamtasks)
 
 
-@client_bp.route('/status/')
-def status():
-    return jsonify(dict(status='ok'))
+@client_bp.route('/health/')
+def health_check():
+    return jsonify({'status': 'ok'})

backend/services/events/app.py

@@ -1,6 +1,6 @@
 import logging
 
-from flask import Flask
+from flask import Flask, jsonify
 from flask_cors import CORS
 from flask_socketio import SocketIO, emit
 
@@ -33,6 +33,11 @@ def handle_connect():
     )
 
 
+@app.route('/api/events/health/')
+def health_check():
+    return jsonify({'status': 'ok'})
+
+
 if __name__ == '__main__':
     app.run(host="0.0.0.0", port=5000, debug=True)
 else:

backend/services/http_receiver/views.py

@@ -1,4 +1,5 @@
 import logging
+
 from flask import Blueprint
 from flask import jsonify, make_response, request
 
@@ -63,7 +64,6 @@ def get_teams():
     return jsonify(responses)
 
 
-@receiver_bp.route('/status/')
+@receiver_bp.route('/health/')
 def health_check():
-    logger.debug('status called')
     return jsonify({'status': 'ok'})

backend/services/monitoring/app.py

@@ -1,6 +1,7 @@
-import eventlet
 import logging
-from flask import Flask
+
+import eventlet
+from flask import Flask, jsonify
 from flask_cors import CORS
 
 from metrics import MetricsServer
@@ -16,6 +17,12 @@
 metrics.add_endpoint('/api/metrics')
 eventlet.spawn(metrics.connect_consumer)
 
+
+@app.route('/api/metrics/health/')
+def health():
+    return jsonify({'status': 'ok'})
+
+
 if __name__ == '__main__':
     app.run(host="0.0.0.0", port=5000, debug=True)
 else:

backend/services/tcp_receiver/server.py

@@ -8,6 +8,8 @@
 from lib import storage
 from lib.flags import SubmitMonitor, Judge
 
+from utils import ignore_exc_wrapper
+
 
 class SubmitHandler:
     def __init__(self, logger: logging.Logger, judge: Judge, monitor: SubmitMonitor):
@@ -62,6 +64,7 @@ def _run_loop(self, logger, conn: TextIO):
             conn.flush()
             eventlet.sleep(0)  # handle some other flag
 
+    @ignore_exc_wrapper(BrokenPipeError)
     def __call__(self, socket, address):
         logger = logging.LoggerAdapter(self._logger, {'address': address})
         logger.debug('accepted')

backend/services/tcp_receiver/utils.py

@@ -0,0 +1,18 @@
+from functools import wraps
+from typing import Union, Tuple, Type
+
+ExceptType = Union[Type[Exception], Tuple[Type[Exception]]]
+
+
+def ignore_exc_wrapper(exc: ExceptType):
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            try:
+                func(*args, **kwargs)
+            except exc:
+                pass
+
+        return wrapper
+
+    return decorator

cli/__init__.py

@@ -1,32 +1,15 @@
 import click
 
-from .build import build
-from .pause import pause
-from .print_tokens import print_tokens
-from .reset import reset
-from .resume import resume
-from .run_docker import run_docker_command
-from .scale import scale
-from .setup import setup
-from .start import start
-from .worker import worker
+from . import base, kube
 
 
 @click.group()
 def cli():
     pass
 
 
-cli: click.Group
-cli.add_command(setup)
-cli.add_command(print_tokens)
-cli.add_command(reset)
-cli.add_command(build)
-cli.add_command(start)
-cli.add_command(scale)
-cli.add_command(worker)
-cli.add_command(pause)
-cli.add_command(resume)
-cli.add_command(run_docker_command)
+base.register(cli)
+
+cli.add_command(kube.cli)
 
 __all__ = ('cli',)

cli/base/__init__.py

@@ -0,0 +1,28 @@
+import click
+
+from .build import build
+from .pause import pause
+from .print_tokens import print_tokens
+from .reset import reset
+from .resume import resume
+from .run_docker import run_docker_command
+from .scale import scale
+from .setup import setup
+from .start import start
+from .worker import worker
+
+
+def register(cli: click.Group):
+    cli.add_command(setup)
+    cli.add_command(print_tokens)
+    cli.add_command(reset)
+    cli.add_command(build)
+    cli.add_command(start)
+    cli.add_command(scale)
+    cli.add_command(worker)
+    cli.add_command(pause)
+    cli.add_command(resume)
+    cli.add_command(run_docker_command)
+
+
+__all__ = ('register',)

cli/build.py → cli/base/build.py

@@ -1,7 +1,7 @@
 import click
 
-from .options import with_fast_option
-from .utils import run_docker
+from cli.options import with_fast_option
+from cli.utils import run_docker
 
 
 @click.command(help="Build the images, don't run")

cli/pause.py → cli/base/pause.py

@@ -1,8 +1,8 @@
 import click
 
-from .utils import run_docker
+from cli.utils import run_docker
 
 
 @click.command(help='Stop updating rounds & receiving flags')
 def pause():
-    run_docker(['stop', 'celerybeat', 'tcp_receiver', 'http_receiver'])
+    run_docker(['stop', 'celerybeat', 'tcp-receiver', 'http-receiver'])

cli/print_tokens.py → cli/base/print_tokens.py

@@ -2,15 +2,15 @@
 
 import click
 
-from .constants import FULL_COMPOSE_PATH, BASE_DIR
+from cli.constants import FULL_COMPOSE_PATH, BASE_DIR
 
 
 @click.command('print_tokens', help='Print team tokens')
 def print_tokens():
     command = [
         'docker-compose',
         '-f', FULL_COMPOSE_PATH,
-        'exec', '-T', 'client_api',
+        'exec', '-T', 'client-api',
         'python3', '/app/scripts/print_tokens.py',
     ]
     res = subprocess.check_output(

cli/reset.py → cli/base/reset.py

@@ -3,8 +3,8 @@
 
 import click
 
-from .constants import BASE_DIR, FULL_COMPOSE_PATH
-from .utils import print_file_exception_info, run_command
+from cli.constants import BASE_DIR, FULL_COMPOSE_PATH
+from cli.utils import print_file_exception_info, run_command
 
 
 @click.command(help='Reset the game & clean up')

cli/resume.py → cli/base/resume.py

@@ -1,10 +1,10 @@
 import click
 
-from .utils import run_docker
+from cli.utils import run_docker
 
 
 @click.command(
     help='Start updating rounds & receiving flags (counterpart of pause_game command)',
 )
 def resume():
-    run_docker(['start', 'celerybeat', 'tcp_receiver', 'http_receiver'])
+    run_docker(['start', 'celerybeat', 'tcp-receiver', 'http-receiver'])

cli/run_docker.py → cli/base/run_docker.py

@@ -1,7 +1,7 @@
 import click
 
-from .options import with_fast_option
-from .utils import run_docker
+from cli.options import with_fast_option
+from cli.utils import run_docker
 
 
 @click.command(

cli/scale.py → cli/base/scale.py

@@ -1,6 +1,6 @@
 import click
 
-from .utils import run_docker
+from cli.utils import run_docker
 
 
 @click.command(help='Scale any service (e.g. "celery 3" to set number of workers to 5)')