From 30765ee80a6b00a551e8877b0f041790a8af099e Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Tue, 26 Mar 2024 01:33:40 +0100 Subject: [PATCH] [SIS-xxx] upgrading abstracto version adapting to new python rest api structure --- .env | 2 +- .../sissi/templates/private-rest-api-deployment.yaml | 4 ++-- .../helm/sissi/templates/rest-api-deployment.yaml | 4 ++-- deployment/helm/sissi/values.yaml | 4 ++-- .../src/main/docker/rest-api/Dockerfile | 6 +++++- docker-compose.yml | 4 ++++ pom.xml | 2 +- .../modules/debra-rest-api/python/endpoints/debra.py | 12 ++++++------ 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.env b/.env index c08beb7d..a3ad076b 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ REGISTRY_PREFIX=harbor.sheldan.dev/sissi/ ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/ VERSION=1.4.46 -ABSTRACTO_VERSION=1.5.27 \ No newline at end of file +ABSTRACTO_VERSION=1.5.28 \ No newline at end of file diff --git a/deployment/helm/sissi/templates/private-rest-api-deployment.yaml b/deployment/helm/sissi/templates/private-rest-api-deployment.yaml index efb68c9f..e21d2cd7 100644 --- a/deployment/helm/sissi/templates/private-rest-api-deployment.yaml +++ b/deployment/helm/sissi/templates/private-rest-api-deployment.yaml @@ -31,9 +31,9 @@ spec: image: "{{ .Values.privateRestApi.repository }}/{{ .Values.privateRestApi.image }}:{{ .Values.privateRestApi.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.privateRestApi.pullPolicy }} env: - - name: SISSI_HOST + - name: BACKEND_HOST value: "{{ include "sissi.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local" - - name: SISSI_PORT + - name: BACKEND_PORT value: "{{ .Values.service.port }}" ports: - name: {{ .Values.privateRestApi.service.name }} diff --git a/deployment/helm/sissi/templates/rest-api-deployment.yaml b/deployment/helm/sissi/templates/rest-api-deployment.yaml index 89187f39..f483dd2b 100644 --- a/deployment/helm/sissi/templates/rest-api-deployment.yaml +++ b/deployment/helm/sissi/templates/rest-api-deployment.yaml @@ -31,9 +31,9 @@ spec: image: "{{ .Values.restApi.repository }}/{{ .Values.restApi.image }}:{{ .Values.restApi.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.restApi.pullPolicy }} env: - - name: SISSI_HOST + - name: BACKEND_HOST value: "{{ include "sissi.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local" - - name: SISSI_PORT + - name: BACKEND_PORT value: "{{ .Values.service.port }}" ports: - name: {{ .Values.restApi.service.name }} diff --git a/deployment/helm/sissi/values.yaml b/deployment/helm/sissi/values.yaml index b542af28..eb677358 100644 --- a/deployment/helm/sissi/values.yaml +++ b/deployment/helm/sissi/values.yaml @@ -90,7 +90,7 @@ templateDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-template-deployment - tag: 1.5.27 + tag: 1.5.28 templateDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always @@ -101,7 +101,7 @@ dbConfigDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-db-deployment - tag: 1.5.27 + tag: 1.5.28 dbConfigDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always diff --git a/deployment/image-packaging/src/main/docker/rest-api/Dockerfile b/deployment/image-packaging/src/main/docker/rest-api/Dockerfile index c948ddec..4519668a 100644 --- a/deployment/image-packaging/src/main/docker/rest-api/Dockerfile +++ b/deployment/image-packaging/src/main/docker/rest-api/Dockerfile @@ -3,7 +3,11 @@ ARG SISSI_REGISTRY_PREFIX ARG VERSION ARG ABSTRACTO_VERSION FROM ${SISSI_REGISTRY_PREFIX}sissi-debra-rest-api:${VERSION:-latest} AS debra-api +FROM ${REGISTRY_PREFIX}abstracto-rest-api-experience:${ABSTRACTO_VERSION:-latest} AS experience-api +FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest} -COPY --from=debra-api /python /python \ No newline at end of file +COPY --from=debra-api /python /python +COPY --from=core-api /python /python +COPY --from=experience-api /python /python diff --git a/docker-compose.yml b/docker-compose.yml index 3cf96cd4..22233363 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,8 @@ services: VERSION: ${VERSION} ABSTRACTO_VERSION: ${ABSTRACTO_VERSION} image: ${REGISTRY_PREFIX}sissi-rest-api:${VERSION:-latest} + depends_on: + - debra-rest-api private-rest-api-packaging: build: context: deployment/image-packaging/src/main/docker/private-rest-api @@ -33,6 +35,8 @@ services: ABSTRACTO_VERSION: ${ABSTRACTO_VERSION} VERSION: ${VERSION} image: ${REGISTRY_PREFIX}sissi-private-rest-api:${VERSION:-latest} + depends_on: + - image-gen-api db-data: build: context: deployment/image-packaging/src/main/docker/db-data diff --git a/pom.xml b/pom.xml index 74b9a265..56113631 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 17 17 - 1.5.27 + 1.5.28 1.4.35 4.9.0 3.5.0 diff --git a/python/modules/debra-rest-api/python/endpoints/debra.py b/python/modules/debra-rest-api/python/endpoints/debra.py index a7e68743..87874b35 100644 --- a/python/modules/debra-rest-api/python/endpoints/debra.py +++ b/python/modules/debra-rest-api/python/endpoints/debra.py @@ -11,12 +11,12 @@ from datetime import timezone, datetime import pytz -sissi_host = os.getenv('SISSI_HOST') -sissi_port = os.getenv('SISSI_PORT') -latest_donations_url = f'http://{sissi_host}:{sissi_port}/debra/latestDonations' -highest_donations_url = f'http://{sissi_host}:{sissi_port}/debra/highestDonations' -campaign_info_url = f'http://{sissi_host}:{sissi_port}/debra/campaignInfo' -endless_stream_info_url = f'http://{sissi_host}:{sissi_port}/stream/endlessStream' +backend_host = os.getenv('BACKEND_HOST') +backend_port = os.getenv('BACKEND_PORT') +latest_donations_url = f'http://{backend_host}:{backend_port}/debra/latestDonations' +highest_donations_url = f'http://{backend_host}:{backend_port}/debra/highestDonations' +campaign_info_url = f'http://{backend_host}:{backend_port}/debra/campaignInfo' +endless_stream_info_url = f'http://{backend_host}:{backend_port}/stream/endlessStream' class DonationImageGenerationParameters: