Commit 01b54105 authored by Tomáš Sapák's avatar Tomáš Sapák
Browse files

Merge branch '147-integrate-kypo-answers-storage-service' into 'master'

Resolve "integrate kypo-answers-storage service"

Closes #147

See merge request muni-kypo-crp/devops/kypo-crp-deployment!149
parents 98f4d544 4d3e92e3
......@@ -23,23 +23,27 @@ kypo_crp_docker_services:
user_and_group:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-uag-service
image_tag: 'v1.1.78'
image_tag: 'v1.1.79'
sandbox_service:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-sandbox-service
image_tag: '21.06'
image_tag: 'v0.10.1'
training:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-training-service
image_tag: 'v1.1.71'
image_tag: 'v1.1.74'
adaptive_training:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-adaptive-training-service
image_tag: '21.06'
image_tag: 'v1.0.40'
smart_assistant:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-adaptive-smart-assistant-service
image_tag: '21.06'
answers_storage:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-answers-storage-service
image_tag: 'v1.0.6'
elasticsearch_service:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-elasticsearch-service
......@@ -47,7 +51,7 @@ kypo_crp_docker_services:
frontend:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-frontend
image_tag: '21.06'
image_tag: 'v12.0.7'
elasticsearch:
container_name: kypo-elasticsearch
restart_policy: unless-stopped
......@@ -77,7 +81,7 @@ kypo_crp_docker_services:
image_tag: master
ansible_runner:
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-ansible-runner
image_tag: 'v1.1.2'
image_tag: 'v1.3.0'
kypo_crp_oidc_post_logout_url: '{{ kypo_crp_url }}/logout-confirmed'
kypo_crp_oidc_silent_refresh_redirect_url: '{{ kypo_crp_url }}/silent-refresh.html'
......@@ -118,6 +122,11 @@ kypo_crp_smart_assistant_service_context_path: /kypo-adaptive-smart-assistant/ap
kypo_crp_smart_assistant_service_url: '{{ kypo_crp_url }}{{ kypo_crp_smart_assistant_service_context_path }}'
kypo_crp_smart_assistant_service_internal_url: 'http://{{ kypo_crp_smart_assistant_service_container_name }}:8086{{ kypo_crp_smart_assistant_service_context_path }}'
kypo_crp_answers_storage_service_container_name: answers-storage
kypo_crp_answers_storage_service_context_path: /kypo-answers-storage/api/v1/
kypo_crp_answers_storage_service_url: '{{ kypo_crp_url }}{{ kypo_crp_answers_storage_service_context_path }}'
kypo_crp_answers_storage_service_internal_url: 'http://{{ kypo_crp_answers_storage_service_container_name }}:8087{{ kypo_crp_answers_storage_service_context_path }}'
kypo_crp_angular_frontend_container_name: angular-frontend
kypo_crp_angular_frontend_internal_url: 'http://{{ kypo_crp_angular_frontend_container_name }}:8000'
......
......@@ -79,5 +79,6 @@
}{{ "," if not loop.last else "" }}
{% endfor -%}
]
}
},
"version": "v21.06"
}
## server port for a given service, e.g., 8086
server.port=8087
## server context path (the base url for the service), e.g., /kypo-answer-storage/api/v1
server.servlet.context-path={{ kypo_crp_answers_storage_service_context_path }}
## microservice name which is used in user management service for identification of this service, e.g. kypo-smart-assistant
microservice.name=kypo-answers-storage
## Allows you to specify allowed origins for CORS mapping. You could set it as, e.g., http://domain1.com, http://domain2.com, etc. The default value is: *
cors.allowed.origins={{ kypo_crp_url }}
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
spring.datasource.url=jdbc:postgresql://localhost:5432/kypo-answers-storage
spring.datasource.username=postgres
spring.datasource.password=postgres
spring.datasource.driver-class-name=org.postgresql.Driver
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
spring.jpa.hibernate.ddl-auto=
spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults = false
## Configuring Jackson serializer for converting Java 8 dates to ISO format
spring.jackson.serialization.write_dates_as_timestamps=false
## all atributes in JSON are in SNAKE_CASE
spring.jackson.property-naming-strategy=SNAKE_CASE
spring.flyway.enabled=true
......@@ -36,6 +36,10 @@ server {
proxy_pass {{ kypo_crp_smart_assistant_service_url }};
}
location {{ kypo_crp_answers_storage_service_context_path }} {
proxy_pass {{ kypo_crp_answers_storage_service_internal_url }};
}
location {{ kypo_crp_elasticsearch_service_context_path }} {
proxy_pass {{ kypo_crp_elasticsearch_service_internal_url }};
}
......
......@@ -106,6 +106,9 @@ application_configuration:
# The name of the Docker image that is able to run Ansible playbook.
ansible_docker_image: {{ kypo_crp_docker_services.ansible_runner.image + ":" + kypo_crp_docker_services.ansible_runner.image_tag }}
# Answers storage base URL.
answers_storage_api: {{ kypo_crp_answers_storage_service_internal_url }}
# The name of the Docker network that the Runner will use.
ansible_docker_network: kypo-platform-net
......
......@@ -14,6 +14,8 @@ user-and-group-server.uri={{ kypo_crp_uag_service_internal_url }}
openstack-server.uri={{ kypo_crp_sandbox_service_internal_url }}
# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo-elastic/api/v1
elasticsearch-service.uri={{ kypo_crp_elasticsearch_service_internal_url }}
# calling kypo-answers-storage, e.g., http://answers-storage:8087/kypo-answers-storage/api/v1
answers-storage.uri={{ kypo_crp_answers_storage_service_internal_url }}
# OpenID Connect OIDC configuration settings for a resource servers configuration
# Add configuration values for your OIDC providers. If you want to run application properly, make sure that all values are in the same order.
......
......@@ -59,6 +59,14 @@ services:
- ./configuration/smart-assistant-service/kypo-smart-assistant.properties:/app/etc/kypo-adaptive-smart-assistant.properties
- {{ kypo_crp_java_cacerts_dest + ":/usr/local/openjdk-11/lib/security/cacerts" }}
- db_data_smart_assistant:/var/lib/postgresql/11/main/
answers-storage:
image: {{ kypo_crp_docker_services.answers_storage.image + ":" + kypo_crp_docker_services.answers_storage.image_tag }}
container_name: {{ kypo_crp_answers_storage_service_container_name }}
restart: {{ kypo_crp_docker_services.answers_storage.restart_policy }}
volumes:
- ./configuration/answers-storage-service/kypo-answers-storage.properties:/app/etc/kypo-answers-storage.properties
- {{ kypo_crp_java_cacerts_dest + ":/usr/local/openjdk-11/lib/security/cacerts" }}
- db_data_answers_storage:/var/lib/postgresql/11/main/
elasticsearch-service:
image: {{ kypo_crp_docker_services.elasticsearch_service.image + ":" + kypo_crp_docker_services.elasticsearch_service.image_tag }}
container_name: {{ kypo_crp_elasticsearch_service_container_name }}
......@@ -101,6 +109,8 @@ volumes:
name: postgre-data-adaptive-training
db_data_smart_assistant:
name: postgre-data-smart-assistant
db_data_answers_storage:
name: postgre-data-answers-storage
db_data_sandbox_service:
name: postgre-data-sandbox-service
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment