From 034fb72310a7cf748108ace52043820a9c625203 Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Tue, 23 Apr 2024 13:34:37 -0400 Subject: [PATCH 1/9] initial cosmos files --- .../services/cosmos/cosmos-deployment.yaml | 33 +++++++++++++++++++ .../base/services/cosmos/cosmos-service.yaml | 22 +++++++++++++ .../base/services/cosmos/kustomization.yaml | 7 ++++ 3 files changed, 62 insertions(+) create mode 100755 kubernetes/base/services/cosmos/cosmos-deployment.yaml create mode 100755 kubernetes/base/services/cosmos/cosmos-service.yaml create mode 100644 kubernetes/base/services/cosmos/kustomization.yaml diff --git a/kubernetes/base/services/cosmos/cosmos-deployment.yaml b/kubernetes/base/services/cosmos/cosmos-deployment.yaml new file mode 100755 index 00000000..731fca38 --- /dev/null +++ b/kubernetes/base/services/cosmos/cosmos-deployment.yaml @@ -0,0 +1,33 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cosmos + labels: + software.uncharted.terarium/name: cosmos + software.uncharted.terarium/component: cosmos + software.uncharted.terarium/service: cosmos + software.uncharted.terarium/part-of: services +spec: + replicas: 1 + selector: + matchLabels: + software.uncharted.terarium/name: cosmos + strategy: + type: Recreate + template: + metadata: + labels: + software.uncharted.terarium/name: cosmos + spec: + containers: + - name: cosmos + image: cosmos-image + imagePullPolicy: Always + ports: + - containerPort: 8089 + resources: {} + imagePullSecrets: + - name: ghcr-cred + restartPolicy: Always +status: {} diff --git a/kubernetes/base/services/cosmos/cosmos-service.yaml b/kubernetes/base/services/cosmos/cosmos-service.yaml new file mode 100755 index 00000000..8667ecf5 --- /dev/null +++ b/kubernetes/base/services/cosmos/cosmos-service.yaml @@ -0,0 +1,22 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: cosmos + labels: + software.uncharted.terarium/name: cosmos + software.uncharted.terarium/component: cosmos + software.uncharted.terarium/service: cosmos + software.uncharted.terarium/part-of: services + annotations: + alb.ingress.kubernetes.io/healthcheck-path: '/ping' +spec: + ports: + - name: 4048-tcp + port: 4048 + protocol: TCP + targetPort: 8089 + selector: + software.uncharted.terarium/name: cosmos +status: + loadBalancer: {} diff --git a/kubernetes/base/services/cosmos/kustomization.yaml b/kubernetes/base/services/cosmos/kustomization.yaml new file mode 100644 index 00000000..47a05c4b --- /dev/null +++ b/kubernetes/base/services/cosmos/kustomization.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: terarium +resources: + - cosmos-deployment.yaml + - cosmos-service.yaml From 106a10ad0e948f3774b811255a7bbe66bd0c0a6a Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Tue, 23 Apr 2024 14:36:47 -0400 Subject: [PATCH 2/9] use cosmos --- .../prod/base/hmi/server/hmi-server-deployment.yaml | 2 ++ .../prod/base/services/cosmos/cosmos-deployment.yaml | 8 ++++++++ .../askem-staging/services/cosmos/cosmos-service.yaml | 7 +++++++ 3 files changed, 17 insertions(+) create mode 100644 kubernetes/overlays/prod/base/services/cosmos/cosmos-deployment.yaml create mode 100755 kubernetes/overlays/prod/overlays/askem-staging/services/cosmos/cosmos-service.yaml 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 7b732314..f8ccd26c 100755 --- a/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml +++ b/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml @@ -21,6 +21,8 @@ spec: value: "http://pyciemss-api:3040" - name: CLIMATE-DATA-SERVICE_URL value: "http://climate-data:8000" + - name: COSMOS-SERVICE_URL + value: "http://cosmos:4048" - name: FUNMAN-SERVICE_URL value: "http://funman:8190" - name: GOOGLE-ANALYTICS-ID diff --git a/kubernetes/overlays/prod/base/services/cosmos/cosmos-deployment.yaml b/kubernetes/overlays/prod/base/services/cosmos/cosmos-deployment.yaml new file mode 100644 index 00000000..df6c342c --- /dev/null +++ b/kubernetes/overlays/prod/base/services/cosmos/cosmos-deployment.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cosmos +spec: + strategy: + type: RollingUpdate diff --git a/kubernetes/overlays/prod/overlays/askem-staging/services/cosmos/cosmos-service.yaml b/kubernetes/overlays/prod/overlays/askem-staging/services/cosmos/cosmos-service.yaml new file mode 100755 index 00000000..f35aa2bd --- /dev/null +++ b/kubernetes/overlays/prod/overlays/askem-staging/services/cosmos/cosmos-service.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: cosmos +spec: + type: NodePort From 1e522c2597fb245d2a29769e1450974fcf865b79 Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Tue, 23 Apr 2024 14:42:39 -0400 Subject: [PATCH 3/9] add cosmos to staging --- kubernetes/overlays/prod/base/kustomization.yaml | 2 ++ .../askem-staging/ingress/private-web-ingress.yaml | 12 ++++++++++++ .../prod/overlays/askem-staging/kustomization.yaml | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/kubernetes/overlays/prod/base/kustomization.yaml b/kubernetes/overlays/prod/base/kustomization.yaml index 0c196275..a29ab3a1 100644 --- a/kubernetes/overlays/prod/base/kustomization.yaml +++ b/kubernetes/overlays/prod/base/kustomization.yaml @@ -8,6 +8,7 @@ resources: - ../../../base/hmi/documentation - ../../../base/hmi/server - ../../../base/services/climate-data + - ../../../base/services/cosmos - ../../../base/services/beaker - ../../../base/services/data-service - ../../../base/services/funman @@ -29,6 +30,7 @@ patches: - path: hmi/server/spicedb-service.yaml - path: keycloak/keycloak-deployment.yaml - path: keycloak/keycloak-service.yaml + - path: services/cosmos/cosmos-deployment.yaml - path: services/beaker/beaker-deployment.yaml - path: services/data-service/data-service-graphdb-deployment.yaml - path: services/climate-data/climate-data-deployment.yaml 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 dc972fb0..84c85318 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 @@ -155,9 +155,21 @@ spec: port: number: 8000 + - host: "cosmos.staging.terarium.ai" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: cosmos + port: + number: 4048 + tls: - hosts: - "app.staging.terarium.ai" + - "cosmos.staging.terarium.ai" - "server.staging.terarium.ai" - "graphdb.staging.terarium.ai" - "documentation.staging.terarium.ai" diff --git a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml index 85b9de84..c5c86454 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml @@ -30,6 +30,7 @@ patches: - path: services/climate-data/climate-data-deployment.yaml - path: services/climate-data/climate-data-service.yaml - path: services/climate-data/climate-data-worker-deployment.yaml + - path: services/cosmos/cosmos-service.yaml - path: services/data-service/data-service-graphdb-service.yaml - path: services/funman/funman-deployment.yaml - path: services/gollm-taskrunner/gollm-taskrunner-deployment.yaml @@ -133,3 +134,8 @@ images: - name: mira-taskrunner-image newName: ghcr.io/darpa-askem/mira-taskrunner newTag: 'latest' + + # mira taskrunner + - name: cosmos-image + newName: ghcr.io/darpa-askem/cosmos-service + newTag: '2024_04_17' From e41ec97f370cc9183e3035006d04b7420cb61e58 Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Thu, 25 Apr 2024 16:02:29 -0400 Subject: [PATCH 4/9] update cosmos --- .../overlays/prod/overlays/askem-staging/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml index c5c86454..ca658e58 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml @@ -138,4 +138,4 @@ images: # mira taskrunner - name: cosmos-image newName: ghcr.io/darpa-askem/cosmos-service - newTag: '2024_04_17' + newTag: 'cpu-2024_04_19' From 1ba3b532fd7930c7ef75b85628cd4d3033135cec Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Wed, 29 May 2024 12:21:42 -0400 Subject: [PATCH 5/9] add to image to prod --- .../prod/overlays/askem-production/kustomization.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml index 36a14955..02c7f45f 100644 --- a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml @@ -31,6 +31,7 @@ patches: - path: services/funman/funman-deployment.yaml - path: services/climate-data/climate-data-deployment.yaml - path: services/climate-data/climate-data-worker-deployment.yaml + - path: services/cosmos/cosmos-service.yaml - path: services/gollm-taskrunner/gollm-taskrunner-deployment.yaml - path: services/pyciemss-service/pyciemss-api-deployment.yaml - path: services/pyciemss-service/pyciemss-worker-deployment.yaml @@ -131,3 +132,7 @@ images: - name: mira-taskrunner-image newName: ghcr.io/darpa-askem/mira-taskrunner newTag: 'latest' + + - name: cosmos-image + newName: ghcr.io/darpa-askem/cosmos-service + newTag: 'cpu-2024_04_19' From 69dafee547dda03ea121ae2df81614afb7264645 Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Fri, 31 May 2024 08:54:15 -0400 Subject: [PATCH 6/9] health check --- .../services/cosmos/cosmos-deployment.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/kubernetes/base/services/cosmos/cosmos-deployment.yaml b/kubernetes/base/services/cosmos/cosmos-deployment.yaml index 731fca38..abff2619 100755 --- a/kubernetes/base/services/cosmos/cosmos-deployment.yaml +++ b/kubernetes/base/services/cosmos/cosmos-deployment.yaml @@ -26,7 +26,23 @@ spec: imagePullPolicy: Always ports: - containerPort: 8089 - resources: {} + readinessProbe: + httpGet: + path: / + port: 8089 + scheme: HTTP + initialDelaySeconds: 5 + periodSeconds: 10 + timeoutSeconds: 5 + livenessProbe: + httpGet: + path: / + port: 8089 + scheme: HTTP + initialDelaySeconds: 5 + periodSeconds: 10 + timeoutSeconds: 5 + resources: {} imagePullSecrets: - name: ghcr-cred restartPolicy: Always From a50ddfd42ebb4ed661e160fd36455ce0a6d3fbe4 Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Fri, 7 Jun 2024 09:15:56 -0400 Subject: [PATCH 7/9] rename comment --- .../overlays/prod/overlays/askem-staging/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml index ca658e58..09a7facd 100644 --- a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml @@ -135,7 +135,7 @@ images: newName: ghcr.io/darpa-askem/mira-taskrunner newTag: 'latest' - # mira taskrunner + # cosmos (xdd) - name: cosmos-image newName: ghcr.io/darpa-askem/cosmos-service newTag: 'cpu-2024_04_19' From 86e36b2d85a40d5dd84f3e5080bd632484e8d37f Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Fri, 7 Jun 2024 09:59:38 -0400 Subject: [PATCH 8/9] add cosmos to dev --- .../askem-dev/ingress/private-web-ingress.yaml | 12 ++++++++++++ .../prod/overlays/askem-dev/kustomization.yaml | 5 +++++ .../askem-dev/services/cosmos/cosmos-service.yaml | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 kubernetes/overlays/prod/overlays/askem-dev/services/cosmos/cosmos-service.yaml 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 85ac4a7a..f58db91c 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 @@ -149,11 +149,23 @@ spec: port: number: 8000 + - host: 'cosmos.dev.terarium.ai' + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: cosmos + port: + number: 4048 + tls: - hosts: - 'app.dev.terarium.ai' - 'beaker.dev.terarium.ai' - 'climate-data.dev.terarium.ai' + - 'cosmos.dev.terarium.ai' - 'documentation.dev.terarium.ai' - 'funman.dev.terarium.ai' - 'graphdb.dev.terarium.ai' diff --git a/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml index 7bc8517c..ad652e77 100644 --- a/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml @@ -128,6 +128,11 @@ images: newName: ghcr.io/darpa-askem/mira-taskrunner newTag: 'latest' + # cosmos (xdd) + - name: cosmos-image + newName: ghcr.io/darpa-askem/cosmos-service + newTag: 'cpu-2024_04_19' + # funman taskrunner - name: funman-taskrunner-image newName: ghcr.io/darpa-askem/funman-taskrunner diff --git a/kubernetes/overlays/prod/overlays/askem-dev/services/cosmos/cosmos-service.yaml b/kubernetes/overlays/prod/overlays/askem-dev/services/cosmos/cosmos-service.yaml new file mode 100644 index 00000000..fa490436 --- /dev/null +++ b/kubernetes/overlays/prod/overlays/askem-dev/services/cosmos/cosmos-service.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: cosmos +spec: + type: ClusterIP From 5d6bc6878a27bd815dd2eb909711777b004d9e4d Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Fri, 7 Jun 2024 10:26:40 -0400 Subject: [PATCH 9/9] corrections --- kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml | 1 + .../overlays/prod/overlays/askem-production/kustomization.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml index ad652e77..29718295 100644 --- a/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml @@ -30,6 +30,7 @@ patches: - path: services/climate-data/climate-data-deployment.yaml - path: services/climate-data/climate-data-service.yaml - path: services/climate-data/climate-data-worker-deployment.yaml + - path: services/cosmos/cosmos-service.yaml - path: services/data-service/data-service-graphdb-service.yaml - path: services/mit/mit-tr-service.yaml - path: services/pyciemss-service/pyciemss-api-deployment.yaml diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml index d7109436..a4c84ec5 100644 --- a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml +++ b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml @@ -30,7 +30,6 @@ patches: - path: services/beaker/beaker-service.yaml - path: services/climate-data/climate-data-deployment.yaml - path: services/climate-data/climate-data-worker-deployment.yaml - - path: services/cosmos/cosmos-service.yaml - path: services/gollm-taskrunner/gollm-taskrunner-deployment.yaml - path: services/pyciemss-service/pyciemss-api-deployment.yaml - path: services/pyciemss-service/pyciemss-worker-deployment.yaml