switch to kube redis and minor cleanup

DARPA-ASKEM · Jun 3, 2024 · 950c56e · 950c56e
1 parent 34af56f
commit 950c56e
Show file tree

Hide file tree

Showing 47 changed files with 198 additions and 194 deletions.
diff --git a/kubernetes/base/services/climate-data/climate-data-worker-deployment.yaml b/kubernetes/base/services/climate-data/climate-data-worker-deployment.yaml
@@ -26,12 +26,12 @@ spec:
  imagePullPolicy: Always
  command: ['poetry']
  args: [
- "run",
- "rq",
- "worker-pool",
- "subset",
- "preview",
- "-n5"
+ 'run',
+ 'rq',
+ 'worker-pool',
+ 'subset',
+ 'preview',
+ '-n5'
  ]
  resources: {}
  imagePullSecrets:

diff --git a/kubernetes/base/services/skema/skema-mathjax-deployment.yaml b/kubernetes/base/services/skema/skema-mathjax-deployment.yaml
@@ -29,9 +29,9 @@ spec:
  workingDir: /app/skema/img2mml/data_generation
  env:
  - name: SKEMA_MATHJAX_HOST
- value: "0.0.0.0"
+ value: '0.0.0.0'
  - name: SKEMA_MATHJAX_PORT
- value: "8031"
+ value: '8031'
  ports:
  - containerPort: 8031
  resources: {}

diff --git a/kubernetes/base/services/skema/skema-rs-deployment.yaml b/kubernetes/base/services/skema/skema-rs-deployment.yaml
@@ -27,13 +27,13 @@ spec:
  command: ['cargo']
  env:
  - name: SKEMA_RS_HOST
- value: "0.0.0.0"
+ value: '0.0.0.0'
  - name: SKEMA_RS_PORT
- value: "8080"
+ value: '8080'
  - name: SKEMA_GRPAH_DB_HOST
- value: "skema-memgraph"
+ value: 'skema-memgraph'
  - name: SKEMA_GRPAH_DB_PORT
- value: "7687"
+ value: '7687'
  args:
  - 'run'
  - '--release'

diff --git a/kubernetes/base/utils/waitfor-role.yaml b/kubernetes/base/utils/waitfor-role.yaml
@@ -9,6 +9,6 @@ metadata:
  software.uncharted.terarium/service: waitfor
  software.uncharted.terarium/part-of: utils
 rules:
- - apiGroups: [""]
- resources: ["services", "pods", "jobs"]
- verbs: ["get", "watch", "list"]
+ - apiGroups: ['']
+ resources: ['services', 'pods', 'jobs']
+ verbs: ['get', 'watch', 'list']
diff --git a/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml b/kubernetes/overlays/prod/base/hmi/server/hmi-server-deployment.yaml
@@ -18,44 +18,44 @@ spec:
  name: adobe-api-key
  key: key
  - name: CIEMSS-SERVICE_URL
- value: "http://pyciemss-api:3040"
+ value: 'http://pyciemss-api:3040'
  - name: CLIMATE-DATA-SERVICE_URL
- value: "http://climate-data:8000"
+ value: 'http://climate-data:8000'
  - name: GOOGLE-ANALYTICS-ID
  valueFrom:
  secretKeyRef:
  name: logging-creds
  key: google-id
  - name: MIT-PROXY_URL
- value: "http://mit-tr:4046"
+ value: 'http://mit-tr:4046'
  - name: MIT-OPENAI-API-KEY
  valueFrom:
  secretKeyRef:
  name: chat-gpt-secrets
  key: chatgptkey
  - name: SIMULATION-SERVICE_URL
- value: "http://sciml-service:3030"
+ value: 'http://sciml-service:3030'
  - name: SKEMA-PY_URL
- value: "http://skema-py:4041"
+ value: 'http://skema-py:4041'
  - name: SKEMA-RS_URL
- value: "http://skema-rs:4040"
+ value: 'http://skema-rs:4040'
  - name: SKEMA-UNIFIED_URL
