Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Dockerfile for SpaceONE 2.0 #28

Merged
merged 3 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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


13 changes: 3 additions & 10 deletions deploy/helm/config/config.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/deployment-rest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions pkg/pip_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
spaceone-api
mongoengine
redis
python-consul
24 changes: 9 additions & 15 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Empty file.
4 changes: 0 additions & 4 deletions src/spaceone/plugin/conf/proto_conf.py

This file was deleted.

9 changes: 9 additions & 0 deletions src/spaceone/plugin/interface/grpc/__init__.py
Original file line number Diff line number Diff line change
@@ -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)
Loading