Merge pull request #25 from whdalsrnt/master

build: change docker run command
cloudforet-io · Dec 17, 2023 · 1f1d3d4 · 1f1d3d4
2 parents 5e7ace2 + e7f8e74
commit 1f1d3d4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -9,7 +9,8 @@ ENV PACKAGE_VERSION=$PACKAGE_VERSION
 
 COPY pkg/pip_requirements.txt pip_requirements.txt
 
-RUN pip install --upgrade -r pip_requirements.txt
+RUN pip install --upgrade pip && \
+    pip install --upgrade -r pip_requirements.txt
 
 COPY src ${SRC_DIR}
 WORKDIR ${SRC_DIR}
@@ -21,4 +22,4 @@ RUN pip install --upgrade spaceone-api
 EXPOSE ${SPACEONE_PORT}
 
 ENTRYPOINT ["spaceone"]
-CMD ["grpc", "spaceone.secret", "-m", "/opt"]
+CMD ["run", "grpc-server", "spaceone.secret", "-m", "/opt"]
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -4,6 +4,6 @@ description: SpaceONE secret Helm chart for Kubernetes
 
 type: application
 
-version: 1.3.12
+version: 1.3.13
 appVersion: 1.x.y
 
diff --git 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
@@ -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
@@ -85,7 +85,7 @@ spec:
 {{- end }}
 
       volumes:
-        - name: default-conf 
+        - name: default-conf
           configMap:
             name: {{ .Values.name }}-conf
         - name: database-conf

diff --git 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
@@ -85,7 +85,7 @@ spec:
 {{- end }}
 
       volumes:
-        - name: default-conf 
+        - name: default-conf
           configMap:
             name: {{ .Values.name }}-conf
         - name: database-conf

diff --git a/src/spaceone/secret/conf/global_conf.py b/src/spaceone/secret/conf/global_conf.py
@@ -40,7 +40,7 @@
 BACKEND = "AWSSecretManagerConnector"
 CONNECTORS = {
     "SpaceConnector": {
-        "backend": "spaceone.core.connector.space_connector.SpaceConnector",
+        "backend": "spaceone.core.connector.space_connector:SpaceConnector",
         "endpoints": {"identity": "grpc://identity:50051"},
     },
     "AWSSecretManagerConnector": {},