diff --git a/architecture/system-arch.py b/architecture/system-arch.py index 02944de7..88c66781 100644 --- a/architecture/system-arch.py +++ b/architecture/system-arch.py @@ -86,7 +86,6 @@ with Cluster("Simulation Services"): pyciemss_api = Custom("pyciemss API", "./resources/pnnl.png") pyciemss_worker = Custom("pyciemss Worker", "./resources/pnnl.png") - sciml_service = Custom("SciML Service", "./resources/sciml.png") with Cluster("Knowledge Services"): beaker = Custom("Beaker", "./resources/jataware.jpeg") @@ -128,7 +127,6 @@ beaker >> Edge() << ingress_beaker beaker >> Edge() >> mira beaker >> Edge() >> openai - beaker >> Edge() >> sciml_service climate_data_api >> Edge() >> climate_data_worker climate_data_worker >> Edge() >> esgf climate_data_worker >> Edge() >> openai @@ -164,7 +162,6 @@ hmi_server >> Edge() >> pyciemss_api hmi_server >> Edge() >> redis hmi_server >> Edge() >> s3 - hmi_server >> Edge() >> sciml_service hmi_server >> Edge() >> skema_rs hmi_server >> Edge() >> skema_tr hmi_server >> Edge() >> skema_unified @@ -183,7 +180,6 @@ pyciemss_worker >> Edge() >> hmi_server pyciemss_worker >> Edge() >> message_queue pyciemss_worker >> Edge() >> redis - sciml_service >> Edge() >> message_queue skema_unified >> Edge() >> mit_tr skema_unified >> Edge() >> skema_rs text_extraction_taskrunner >> Edge() >> message_queue diff --git a/kubernetes/base/services/sciml-service/kustomization.yaml b/kubernetes/base/services/sciml-service/kustomization.yaml deleted file mode 100644 index 3a58c565..00000000 --- a/kubernetes/base/services/sciml-service/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: terarium -resources: - - sciml-service-deployment.yaml - - sciml-service-service.yaml diff --git a/kubernetes/base/services/sciml-service/sciml-service-deployment.yaml b/kubernetes/base/services/sciml-service/sciml-service-deployment.yaml deleted file mode 100755 index 3027c747..00000000 --- a/kubernetes/base/services/sciml-service/sciml-service-deployment.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sciml-service - labels: - software.uncharted.terarium/name: sciml-service - software.uncharted.terarium/component: server - software.uncharted.terarium/service: sciml-service - software.uncharted.terarium/part-of: services -spec: - replicas: 1 - selector: - matchLabels: - software.uncharted.terarium/name: sciml-service - strategy: - type: Recreate - template: - metadata: - labels: - software.uncharted.terarium/name: sciml-service - spec: - containers: - - name: sciml-service - image: sciml-service-image - imagePullPolicy: Always - ports: - - containerPort: 8080 - resources: {} - livenessProbe: - httpGet: - path: /health - port: 8080 - initialDelaySeconds: 3 - periodSeconds: 3 - startupProbe: - httpGet: - path: /health - port: 8080 - failureThreshold: 30 - periodSeconds: 30 - imagePullSecrets: - - name: ghcr-cred - restartPolicy: Always -status: {} diff --git a/kubernetes/base/services/sciml-service/sciml-service-service.yaml b/kubernetes/base/services/sciml-service/sciml-service-service.yaml deleted file mode 100755 index 69e4e8b2..00000000 --- a/kubernetes/base/services/sciml-service/sciml-service-service.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: sciml-service - labels: - software.uncharted.terarium/name: sciml-service - software.uncharted.terarium/component: server - software.uncharted.terarium/service: sciml-service - software.uncharted.terarium/part-of: services -spec: - ports: - - name: 3030-tcp - port: 3030 - protocol: TCP - targetPort: 8080 - selector: - software.uncharted.terarium/name: sciml-service -status: - loadBalancer: {} diff --git a/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml b/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml index 2194187c..2338d1b3 100755 --- a/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml +++ b/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml @@ -40,8 +40,6 @@ spec: secretKeyRef: name: chat-gpt-secrets key: chatgptkey - - name: SIMULATION-SERVICE_URL - value: 'http://sciml-service:3030' - name: SKEMA-PY_URL value: 'http://skema-py:4041' - name: SKEMA-RS_URL diff --git a/kubernetes/overlays/prod/base/kustomization.yaml b/kubernetes/overlays/prod/base/kustomization.yaml index 9af8fdb3..c11eefbc 100644 --- a/kubernetes/overlays/prod/base/kustomization.yaml +++ b/kubernetes/overlays/prod/base/kustomization.yaml @@ -17,7 +17,6 @@ resources: - ../../../base/services/mit - ../../../base/services/pyciemss-service - ../../../base/services/redis - - ../../../base/services/sciml-service - ../../../base/services/skema - ../../../base/services/text-extraction-taskrunner - services/beaker/beaker-persistent-volume.yaml @@ -43,7 +42,6 @@ patches: - path: services/pyciemss-service/pyciemss-api-deployment.yaml - path: services/pyciemss-service/pyciemss-worker-deployment.yaml - path: services/redis/redis-deployment.yaml - - path: services/sciml-service/sciml-service-deployment.yaml - path: services/skema/skema-mathjax-deployment.yaml - path: services/skema/skema-memgraph-deployment.yaml - path: services/skema/skema-rs-deployment.yaml diff --git a/kubernetes/overlays/prod/base/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/base/services/beaker/beaker-deployment.yaml index ddcaec9b..764b2aa1 100644 --- a/kubernetes/overlays/prod/base/services/beaker/beaker-deployment.yaml +++ b/kubernetes/overlays/prod/base/services/beaker/beaker-deployment.yaml @@ -20,8 +20,6 @@ spec: value: 'false' - name: ENABLE_CHECKPOINTS value: 'false' - - name: SIMULATION_SCHEDULER_URL - value: http://sciml-service:3030 - name: HMI_SERVER_URL value: http://hmi-server:3000 - name: MIRA_REST_URL diff --git a/kubernetes/overlays/prod/base/services/sciml-service/sciml-service-deployment.yaml b/kubernetes/overlays/prod/base/services/sciml-service/sciml-service-deployment.yaml deleted file mode 100755 index 615762ac..00000000 --- a/kubernetes/overlays/prod/base/services/sciml-service/sciml-service-deployment.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sciml-service -spec: - strategy: - type: RollingUpdate - template: - spec: - containers: - - name: sciml-service - env: - - name: SIMSERVICE_TDS_URL - value: http://hmi-server:3000 - - name: SIMSERVICE_TDS_USER - valueFrom: - secretKeyRef: - name: keycloak-creds - key: service_username - - name: SIMSERVICE_TDS_PASSWORD - valueFrom: - secretKeyRef: - name: keycloak-creds - key: service_password - - name: SIMSERVICE_RABBITMQ_ENABLED - value: 'true' - - name: SIMSERVICE_RABBITMQ_HOST - valueFrom: - secretKeyRef: - name: mq-creds - key: host - - name: SIMSERVICE_RABBITMQ_PORT - valueFrom: - secretKeyRef: - name: mq-creds - key: port - - name: SIMSERVICE_RABBITMQ_LOGIN - valueFrom: - secretKeyRef: - name: mq-creds - key: username - - name: SIMSERVICE_RABBITMQ_PASSWORD - valueFrom: - secretKeyRef: - name: mq-creds - key: password - - name: SIMSERVICE_RABBITMQ_ROUTE - value: 'scimlQueue' diff --git a/kubernetes/overlays/prod/overlays/askem-dev/check-latest/images.txt b/kubernetes/overlays/prod/overlays/askem-dev/check-latest/images.txt index d497b123..58c15e3b 100644 --- a/kubernetes/overlays/prod/overlays/askem-dev/check-latest/images.txt +++ b/kubernetes/overlays/prod/overlays/askem-dev/check-latest/images.txt @@ -10,7 +10,6 @@ software.uncharted.terarium/name=mira-taskrunner ghcr.io/darpa-askem/mira-taskru software.uncharted.terarium/name=mit-tr ghcr.io/darpa-askem/mit-tr: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=sciml-service ghcr.io/darpa-askem/sciml-service:latest software.uncharted.terarium/name=skema-mathjax ghcr.io/darpa-askem/skema-py:latest software.uncharted.terarium/name=skema-rs ghcr.io/darpa-askem/skema-rs:latest software.uncharted.terarium/name=skema-unified ghcr.io/darpa-askem/skema-py:latest diff --git a/kubernetes/overlays/prod/overlays/askem-dev/ingress/private-web-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-dev/ingress/private-web-ingress.yaml index 8484e04e..bdfbf96c 100644 --- a/kubernetes/overlays/prod/overlays/askem-dev/ingress/private-web-ingress.yaml +++ b/kubernetes/overlays/prod/overlays/askem-dev/ingress/private-web-ingress.yaml @@ -100,17 +100,6 @@ spec: port: number: 6379 - - host: 'sciml-service.dev.terarium.ai' - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: sciml-service - port: - number: 3030 - - host: 'skema-rs.dev.terarium.ai' http: paths: @@ -168,7 +157,6 @@ spec: - 'mit-tr.dev.terarium.ai' - 'pyciemss.dev.terarium.ai' - 'redis.dev.terarium.ai' - - 'sciml-service.dev.terarium.ai' - 'server.dev.terarium.ai' - 'skema-rs.dev.terarium.ai' - 'skema-unified.dev.terarium.ai' diff --git a/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml index 2879b92a..db4574b7 100644 --- a/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml @@ -38,8 +38,6 @@ patches: - path: services/pyciemss-service/pyciemss-api-service.yaml - path: services/pyciemss-service/pyciemss-worker-deployment.yaml - path: services/redis/redis-service.yaml - - path: services/sciml-service/sciml-service-deployment.yaml - - path: services/sciml-service/sciml-service-service.yaml - path: services/skema/skema-rs-service.yaml - path: services/skema/skema-unified-service.yaml configMapGenerator: @@ -97,11 +95,6 @@ images: newName: ghcr.io/darpa-askem/mit-tr newTag: 'latest' - # Simulation Service - - name: sciml-service-image - newName: ghcr.io/darpa-askem/sciml-service - newTag: 'latest' - # PyCIEMSS service - name: pyciemss-api-image newName: ghcr.io/darpa-askem/pyciemss-api diff --git a/kubernetes/overlays/prod/overlays/askem-dev/services/sciml-service/sciml-service-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-dev/services/sciml-service/sciml-service-deployment.yaml deleted file mode 100755 index 7b967def..00000000 --- a/kubernetes/overlays/prod/overlays/askem-dev/services/sciml-service/sciml-service-deployment.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sciml-service -spec: - strategy: - type: RollingUpdate - template: - spec: - containers: - - name: sciml-service - env: - - name: SIMSERVICE_RABBITMQ_SSL - value: 'false' diff --git a/kubernetes/overlays/prod/overlays/askem-dev/services/sciml-service/sciml-service-service.yaml b/kubernetes/overlays/prod/overlays/askem-dev/services/sciml-service/sciml-service-service.yaml deleted file mode 100755 index f3bbd1ae..00000000 --- a/kubernetes/overlays/prod/overlays/askem-dev/services/sciml-service/sciml-service-service.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: sciml-service -spec: - type: NodePort diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml index e76919a9..fb4c173a 100644 --- a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml @@ -31,7 +31,6 @@ patches: - path: services/gollm-taskrunner/gollm-taskrunner-deployment.yaml - path: services/pyciemss-service/pyciemss-api-deployment.yaml - path: services/pyciemss-service/pyciemss-worker-deployment.yaml - - path: services/sciml-service/sciml-service-deployment.yaml images: # Terarium HMI - name: hmi-client-image @@ -73,11 +72,6 @@ images: newName: ghcr.io/darpa-askem/mit-tr newTag: '1.0.0' - # Simulation Service - - name: sciml-service-image - newName: ghcr.io/darpa-askem/sciml-service - newTag: '1.2.0' - # PyCIEMSS service - name: pyciemss-api-image newName: ghcr.io/darpa-askem/pyciemss-api diff --git a/kubernetes/overlays/prod/overlays/askem-production/services/sciml-service/sciml-service-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-production/services/sciml-service/sciml-service-deployment.yaml deleted file mode 100755 index 7b967def..00000000 --- a/kubernetes/overlays/prod/overlays/askem-production/services/sciml-service/sciml-service-deployment.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sciml-service -spec: - strategy: - type: RollingUpdate - template: - spec: - containers: - - name: sciml-service - env: - - name: SIMSERVICE_RABBITMQ_SSL - value: 'false' 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 d497b123..58c15e3b 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/check-latest/images.txt +++ b/kubernetes/overlays/prod/overlays/askem-staging/check-latest/images.txt @@ -10,7 +10,6 @@ software.uncharted.terarium/name=mira-taskrunner ghcr.io/darpa-askem/mira-taskru software.uncharted.terarium/name=mit-tr ghcr.io/darpa-askem/mit-tr: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=sciml-service ghcr.io/darpa-askem/sciml-service:latest software.uncharted.terarium/name=skema-mathjax ghcr.io/darpa-askem/skema-py:latest software.uncharted.terarium/name=skema-rs ghcr.io/darpa-askem/skema-rs:latest software.uncharted.terarium/name=skema-unified ghcr.io/darpa-askem/skema-py: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 761ef95f..f83af760 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 @@ -102,24 +102,6 @@ spec: port: number: 6379 - - host: 'sciml-service.staging.terarium.ai' - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: ssl-redirect - port: - name: use-annotation - - path: / - pathType: Prefix - backend: - service: - name: sciml-service - port: - number: 3030 - - host: 'skema-rs.staging.terarium.ai' http: paths: @@ -221,7 +203,6 @@ spec: - 'mit-tr.staging.terarium.ai' - 'pyciemss.staging.terarium.ai' - 'redis.staging.terarium.ai' - - 'sciml-service.staging.terarium.ai' - 'server.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 919b77ca..7fbdc720 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml @@ -37,8 +37,6 @@ patches: - path: services/pyciemss-service/pyciemss-api-service.yaml - path: services/pyciemss-service/pyciemss-worker-deployment.yaml - path: services/redis/redis-service.yaml - - path: services/sciml-service/sciml-service-deployment.yaml - - path: services/sciml-service/sciml-service-service.yaml - path: services/skema/skema-rs-service.yaml - path: services/skema/skema-unified-service.yaml images: @@ -82,11 +80,6 @@ images: newName: ghcr.io/darpa-askem/mit-tr newTag: 'latest' - # Simulation Service - - name: sciml-service-image - newName: ghcr.io/darpa-askem/sciml-service - newTag: 'latest' - # PyCIEMSS service - name: pyciemss-api-image newName: ghcr.io/darpa-askem/pyciemss-api diff --git a/kubernetes/overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-deployment.yaml deleted file mode 100755 index 7b967def..00000000 --- a/kubernetes/overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-deployment.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sciml-service -spec: - strategy: - type: RollingUpdate - template: - spec: - containers: - - name: sciml-service - env: - - name: SIMSERVICE_RABBITMQ_SSL - value: 'false' diff --git a/kubernetes/overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-service.yaml b/kubernetes/overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-service.yaml deleted file mode 100755 index f3bbd1ae..00000000 --- a/kubernetes/overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-service.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: sciml-service -spec: - type: NodePort