- value: "http://skema-unified:4045"
+ value: 'http://skema-unified:4045'
  - name: SPICEDB_SHARED-KEY
  value: 'staging'
  - name: SPICEDB_TARGET
  value: 'spicedb:50051'
  - name: SPICEDB_LAUNCHMODE
  value: 'PLAINTEXT'
  - name: SPRING_PROFILES_ACTIVE
- value: "default"
+ value: 'default'
  - name: SPRING_DATASOURCE_URL
  valueFrom:
  secretKeyRef:
  name: rds-creds
  key: fqdn
  - name: SPRING_NEO4J_URI
- value: "bolt://data-service-graphdb:7687"
+ value: 'bolt://data-service-graphdb:7687'
  - name: SPRING_NEO4J_AUTHENTICATION_USERNAME
  valueFrom:
  secretKeyRef:
@@ -67,11 +67,11 @@ spec:
  name: neo4j-auth
  key: password
  - name: SPRING_DATASOURCE_INITIALIZE
- value: "true"
+ value: 'true'
  - name: SPRING_FLYWAY_ENABLED
- value: "true"
+ value: 'true'
  - name: SPRING_JPA_HIBERNATE_DDL-AUTO
- value: "update"
+ value: 'update'
  - name: SPRING_RABBITMQ_ADDRESSES
  valueFrom:
  secretKeyRef:
@@ -183,7 +183,7 @@ spec:
  name: data-service-s3
  key: aws-client-name
  - name: TERARIUM_ELASTICSEARCH_AUTH-ENABLED
- value: "true"
+ value: 'true'
  - name: TERARIUM_ELASTICSEARCH_USERNAME
  valueFrom:
  secretKeyRef:

diff --git a/kubernetes/overlays/prod/base/hmi/server/spicedb-deployment.yaml b/kubernetes/overlays/prod/base/hmi/server/spicedb-deployment.yaml
@@ -14,7 +14,7 @@ spec:
  - --datastore-conn-uri=postgres://$(DB_USERNAME):$(DB_PASSWORD)@$(DB_URL_HOST)/spicedb?sslmode=disable
  env:
  - name: SPICEDB_DATASTORE_ENGINE
- value: "postgres"
+ value: 'postgres'
  - name: SPICEDB_GRPC_PRESHARED_KEY
  value: 'staging'
  - name: DB_URL_HOST
@@ -33,7 +33,7 @@ spec:
  name: rds-creds
  key: password
  - name: SPICEDB_HTTP_ENABLED
- value: "true"
+ value: 'true'
  initContainers:
  - name: spicedb-migrate
  image: spicedb-image
@@ -45,7 +45,7 @@ spec:
  - --datastore-conn-uri=postgres://$(DB_USERNAME):$(DB_PASSWORD)@$(DB_URL_HOST)/spicedb?sslmode=disable
  env:
  - name: SPICEDB_DATASTORE_ENGINE
- value: "postgres"
+ value: 'postgres'
  - name: SPICEDB_GRPC_PRESHARED_KEY
  value: 'staging'
  - name: DB_URL_HOST

diff --git a/kubernetes/overlays/prod/base/keycloak/keycloak-deployment.yaml b/kubernetes/overlays/prod/base/keycloak/keycloak-deployment.yaml
@@ -42,7 +42,7 @@ spec:
  name: rds-creds
  key: password
  - name: KC_HOSTNAME_PORT
- value: "443"
+ value: '443'
  - name: KC_HOSTNAME_ADMIN_URL
  value: https://localhost:8443
  - name: KC_HOSTNAME_PATH
@@ -69,7 +69,7 @@ spec:
  - --dir
  - /data
  - --override
- - "false"
+ - 'false'
  env:
  - name: PROXY_ADDRESS_FORWARDING
  value: '"true"'

diff --git a/kubernetes/overlays/prod/base/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/base/services/beaker/beaker-deployment.yaml
@@ -11,15 +11,15 @@ spec:
  containers:
  - name: beaker
  volumeMounts:
- - mountPath: "/home/jupyter/workspace"
+ - mountPath: '/home/jupyter/workspace'
  name: beaker-pv-storage
  env:
  - name: TOOL_ENABLED_ASK_USER
- value: "false"
+ value: 'false'
  - name: TOOL_ENABLED_RUN_CODE
