Merge branch 'remove-adapter-service' into 'main'

Remove adapter service from deployment (incl. in updated span service)

See merge request ExplorViz/code/deployment!148

Author: malte-hansen

docker/.env

@@ -6,7 +6,6 @@ COMPOSE_PROFILES=env
 EXPLORVIZ_JAVA_IMAGE_TYPE=jvm
 
 # ExplorViz Image Tags
-ADAPTER_SERVICE_IMAGE_TAG=latest
 SPAN_SERVICE_IMAGE_TAG=latest
 USER_SERVICE_IMAGE_TAG=latest
 COLLABORATION_SERVICE_IMAGE_TAG=latest
@@ -30,7 +29,6 @@ COLLABORATION_HOSTNAME=collaboration-service
 USER_PORT=8080
 SPAN_PORT=8080
 COLLABORATION_PORT=4444
-ADAPTER_PORT=8087
 FRONTEND_PORT=8080
 
 # ExplorViz Frontend Auth
@@ -41,7 +39,6 @@ AUTH0_LOGOUT_URL=http://localhost:8080/
 NO_AUTH_USER_NICKNAME=user-1
 
 # ExplorViz Scaling
-ADAPTER_REPLICAS=1
 SPAN_REPLICAS=1
 
 # Monitoring

docker/.json-schemas/java/adapter-service-schema.json

@@ -9,21 +9,14 @@
         "type": "object"
       },
       "properties": {
-        "adapter-service": {
-          "$ref": "adapter-service-schema.json"
-        },
         "span-service": {
           "$ref": "span-service-schema.json"
         },
         "user-service": {
           "$ref": "user-service-schema.json"
         }
       },
-      "required": [
-        "adapter-service",
-        "span-service",
-        "user-service"
-      ]
+      "required": ["span-service", "user-service"]
     }
   },
   "required": ["services"]

docker/.json-schemas/java/main-schema.json

@@ -13,28 +13,6 @@ include:
   - ./compose/compose.base.yaml
 
 services:
-  adapter-service:
-    hostname: adapter-service
-    image: explorviz/adapter-service-${EXPLORVIZ_JAVA_IMAGE_TYPE}:${ADAPTER_SERVICE_IMAGE_TAG}
-    env_file:
-      - path: ./.env
-      - path: ./.env-custom
-        required: false
-    depends_on:
-      init-kafka:
-        condition: service_completed_successfully
-      kafka:
-        condition: service_healthy
-      schema-registry:
-        condition: service_started
-    environment:
-      - QUARKUS_KAFKA_STREAMS_SCHEMA_REGISTRY_URL=http://schema-registry:8081
-      - EXPLORVIZ_LOG_LVL=DEBUG
-      - EXPLORVIZ_VALIDATE_TOKEN_EXISTENCE=true
-    deploy:
-      mode: replicated
-      replicas: ${ADAPTER_REPLICAS}
-
   span-service:
     hostname: span-service
     image: explorviz/span-service-${EXPLORVIZ_JAVA_IMAGE_TYPE}:${SPAN_SERVICE_IMAGE_TAG}