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.

Sign up for GitHub

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

build: change docker run command #25

Merged
merged 1 commit into from
Dec 17, 2023
+11 −10
Merged

build: change docker run command #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}
Expand All @@ -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"]
2 changes: 1 addition & 1 deletion deploy/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion deploy/helm/templates/deployment-rest.yaml
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions deploy/helm/templates/deployment-scheduler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -85,7 +85,7 @@ spec:
{{- end }}

volumes:
- name: default-conf
- name: default-conf
configMap:
name: {{ .Values.name }}-conf
- name: database-conf
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/templates/deployment-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -85,7 +85,7 @@ spec:
{{- end }}

volumes:
- name: default-conf
- name: default-conf
configMap:
name: {{ .Values.name }}-conf
- name: database-conf
Expand Down
2 changes: 1 addition & 1 deletion src/spaceone/secret/conf/global_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down