- value: "false"
+ value: 'false'
  - name: ENABLE_CHECKPOINTS
- value: "false"
+ value: 'false'
  - name: SIMULATION_SCHEDULER_URL
  value: http://sciml-service:3030
  - name: HMI_SERVER_URL
@@ -45,7 +45,7 @@ spec:
  runAsUser: 1000
  runAsGroup: 1000
  fsGroup: 1000
- fsGroupChangePolicy: "OnRootMismatch"
+ fsGroupChangePolicy: 'OnRootMismatch'
  volumes:
  - name: beaker-pv-storage
  persistentVolumeClaim:

diff --git a/kubernetes/overlays/prod/base/services/beaker/beaker-persistent-volume.yaml b/kubernetes/overlays/prod/base/services/beaker/beaker-persistent-volume.yaml
@@ -4,7 +4,7 @@ kind: PersistentVolume
 metadata:
  name: beaker-pv-volume
  annotations:
- pv.beta.kubernetes.io/gid: "1000"
+ pv.beta.kubernetes.io/gid: '1000'
  labels:
  type: local
 spec:
@@ -14,4 +14,4 @@ spec:
  accessModes:
  - ReadWriteOnce
  hostPath:
- path: "/mnt/beaker"
+ path: '/mnt/beaker'
diff --git a/kubernetes/overlays/prod/base/services/climate-data/climate-data-deployment.yaml b/kubernetes/overlays/prod/base/services/climate-data/climate-data-deployment.yaml
@@ -24,17 +24,17 @@ spec:
  name: keycloak-creds
  key: service_password
  - name: ESGF_URL
- value: "https://esgf-node.ornl.gov/esg-search"
+ value: 'https://esgf-node.ornl.gov/esg-search'
  - name: REDIS_PORT
- value: "6379"
+ value: '6379'
  - name: MINIO_URL
- value: "http://minio:9000"
+ value: 'http://minio:9000'
  - name: MINIO_USER
- value: "miniouser"
+ value: 'miniouser'
  - name: MINIO_PASS
- value: "miniopass"
+ value: 'miniopass'
  - name: MINIO_BUCKET_NAME
- value: "climate-data-test-bucket"
+ value: 'climate-data-test-bucket'
  - name: OPENAI_API_KEY
  valueFrom:
  secretKeyRef:

diff --git a/kubernetes/overlays/prod/base/services/climate-data/climate-data-worker-deployment.yaml b/kubernetes/overlays/prod/base/services/climate-data/climate-data-worker-deployment.yaml
@@ -24,17 +24,17 @@ spec:
  name: keycloak-creds
  key: service_password
  - name: ESGF_URL
- value: "https://esgf-node.llnl.gov/esg-search"
+ value: 'https://esgf-node.llnl.gov/esg-search'
  - name: REDIS_PORT
- value: "6379"
+ value: '6379'
  - name: MINIO_URL
- value: "http://minio:9000"
+ value: 'http://minio:9000'
  - name: MINIO_USER
- value: "miniouser"
+ value: 'miniouser'
  - name: MINIO_PASS
- value: "miniopass"
+ value: 'miniopass'
  - name: MINIO_BUCKET_NAME
- value: "climate-data-test-bucket"
+ value: 'climate-data-test-bucket'
  - name: OPENAI_API_KEY
  valueFrom:
  secretKeyRef:

diff --git a/kubernetes/overlays/prod/base/services/data-service/data-service-graphdb-deployment.yaml b/kubernetes/overlays/prod/base/services/data-service/data-service-graphdb-deployment.yaml
@@ -14,7 +14,7 @@ spec:
  - name: NEO4J_PLUGINS
  value: '["apoc"]'
  - name: apoc.import.file.enabled
- value: "true"
+ value: 'true'
  - name: NEO4J_AUTH
  value: none
  - name: NEO4J_dbms_memory_pagecache_size

diff --git a/kubernetes/overlays/prod/base/services/funman-taskrunner/funman-taskrunner-deployment.yaml b/kubernetes/overlays/prod/base/services/funman-taskrunner/funman-taskrunner-deployment.yaml
@@ -28,4 +28,4 @@ spec:
  name: mq-creds
  key: password
  - name: TERARIUM_TASKRUNNER_REQUEST-TYPE
