merge internal-api back into api

Author: ib-steffen

deploy/infrabox/templates/fluentbit/configmap.yaml

@@ -36,7 +36,7 @@ data:
     [OUTPUT]
         Name  http
         Match *
-        Host infrabox-internal-api.{{ template "system_namespace" . }}
+        Host infrabox-api.{{ template "system_namespace" . }}
         Port 8080
-        URI /api/job/consoleupdate
+        URI /internal/api/job/consoleupdate
         Format json

deploy/infrabox/templates/internal-api/deployment.yaml

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import argparse
-import json
 import os
 import re
 import subprocess
@@ -30,7 +29,6 @@
     {'name': 'gc', 'depends_on': ['images-base']},
     {'name': 'scheduler-kubernetes'},
     {'name': 'api', 'depends_on': ['images-base']},
-    {'name': 'internal-api', 'depends_on': ['images-base']},
     {'name': 'build-dashboard-client'},
     {'name': 'static', 'depends_on': ['build-dashboard-client']},
     {'name': 'docker-registry-auth'},

deploy/infrabox/templates/internal-api/service.yaml

@@ -379,33 +379,6 @@
                 "image": true
             }
         },
-        {
-            "type": "docker",
-            "build_context": "../..",
-            "name": "internal-api",
-            "docker_file": "src/internal-api/Dockerfile",
-            "build_only": true,
-            "resources": {
-                "limits": {
-                    "cpu": 1,
-                    "memory": 1024
-                }
-            },
-            "deployments": [
-                {
-                    "type": "docker-registry",
-                    "host": "quay.io/infrabox",
-                    "repository": "internal-api",
-                    "username": "infrabox+infrabox_ci",
-                    "password": {
-                        "$secret": "QUAY_PASSWORD"
-                    }
-                }
-            ],
-            "cache": {
-                "image": true
-            }
-        },
         {
             "type": "docker",
             "build_context": "../..",

ib.py

@@ -0,0 +1 @@
+import api.internal.internal

infrabox/generator/deployments.json

@@ -1,31 +1,16 @@
 from datetime import datetime
 
-import eventlet
-from eventlet import wsgi
-eventlet.monkey_patch()
-
-from flask import jsonify, g, request
+from flask import g, request
 from flask_restplus import Resource
 
-from pyinfraboxutils import get_env, get_logger
-from pyinfraboxutils.ibflask import app
 from pyinfraboxutils.ibrestplus import api
-from pyinfraboxutils.db import connect_db
-
-logger = get_logger('api')
-
-app.config['OPA_ENABLED'] = False
 
-@app.route('/ping')
-def ping():
-    return jsonify({'status': 200})
+ns = api.namespace('Internal',
+                   path='/internal/api',
+                   description='Project related operations')
 
-@app.route('/v2/') # prevent 301 redirects
-@app.route('/v2')
-def v2():
-    return jsonify({'status': 200})
 
-@api.route("/api/job/consoleupdate", doc=False)
+@ns.route("/job/consoleupdate", doc=False)
 class ConsoleUpdate(Resource):
     def post(self):
         records = request.json
@@ -71,17 +56,3 @@ def post(self):
 
         return {}
 
-
-def main(): # pragma: no cover
-    get_env('INFRABOX_VERSION')
-    get_env('INFRABOX_DATABASE_HOST')
-    get_env('INFRABOX_DATABASE_USER')
-    get_env('INFRABOX_DATABASE_PASSWORD')
-    get_env('INFRABOX_DATABASE_PORT')
-    get_env('INFRABOX_DATABASE_DB')
-
-    connect_db()
-    wsgi.server(eventlet.listen(('0.0.0.0', 8080)), app)
-
-if __name__ == "__main__": # pragma: no cover
-    main()

src/api/internal/__init__.py

@@ -24,6 +24,7 @@
 
 import handlers
 import settings
+import internal
 
 import listeners.console
 import listeners.job