Removed Dejavu

- removed Dejavu since it is not used
bcgov · Nov 26, 2024 · b2f8567 · b2f8567
1 parent b50a3d9
commit b2f8567
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 226 deletions.
diff --git a/db/elasticsearch/dejavu/Dockerfile b/db/elasticsearch/dejavu/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -122,26 +122,6 @@ services:
     #   retries: 3
     #   start_period: 15s
 
-  dejavu:
-    image: tno:dejavu
-    profiles:
-      - all
-      - utility
-      - elastic
-      - service
-    restart: "no"
-    container_name: tno-dejavu
-    build:
-      context: db/elasticsearch/dejavu
-    ports:
-      - ${ELASTIC_DEJAVU_HTTP_PORT:-40005}:1358
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    links:
-      - elastic
-    networks:
-      - tno
-
   ####################### API #######################
   api:
     image: tno:api

diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
@@ -193,7 +193,6 @@ Nginx provides a reverse proxy, which handles communication with the API.
 | Kafka API          | rest-proxy | [http://localhost:40104](http://localhost:40104)  |
 | Kafka Kowl         | kowl       | [http://localhost:40180](http://localhost:40180)  |
 | Elasticsearch      | elastic    | [http://localhost:40003](http://localhost:40003)  |
-| Dejavu             | dejavu     | [http://localhost:40005](http://localhost:40005)  |
 
 Once the core containers are running you can then start up the other services and utilities.
 Locally you will probably never want everything running at the same time.

diff --git a/openshift/kustomize/elastic/base/config-map.yaml b/openshift/kustomize/elastic/base/config-map.yaml
@@ -78,8 +78,8 @@ data:
     http:
       port: 9200
       cors:
-        allow-origin: /https?:\/\/(.*\.gov\.bc\.ca|dejavu\.appbase\.io)/
-        # allow-origin: https://tno-dev.apps.silver.devops.gov.bc.ca,https://tno-dev-elastic.apps.silver.devops.gov.bc.ca,https://tno-dejavu.apps.silver.devops.gov.bc.ca,https://dejavu.appbase.io
+        allow-origin: /https?:\/\/(.*\.gov\.bc\.ca)/
+        # allow-origin: https://tno-dev.apps.silver.devops.gov.bc.ca,https://tno-dev-elastic.apps.silver.devops.gov.bc.ca
         enabled: true
         allow-headers: X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization,x-search-query,x-search-state,x-search-filters
         allow-credentials: true

diff --git a/openshift/kustomize/elastic/base/route.yaml b/openshift/kustomize/elastic/base/route.yaml
@@ -26,31 +26,3 @@ spec:
     # caCertificate: ""
     # certificate: ""
     # key: ""
-# ---
-# kind: Route
-# apiVersion: route.openshift.io/v1
-# metadata:
-#   name: elastic-dejavu
-#   namespace: default
-#   annotations:
-#     haproxy.router.openshift.io/timeout: 60s
-#   labels:
-#     name: elastic
-#     part-of: tno
-#     version: 1.0.0
-#     component: elastic
-#     managed-by: kustomize
-#     created-by: jeremy.foster
-# spec:
-#   host: tno-dev-elastic.apps.silver.devops.gov.bc.ca
-#   path: /
-#   to:
-#     kind: Service
-#     name: elastic
-#     weight: 100
-#   tls:
-#     insecureEdgeTerminationPolicy: Redirect
-#     termination: edge
-#     # caCertificate: ""
-#     # certificate: ""
-#     # key: ""
diff --git a/openshift/kustomize/elastic/dejavu/base/deploy.yaml b/openshift/kustomize/elastic/dejavu/base/deploy.yaml
diff --git a/openshift/kustomize/elastic/dejavu/base/kustomization.yaml b/openshift/kustomize/elastic/dejavu/base/kustomization.yaml
diff --git a/openshift/kustomize/elastic/dejavu/base/route.yaml b/openshift/kustomize/elastic/dejavu/base/route.yaml
diff --git a/openshift/kustomize/elastic/dejavu/base/services.yaml b/openshift/kustomize/elastic/dejavu/base/services.yaml
diff --git a/openshift/kustomize/elastic/dejavu/overlays/tools/kustomization.yaml b/openshift/kustomize/elastic/dejavu/overlays/tools/kustomization.yaml
diff --git a/openshift/kustomize/elastic/overlays/dev/kustomization.yaml b/openshift/kustomize/elastic/overlays/dev/kustomization.yaml
@@ -27,13 +27,6 @@ patches:
       - op: replace
         path: /spec/host
         value: dev.mmi.gov.bc.ca
-  - target:
-      kind: Route
-      name: elastic-dejavu
-    patch: |-
-      - op: replace
-        path: /spec/host
-        value: tno-dev-elastic.apps.silver.devops.gov.bc.ca
   - target:
       kind: StatefulSet
       name: elastic

diff --git a/openshift/kustomize/elastic/overlays/test/kustomization.yaml b/openshift/kustomize/elastic/overlays/test/kustomization.yaml
@@ -27,13 +27,6 @@ patches:
       - op: replace
         path: /spec/host
         value: mmi.gov.bc.ca
-  - target:
-      kind: Route
-      name: elastic-dejavu
-    patch: |-
-      - op: replace
-        path: /spec/host
-        value: test.mmi.gov.bc.ca
   - target:
       kind: StatefulSet
       name: elastic

diff --git a/tools/scripts/gen-env-files.sh b/tools/scripts/gen-env-files.sh
@@ -35,7 +35,6 @@ KEYCLOAK_HTTPS_PORT=$portKeycloakHttps
 
 ELASTIC_HTTP_PORT=$portElastic
 ELASTIC_COM_PORT=$portElasticCom
-ELASTIC_DEJAVU_HTTP_PORT=$portDejavu
 
 AZURE_BLOB_PORT=$portAzureBlob
 AZURE_QUEUE_PORT=$portAzureQueue

diff --git a/tools/scripts/variables.sh b/tools/scripts/variables.sh
@@ -152,7 +152,6 @@ export portKeycloak=40001
 export portKeycloakHttps=40002
 export portElastic=40003
 export portElasticCom=40004
-export portDejavu=40005
 export portAzureBlob=40006
 export portAzureQueue=40007
 export portAzureTable=40008