From db60016a2de7075e7f172a2816bb05e0b3dfbf3a Mon Sep 17 00:00:00 2001 From: Five Grant <5@fivegrant.com> Date: Tue, 10 Oct 2023 08:52:15 -0500 Subject: [PATCH] Rename 'simulation-service' to 'sciml-service' (#306) --- docker/components/staging/vars.env | 2 +- .../base/services/beaker/beaker-deployment.yaml | 2 +- .../services/simulation-service/kustomization.yaml | 4 ++-- .../simulation-service-deployment.yaml | 12 ++++++------ .../simulation-service-service.yaml | 6 +++--- kubernetes/overlays/prod/base/kustomization.yaml | 4 ++-- .../simulation-service-deployment.yaml | 4 ++-- .../overlays/askem-production/kustomization.yaml | 4 ++-- .../overlays/askem-staging/check-latest/images.txt | 2 +- .../askem-staging/ingress/private-web-ingress.yaml | 6 +++--- .../prod/overlays/askem-staging/kustomization.yaml | 6 +++--- .../simulation-service-service.yaml | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docker/components/staging/vars.env b/docker/components/staging/vars.env index acaeed68..761ec868 100644 --- a/docker/components/staging/vars.env +++ b/docker/components/staging/vars.env @@ -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 diff --git a/kubernetes/base/services/beaker/beaker-deployment.yaml b/kubernetes/base/services/beaker/beaker-deployment.yaml index 6b59d182..d72e7bb2 100644 --- a/kubernetes/base/services/beaker/beaker-deployment.yaml +++ b/kubernetes/base/services/beaker/beaker-deployment.yaml @@ -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: diff --git a/kubernetes/base/services/simulation-service/kustomization.yaml b/kubernetes/base/services/simulation-service/kustomization.yaml index cc40a843..3a58c565 100644 --- a/kubernetes/base/services/simulation-service/kustomization.yaml +++ b/kubernetes/base/services/simulation-service/kustomization.yaml @@ -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 diff --git a/kubernetes/base/services/simulation-service/simulation-service-deployment.yaml b/kubernetes/base/services/simulation-service/simulation-service-deployment.yaml index c96c2ca4..a425b20b 100755 --- a/kubernetes/base/services/simulation-service/simulation-service-deployment.yaml +++ b/kubernetes/base/services/simulation-service/simulation-service-deployment.yaml @@ -2,9 +2,9 @@ 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 @@ -12,17 +12,17 @@ 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: {} diff --git a/kubernetes/base/services/simulation-service/simulation-service-service.yaml b/kubernetes/base/services/simulation-service/simulation-service-service.yaml index 7f3d871f..23d3f291 100755 --- a/kubernetes/base/services/simulation-service/simulation-service-service.yaml +++ b/kubernetes/base/services/simulation-service/simulation-service-service.yaml @@ -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 @@ -15,6 +15,6 @@ spec: protocol: TCP targetPort: 8080 selector: - software.uncharted.terarium/name: simulation-service + software.uncharted.terarium/name: sciml-service status: loadBalancer: {} diff --git a/kubernetes/overlays/prod/base/kustomization.yaml b/kubernetes/overlays/prod/base/kustomization.yaml index d47687fd..32907900 100644 --- a/kubernetes/overlays/prod/base/kustomization.yaml +++ b/kubernetes/overlays/prod/base/kustomization.yaml @@ -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: @@ -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 diff --git a/kubernetes/overlays/prod/base/services/simulation-service/simulation-service-deployment.yaml b/kubernetes/overlays/prod/base/services/simulation-service/simulation-service-deployment.yaml index b84b67c4..3f45dd44 100755 --- a/kubernetes/overlays/prod/base/services/simulation-service/simulation-service-deployment.yaml +++ b/kubernetes/overlays/prod/base/services/simulation-service/simulation-service-deployment.yaml @@ -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 diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml index 23ffa579..8baeb108 100644 --- a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml @@ -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 diff --git a/kubernetes/overlays/prod/overlays/askem-staging/check-latest/images.txt b/kubernetes/overlays/prod/overlays/askem-staging/check-latest/images.txt index f1c88a79..7a5d0491 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/check-latest/images.txt +++ b/kubernetes/overlays/prod/overlays/askem-staging/check-latest/images.txt @@ -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 diff --git a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml index 38ab175a..bf3b0f50 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml +++ b/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml @@ -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 @@ -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" diff --git a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml index df725283..3a247659 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml @@ -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 @@ -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 diff --git a/kubernetes/overlays/prod/overlays/askem-staging/services/simulation-service/simulation-service-service.yaml b/kubernetes/overlays/prod/overlays/askem-staging/services/simulation-service/simulation-service-service.yaml index dbb27bc1..f3bbd1ae 100755 --- a/kubernetes/overlays/prod/overlays/askem-staging/services/simulation-service/simulation-service-service.yaml +++ b/kubernetes/overlays/prod/overlays/askem-staging/services/simulation-service/simulation-service-service.yaml @@ -2,6 +2,6 @@ apiVersion: v1 kind: Service metadata: - name: simulation-service + name: sciml-service spec: type: NodePort