Merge pull request #28 from ImMin5/master

Fix Dockerfile for SpaceONE 2.0

deploy/helm/Chart.yaml

@@ -4,7 +4,7 @@ description: SpaceONE plugin Helm chart for Kubernetes
 
 type: application
 
-version: 1.3.9
+version: 1.3.10
 appVersion: 1.x.y
 
 

deploy/helm/config/config.yaml

@@ -1,7 +1,7 @@
 REMOTE_URL:
-- file:///opt/spaceone/plugin/config/database.yaml
-- file:///opt/spaceone/plugin/config/shared.yaml
-- file:///opt/spaceone/plugin/config/application.yaml
+  - file:///opt/spaceone/plugin/config/database.yaml
+  - file:///opt/spaceone/plugin/config/shared.yaml
+  - file:///opt/spaceone/plugin/config/application.yaml
 GLOBAL:
   MAX_WORKERS: 1000
   DATABASES:
@@ -31,13 +31,6 @@ GLOBAL:
       file:
         type: file
         filename: /var/log/spaceone/plugin.log
-  HANDLERS:
-    authentication:
-    - backend: spaceone.core.handler.authentication_handler.AuthenticationGRPCHandler
-      uri: grpc://identity:50051/v1/Domain/get_public_key
-    authorization:
-    - backend: spaceone.core.handler.authorization_handler.AuthorizationGRPCHandler
-      uri: grpc://identity:50051/v1/Authorization/verify
   CONNECTORS:
     IdentityConnector:
       endpoint:

deploy/helm/templates/deployment-rest.yaml

@@ -43,7 +43,7 @@ spec:
           resources:
           {{- toYaml .Values.resources.rest | nindent 12 }}
 {{- end }}
-          command: ['spaceone', 'rest', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}', '-p', '8000']
+          command: ['spaceone', 'run', 'rest-server','spaceone.{{ regexReplaceAll "-" .Values.name "_" }}', '-p', '8000']
           ports:
             - containerPort: 8000
           volumeMounts:

pkg/pip_requirements.txt

@@ -1,4 +1 @@
 spaceone-api
-mongoengine
-redis
-python-consul

src/setup.py

@@ -17,21 +17,15 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='spaceone-plugin',
-    version=os.environ.get('PACKAGE_VERSION'),
-    description='SpaceONE plugin service',
-    long_description='',
-    url='https://www.spaceone.dev/',
-    author='MEGAZONE SpaceONE Team',
-    author_email='[email protected]',
-    license='Apache License 2.0',
+    name="spaceone-plugin",
+    version=os.environ.get("PACKAGE_VERSION"),
+    description="SpaceONE plugin service",
+    long_description="",
+    url="https://www.spaceone.dev/",
+    author="MEGAZONE SpaceONE Team",
+    author_email="[email protected]",
+    license="Apache License 2.0",
     packages=find_packages(),
-    install_requires=[
-        'spaceone-core',
-        'spaceone-api',
-        'mongoengine',
-        'redis',
-        'python-consul'
-    ],
+    install_requires=["spaceone-api"],
     zip_safe=False,
 )

src/spaceone/plugin/interface/grpc/__init__.py

@@ -0,0 +1,9 @@
+from spaceone.core.pygrpc.server import GRPCServer
+from spaceone.plugin.interface.grpc.plugin import Plugin
+from spaceone.plugin.interface.grpc.supervisor import Supervisor
+
+__all__ = ["app"]
+
+app = GRPCServer()
+app.add_service(Plugin)
+app.add_service(Supervisor)