diff --git a/Dockerfile b/Dockerfile index fae4741..b280b41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM cloudforet/python-core:1.12 +FROM cloudforet/python-core:2.0 ARG PACKAGE_VERSION ENV PYTHONUNBUFFERED 1 ENV SPACEONE_PORT 50051 @@ -21,4 +21,4 @@ RUN pip install --upgrade spaceone-api EXPOSE ${SPACEONE_PORT} ENTRYPOINT ["spaceone"] -CMD ["grpc", "spaceone.statistics", "-m", "/opt"] +CMD ["run", "grpc-server", "spaceone.statistics", "-m", "/opt"] diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml index 01474a9..87941c8 100644 --- a/deploy/helm/Chart.yaml +++ b/deploy/helm/Chart.yaml @@ -4,6 +4,6 @@ description: SpaceONE statistics Helm chart for Kubernetes type: application -version: 1.3.11 +version: 1.3.12 appVersion: 1.x.y diff --git a/deploy/helm/templates/deployment-rest.yaml b/deploy/helm/templates/deployment-rest.yaml index 78d243b..9272b22 100644 --- a/deploy/helm/templates/deployment-rest.yaml +++ b/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: diff --git a/deploy/helm/templates/deployment-scheduler.yaml b/deploy/helm/templates/deployment-scheduler.yaml index 9ae9bf3..58b02ce 100644 --- a/deploy/helm/templates/deployment-scheduler.yaml +++ b/deploy/helm/templates/deployment-scheduler.yaml @@ -43,7 +43,7 @@ spec: resources: {{- toYaml .Values.resources.scheduler | nindent 12 }} {{- end }} - command: ['spaceone', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}'] + command: ['spaceone', 'run', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}'] volumeMounts: - name: default-conf mountPath: /opt/spaceone/{{ .Values.name }}/config/config.yaml diff --git a/deploy/helm/templates/deployment-worker.yaml b/deploy/helm/templates/deployment-worker.yaml index 9b68a5c..9da3710 100644 --- a/deploy/helm/templates/deployment-worker.yaml +++ b/deploy/helm/templates/deployment-worker.yaml @@ -43,7 +43,7 @@ spec: resources: {{- toYaml .Values.resources.worker | nindent 12 }} {{- end }} - command: ['spaceone', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}'] + command: ['spaceone', 'run', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}'] volumeMounts: - name: default-conf mountPath: /opt/spaceone/{{ .Values.name }}/config/config.yaml diff --git a/pkg/pip_requirements.txt b/pkg/pip_requirements.txt index 0b55045..e9cdbde 100644 --- a/pkg/pip_requirements.txt +++ b/pkg/pip_requirements.txt @@ -1,6 +1,3 @@ spaceone-api -mongoengine pandas numpy -python-consul -redis diff --git a/src/setup.py b/src/setup.py index 0dccf12..7759b8d 100644 --- a/src/setup.py +++ b/src/setup.py @@ -29,11 +29,8 @@ install_requires=[ 'spaceone-core', 'spaceone-api', - 'mongoengine', 'pandas', 'numpy', - 'python-consul', - 'redis' ], zip_safe=False, )