- value: "funman"
+ value: 'funman'
diff --git a/kubernetes/overlays/prod/base/services/gollm-taskrunner/gollm-taskrunner-deployment.yaml b/kubernetes/overlays/prod/base/services/gollm-taskrunner/gollm-taskrunner-deployment.yaml
@@ -33,4 +33,4 @@ spec:
  name: mq-creds
  key: password
  - name: TERARIUM_TASKRUNNER_REQUEST-TYPE
- value: "gollm"
+ value: 'gollm'
diff --git a/kubernetes/overlays/prod/base/services/mira-taskrunner/mira-taskrunner-deployment.yaml b/kubernetes/overlays/prod/base/services/mira-taskrunner/mira-taskrunner-deployment.yaml
@@ -28,4 +28,4 @@ spec:
  name: mq-creds
  key: password
  - name: TERARIUM_TASKRUNNER_REQUEST-TYPE
- value: "mira"
+ value: 'mira'
diff --git a/kubernetes/overlays/prod/overlays/askem-dev/check-latest/check-latest-cronjob.yaml b/kubernetes/overlays/prod/overlays/askem-dev/check-latest/check-latest-cronjob.yaml
@@ -5,7 +5,7 @@ metadata:
  name: check-latest
  namespace: terarium
 spec:
- schedule: "*/5 * * * *"
+ schedule: '*/5 * * * *'
  jobTemplate:
  spec:
  template:

diff --git a/kubernetes/overlays/prod/overlays/askem-dev/hmi/server/hmi-server-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-dev/hmi/server/hmi-server-deployment.yaml
@@ -10,19 +10,19 @@ spec:
  - name: hmi-server
  env:
  - name: TGPT_BASE_URL
- value: "/beaker/"
+ value: '/beaker/'
  - name: TGPT_APP_URL
- value: "/beaker/"
+ value: '/beaker/'
  - name: TGPT_WS_URL
- value: "ws://app.dev.terarium.ai/beaker_ws/"
+ value: 'ws://app.dev.terarium.ai/beaker_ws/'
  - name: TERARIUM_KEYCLOAK_URL
- value: "https://keycloak.dev.terarium.ai"
+ value: 'https://keycloak.dev.terarium.ai'
  - name: SPRING_DATA_REDIS_URL
- value: "redis://redis:6379"
+ value: 'redis://redis:6379'
  - name: TERARIUM_ELASTICSEARCH_URL
- value: "https://elasticsearch.dev.terarium.ai"
+ value: 'https://elasticsearch.dev.terarium.ai'
  - name: TERARIUM_SWAGGER_SERVER-URL
- value: "https://server.dev.terarium.ai"
+ value: 'https://server.dev.terarium.ai'
  - name: LOGGING_LEVEL_ROOT
  value: INFO
  - name: AWS-URL
@@ -31,8 +31,8 @@ spec:
  name: data-service-s3
  key: aws-url
  - name: SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_KEYCLOAK_ISSUER-URI
- value: "https://keycloak.dev.terarium.ai/realms/terarium"
+ value: 'https://keycloak.dev.terarium.ai/realms/terarium'
  - name: SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KEYCLOAK_CLIENT-ID
- value: "app"
+ value: 'app'
  - name: SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER-URI
- value: "https://keycloak.dev.terarium.ai/realms/terarium"
+ value: 'https://keycloak.dev.terarium.ai/realms/terarium'
diff --git a/kubernetes/overlays/prod/overlays/askem-dev/ingress/private-web-grpc-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-dev/ingress/private-web-grpc-ingress.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
  ingressClassName: nginx
  rules:
- - host: "spicedb.dev.terarium.ai"
+ - host: 'spicedb.dev.terarium.ai'
  http:
  paths:
  - backend:
@@ -18,5 +18,5 @@ spec:
  pathType: Prefix
  tls:
  - hosts:
- - "spicedb.dev.terarium.ai"
+ - 'spicedb.dev.terarium.ai'
  secretName: terarium-dev-tls