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

Rename 'simulation-service' to 'sciml-service' #306

Merged
merged 1 commit into from
Oct 10, 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 docker/components/staging/vars.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ KEYCLOAK_SERVICE_FQDN=https://keycloak.staging.terarium.ai
KNOWLEDGE_MIDDLEWARE_FQDN=https://knowledge-middleware.staging.terarium.ai
MODEL_SERVICE_FQDN=https://model-service.staging.terarium.ai
PYCIEMSS_API_FQDN=https://pyciemss-api.staging.terarium.ai
SIMULATION_SERVICE_FQDN=https://simulation-service.staging.terarium.ai
SIMULATION_SERVICE_FQDN=https://sciml-service.staging.terarium.ai
SKEMA_PY_FQDN=https://skema-py.staging.terarium.ai
SKEMA_RS_FQDN=https://skema-rs.staging.terarium.ai
SKEMA_UNIFIED_FQDN=https://skema-unified.staging.terarium.ai
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/services/beaker/beaker-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
- name: JUPYTER_SERVER
value: http://beaker:3050
- name: SIMULATION_SCHEDULER_URL
value: http://simulation-service:3030
value: http://sciml-service:3030
- name: JUPYTER_TOKEN
value: 89f73481102c46c0bc13b2998f9a4fce
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: terarium
resources:
- simulation-service-deployment.yaml
- simulation-service-service.yaml
- sciml-service-deployment.yaml
- sciml-service-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: simulation-service
name: sciml-service
labels:
software.uncharted.terarium/name: simulation-service
software.uncharted.terarium/name: sciml-service
software.uncharted.terarium/component: server
software.uncharted.terarium/service: simulation
software.uncharted.terarium/part-of: services
spec:
replicas: 2
selector:
matchLabels:
software.uncharted.terarium/name: simulation-service
software.uncharted.terarium/name: sciml-service
strategy:
type: Recreate
template:
metadata:
labels:
software.uncharted.terarium/name: simulation-service
software.uncharted.terarium/name: sciml-service
spec:
containers:
- name: simulation-service
image: simulation-service-image
- name: sciml-service
image: sciml-service-image
ports:
- containerPort: 8080
resources: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
apiVersion: v1
kind: Service
metadata:
name: simulation-service
name: sciml-service
labels:
software.uncharted.terarium/name: simulation-service
software.uncharted.terarium/name: sciml-service
software.uncharted.terarium/component: server
software.uncharted.terarium/service: simulation
software.uncharted.terarium/part-of: services
Expand All @@ -15,6 +15,6 @@ spec:
protocol: TCP
targetPort: 8080
selector:
software.uncharted.terarium/name: simulation-service
software.uncharted.terarium/name: sciml-service
status:
loadBalancer: {}
4 changes: 2 additions & 2 deletions kubernetes/overlays/prod/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ resources:
- ../../../base/services/mit
- ../../../base/services/model-service
- ../../../base/services/pyciemss-service
- ../../../base/services/simulation-service
- ../../../base/services/sciml-service
- ../../../base/services/skema
- ../../../base/services/knowledge-middleware
patches:
Expand All @@ -39,7 +39,7 @@ patches:
- path: services/model-service/model-service-deployment.yaml
- path: services/pyciemss-service/pyciemss-api-deployment.yaml
- path: services/pyciemss-service/pyciemss-worker-deployment.yaml
- path: services/simulation-service/simulation-service-deployment.yaml
- path: services/sciml-service/sciml-service-deployment.yaml
- path: services/skema/skema-eq2mml-deployment.yaml
- path: services/skema/skema-mathjax-deployment.yaml
- path: services/skema/skema-memgraph-deployment.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: simulation-service
name: sciml-service
spec:
strategy:
type: RollingUpdate
template:
spec:
containers:
- name: simulation-service
- name: sciml-service
env:
- name: SIMSERVICE_TDS_URL
value: http://data-service:3020
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ images:
newTag: 'latest'

# Simulation Service
- name: simulation-service-image
newName: ghcr.io/darpa-askem/simulation-service
- name: sciml-service-image
newName: ghcr.io/darpa-askem/sciml-service
newTag: 'latest'

# PyCIEMSS service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ software.uncharted.terarium/name=mit-proxy ghcr.io/darpa-askem/mit-proxy:latest
software.uncharted.terarium/name=model-service ghcr.io/darpa-askem/model-service:latest
software.uncharted.terarium/name=pyciemss-api ghcr.io/darpa-askem/pyciemss-api:latest
software.uncharted.terarium/name=pyciemss-worker ghcr.io/darpa-askem/pyciemss-worker:latest
software.uncharted.terarium/name=simulation-service ghcr.io/darpa-askem/simulation-service:latest
software.uncharted.terarium/name=sciml-service ghcr.io/darpa-askem/sciml-service:latest
software.uncharted.terarium/name=skema-py ghcr.io/darpa-askem/skema-py:latest
software.uncharted.terarium/name=skema-rs ghcr.io/darpa-askem/skema-rs:latest
software.uncharted.terarium/name=knowledge-middleware-api ghcr.io/darpa-askem/knowledge-middleware-api:latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ spec:
port:
number: 3040

- host: "simulation-service.staging.terarium.ai"
- host: "sciml-service.staging.terarium.ai"
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: simulation-service
name: sciml-service
port:
number: 3030

Expand Down Expand Up @@ -200,7 +200,7 @@ spec:
- "mit-tr.staging.terarium.ai"
- "model-service.staging.terarium.ai"
- "pyciemss.staging.terarium.ai"
- "simulation-service.staging.terarium.ai"
- "sciml-service.staging.terarium.ai"
- "skema-py.staging.terarium.ai"
- "skema-rs.staging.terarium.ai"
- "skema-unified.staging.terarium.ai"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ patches:
- path: services/pyciemss-service/pyciemss-api-deployment.yaml
- path: services/pyciemss-service/pyciemss-api-service.yaml
- path: services/pyciemss-service/pyciemss-worker-deployment.yaml
- path: services/simulation-service/simulation-service-service.yaml
- path: services/sciml-service/sciml-service-service.yaml
- path: services/skema/skema-py-service.yaml
- path: services/skema/skema-rs-service.yaml
- path: services/skema/skema-tr-deployment.yaml
Expand Down Expand Up @@ -129,8 +129,8 @@ images:
newTag: 'latest'

# Simulation Service
- name: simulation-service-image
newName: ghcr.io/darpa-askem/simulation-service
- name: sciml-service-image
newName: ghcr.io/darpa-askem/sciml-service
newTag: 'latest'

# PyCIEMSS service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
apiVersion: v1
kind: Service
metadata:
name: simulation-service
name: sciml-service
spec:
type: NodePort
Loading