Issue argoproj#22: Gateway Improvement

- Convert gateway to use Flask instead of Django - Combine gateway, repomanager, eventtrigger into one container instead of 3 containers within the same pod - Remove all Django dependencies and rebuild axdevopsbuilder (from v8 to v9) - Change the CPU limit to 800m for the new gateway and use the /v1/ping as the liveness probe - Conver all related APIs in gateway, axapproval and JIRA integration to use Flask - Restructure folder and code clean up
sytianhe · Aug 29, 2017 · d9a8bfb · d9a8bfb
1 parent 5fd4f84
commit d9a8bfb
Show file tree

Hide file tree

Showing 65 changed files with 1,702 additions and 2,581 deletions.
diff --git a/build/ax/build/devops.py b/build/ax/build/devops.py
@@ -13,7 +13,7 @@
 
 DEVOPS_CONTAINERS_PATH = os.path.join(SRC_PATH, "devops/builds")
 
-DEVOPS_BUILDER_IMAGE = '{}/argobase/axdevopsbuilder:v8'.format(ARGO_BASE_REGISTRY)
+DEVOPS_BUILDER_IMAGE = '{}/argobase/axdevopsbuilder:v9'.format(ARGO_BASE_REGISTRY)
 DEBIAN_BUILDER_IMAGE = '{}/argobase/axplatbuilder-debian:v15'.format(ARGO_BASE_REGISTRY)
 
 class DevOpsModules(object):

diff --git a/...ax/devops/apps/gateway/axjira/__init__.py → devops/__init__.py b/...ax/devops/apps/gateway/axjira/__init__.py → devops/__init__.py
diff --git a/devops/builds/infrastructure/axeventtrigger/Dockerfile-debug.in b/devops/builds/infrastructure/axeventtrigger/Dockerfile-debug.in
diff --git a/devops/builds/infrastructure/axeventtrigger/Dockerfile.in b/devops/builds/infrastructure/axeventtrigger/Dockerfile.in
diff --git a/devops/builds/infrastructure/axeventtrigger/axeventtrigger.py b/devops/builds/infrastructure/axeventtrigger/axeventtrigger.py
diff --git a/devops/builds/infrastructure/axeventtrigger/axeventtrigger.spec b/devops/builds/infrastructure/axeventtrigger/axeventtrigger.spec
diff --git a/devops/builds/infrastructure/axeventtrigger/run.sh b/devops/builds/infrastructure/axeventtrigger/run.sh
diff --git a/devops/builds/infrastructure/gateway/Dockerfile b/devops/builds/infrastructure/gateway/Dockerfile
@@ -2,31 +2,10 @@
 
 FROM %%BUILDER_IMAGE_ID%%
 
-RUN apk --update add nginx
-
-ENV AXHOME=/ax
-ENV PYTHONPATH=$AXHOME/src
-ENV DJANGOHOME $AXHOME/src/ax/devops/apps/gateway
-
-RUN mkdir -p $AXHOME/db $AXHOME/log
-RUN mkdir -p /run/nginx
-
-COPY run.sh \
-    gateway.conf \
-    gateway.ini \
-    $AXHOME/
-RUN chmod +x $AXHOME/run.sh
-RUN touch /run/nginx/nginx.pid
-RUN touch /var/log/cron.log
-RUN ln -s $AXHOME/gateway.conf /etc/nginx/conf.d/gateway.conf
-
+ENV PATH $PATH:/ax/bin
+ENV PYTHONPATH /ax/src
 EXPOSE 8889
 
-COPY docker_build/src $AXHOME/src
-
-RUN python3 $DJANGOHOME/manage.py check \
-    && python3 $DJANGOHOME/manage.py makemigrations \
-    && python3 $DJANGOHOME/manage.py migrate \
-    && python3 $DJANGOHOME/manage.py crontab add
-
-CMD $AXHOME/run.sh
+COPY gateway.py /ax/bin/gateway
+COPY docker_build/src /ax/src
+CMD ["gateway"]
diff --git a/devops/builds/infrastructure/gateway/gateway.conf b/devops/builds/infrastructure/gateway/gateway.conf
diff --git a/devops/builds/infrastructure/gateway/gateway.ini b/devops/builds/infrastructure/gateway/gateway.ini
diff --git a/devops/builds/infrastructure/gateway/gateway.py b/devops/builds/infrastructure/gateway/gateway.py
@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+from ax.devops.gateway.main import main
+if __name__ == '__main__':
+    main()
diff --git a/devops/builds/infrastructure/gateway/run.sh b/devops/builds/infrastructure/gateway/run.sh
diff --git a/devops/builds/infrastructure/repomanager/Dockerfile b/devops/builds/infrastructure/repomanager/Dockerfile
diff --git a/devops/builds/infrastructure/repomanager/repomanager.py b/devops/builds/infrastructure/repomanager/repomanager.py
diff --git a/devops/builds/infrastructure/repomanager/repomanager.spec b/devops/builds/infrastructure/repomanager/repomanager.spec
diff --git a/devops/builds/infrastructure/repomanager/run.sh b/devops/builds/infrastructure/repomanager/run.sh
diff --git a/devops/builds/templates/axdjango/Dockerfile b/devops/builds/templates/axdjango/Dockerfile
diff --git a/devops/builds/templates/axdjango/requirements.txt b/devops/builds/templates/axdjango/requirements.txt
diff --git a/devops/requirements/requirements.txt b/devops/requirements/requirements.txt
@@ -16,29 +16,15 @@ Jinja2==2.8
 future==0.15.2
 google-cloud==0.26.1
 
-# axagent
-GitPython==1.0.2
+# gateway
 jira==1.0.7
-flower==0.9.1
 
 # axscheduler
 APScheduler==3.2.0
 
 # fixturemanager
 pymongo==3.4.0
 
-# gateway
-django==1.9
-django-extensions==1.6.7
-django-filter==0.13.0
-djangorestframework==3.3.3
-django-crontab==0.7.1
-requests==2.10.0
-uwsgi==2.0.14
-GitPython==1.0.2
-pika==0.10.0
-redlock-py==1.0.8
-
 # axworkflowadc
 transitions==0.4.0