Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.

Commit 1194300

Browse files
epos-euepos-eu
authored
Merge pull request #8 from epos-eu/update
added converter service and converter routine, updated component vers…
2 parents 1faa27c + ba431ab commit 1194300

9 files changed

Lines changed: 153 additions & 54 deletions

File tree

‎.github/workflows/mirror.yaml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎README.md‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,21 +215,6 @@ http://<your-ip>/<DEPLOY_PATH>/<API_PATH>
215215
| FACETS_TYPE_DEFAULT | categories | |
216216
| INGESTOR_HASH | FA9BEB99E4029AD5A6615399E7BBAE21356086B3 | "changeme" Security key|
217217

218-
219-
### Docker Images for Open Source
220-
221-
| Variable name | Image name | Default Tag |
222-
|--|--|--|
223-
| MESSAGE_BUS_IMAGE | rabbitmq | 3.11.7-management |
224-
| DATAPORTAL_IMAGE | data-portal | 1.0.1 |
225-
| GATEWAY_IMAGE | epos-api-gateway | 2.0.2 |
226-
| RESOURCES_SERVICE_IMAGE | resources-service | 2.0.6 |
227-
| INGESTOR_IMAGE | ingestor-service | 2.0.1 |
228-
| EXTERNAL_ACCESS_IMAGE | external-access-service | 2.0.1 |
229-
| BACKOFFICE_SERVICE_IMAGE | backoffice-service | 2.3.9 |
230-
| CONVERTER_IMAGE | converter-service | 2.0.0 |
231-
| METADATA_DB_IMAGE | metadata-database-deploy | 2.4.20 |
232-
233218
## Maintenance
234219

235220
We regularly update images used in this stack.

‎cmd/methods/configurations/env.env‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ LOAD_RESOURCES_API=true
6262
LOAD_INGESTOR_API=true
6363
LOAD_EXTERNAL_ACCESS_API=true
6464
LOAD_BACKOFFICE_API=true
65+
LOAD_CONVERTER_API=true
6566
LOAD_PROCESSING_API=false
6667
LOAD_EMAIL_SENDER_API=false
6768
LOAD_SHARING_API=false
@@ -79,10 +80,11 @@ INGESTOR_HASH=FA9BEB99E4029AD5A6615399E7BBAE21356086B3
7980
# ************************************************************************************************************
8081
MESSAGE_BUS_IMAGE=rabbitmq:3.13.7-management
8182
DATA_PORTAL_IMAGE=data-portal:1.0.3
82-
GATEWAY_IMAGE=epos-api-gateway:2.0.5
83-
RESOURCES_SERVICE_IMAGE=resources-service:2.1.3
83+
GATEWAY_IMAGE=epos-api-gateway:2.0.7
84+
RESOURCES_SERVICE_IMAGE=resources-service:2.1.4
8485
INGESTOR_IMAGE=ingestor-service:2.0.4
85-
EXTERNAL_ACCESS_IMAGE=external-access-service:2.0.4
86-
BACKOFFICE_SERVICE_IMAGE=backoffice-service:2.3.11
87-
CONVERTER_IMAGE=converter-service:2.0.1
88-
METADATA_DB_IMAGE=metadata-database-deploy:2.4.23
86+
EXTERNAL_ACCESS_IMAGE=external-access-service:2.0.5
87+
BACKOFFICE_SERVICE_IMAGE=backoffice-service:2.3.13
88+
CONVERTER_SERVICE_IMAGE=converter-service-go:0.0.1
89+
CONVERTER_ROUTINE_IMAGE=converter-routine-go:0.0.1
90+
METADATA_DB_IMAGE=metadata-database-deploy:2.4.24

‎cmd/methods/createfunctions.go‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,18 @@ func CreateEnvironment(env string, context string, namespace string, tag string,
158158
return err
159159
}
160160

161-
converterfile, err := CopyFromEmbedAndSubstitute(dname, "converter", GetConverterResourceEmbed())
161+
converterservicefile, err := CopyFromEmbedAndSubstitute(dname, "converterservice", GetConverterServiceResourceEmbed())
162162
if err != nil {
163163
return err
164164
}
165165

166-
list_of_services := [14]string{rabbitmqoperatorfile, rabbitmqfile, loggingfile, secretsfile, metadatadatabasefile,
167-
backofficefile, externalaccessfile, ingestorfile, resourcesfile, gatewayfile, dataportalfile, converterfile}
166+
converterroutinefile, err := CopyFromEmbedAndSubstitute(dname, "converterroutine", GetConverterRoutineResourceEmbed())
167+
if err != nil {
168+
return err
169+
}
170+
171+
list_of_services := [13]string{rabbitmqoperatorfile, rabbitmqfile, loggingfile, secretsfile, metadatadatabasefile,
172+
backofficefile, externalaccessfile, ingestorfile, resourcesfile, gatewayfile, dataportalfile, converterservicefile, converterroutinefile}
168173

169174
if err := godotenv.Overload(env); err != nil {
170175
PrintError("Error loading env variables from " + env + " cause: " + err.Error())
@@ -218,7 +223,7 @@ func CreateEnvironment(env string, context string, namespace string, tag string,
218223

219224
time.Sleep(10 * time.Second)
220225

221-
for i := 1; i < 12; i++ {
226+
for i := 1; i < 13; i++ {
222227
PrintTask("Deploy of " + list_of_services[i])
223228
if err := ExecuteCommand(exec.Command(
224229
"kubectl",
@@ -230,9 +235,10 @@ func CreateEnvironment(env string, context string, namespace string, tag string,
230235
PrintError("Error deploying the service " + list_of_services[i])
231236
return err
232237
}
238+
time.Sleep(5 * time.Second)
233239
}
234240
PrintWait("Waiting for conditions met")
235-
time.Sleep(20 * time.Second)
241+
time.Sleep(30 * time.Second)
236242
if err := ExecuteCommand(exec.Command("kubectl",
237243
"wait",
238244
"--for=condition=Ready",

‎cmd/methods/embeds.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ var (
1414
backoffice []byte
1515

1616
//go:embed "kubernetes-resources/converter-service.yaml"
17-
converter []byte
17+
converterservice []byte
18+
19+
//go:embed "kubernetes-resources/converter-routine.yaml"
20+
converterroutine []byte
1821

1922
//go:embed "kubernetes-resources/external-access-service.yaml"
2023
externalAccess []byte
@@ -58,8 +61,11 @@ func GetDataPortalResourceEmbed() []byte {
5861
func GetBackofficeResourceEmbed() []byte {
5962
return backoffice
6063
}
61-
func GetConverterResourceEmbed() []byte {
62-
return converter
64+
func GetConverterServiceResourceEmbed() []byte {
65+
return converterservice
66+
}
67+
func GetConverterRoutineResourceEmbed() []byte {
68+
return converterroutine
6369
}
6470
func GetExternalAccessResourceEmbed() []byte {
6571
return externalAccess

‎cmd/methods/kubernetes-resources/converter-routine.yaml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
# EPOS Open Source - Local installation with Kubernetes
2+
# Copyright (C) 2023 EPOS ERIC
3+
#
4+
# This program is free software: you can redistribute it and/or modify
5+
# it under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
8+
#
9+
# This program is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
16+
kind: Deployment
17+
apiVersion: apps/v1
18+
metadata:
19+
name: converter-routine-deployment
20+
spec:
21+
replicas: 1 # maybe more, no problem should happen with software heart
22+
revisionHistoryLimit: 0
23+
selector:
24+
matchLabels:
25+
app: epos-converter-routine
26+
version: ${DEPLOY_TAG}
27+
template:
28+
metadata:
29+
labels:
30+
app: epos-converter-routine
31+
version: ${DEPLOY_TAG}
32+
annotations:
33+
docker-metadata: DOCKER-METADATA
34+
spec:
35+
containers:
36+
- name: converter-routine
37+
image: ${DOCKER_REGISTRY}/${CONVERTER_ROUTINE_IMAGE}
38+
env:
39+
- name: PERSISTENCE_NAME
40+
valueFrom:
41+
secretKeyRef:
42+
name: systemsecrets
43+
key: persistence_name
44+
- name: POSTGRESQL_CONNECTION_STRING
45+
valueFrom:
46+
secretKeyRef:
47+
name: systemsecrets
48+
key: postgresql_connection_string
49+
- name: CONNECTION_POOL_INIT_SIZE
50+
valueFrom:
51+
secretKeyRef:
52+
name: systemsecrets
53+
key: datametadataservice_connectionpoolinitsize
54+
- name: CONNECTION_POOL_MIN_SIZE
55+
valueFrom:
56+
secretKeyRef:
57+
name: systemsecrets
58+
key: datametadataservice_connectionpoolminsize
59+
- name: CONNECTION_POOL_MAX_SIZE
60+
valueFrom:
61+
secretKeyRef:
62+
name: systemsecrets
63+
key: datametadataservice_connectionpoolmaxsize
64+
- name: BROKER_HOST
65+
valueFrom:
66+
secretKeyRef:
67+
name: systemsecrets
68+
key: broker_host
69+
- name: BROKER_USERNAME
70+
valueFrom:
71+
secretKeyRef:
72+
name: systemsecrets
73+
key: broker_username
74+
- name: BROKER_PASSWORD
75+
valueFrom:
76+
secretKeyRef:
77+
name: systemsecrets
78+
key: broker_password
79+
- name: BROKER_VHOST
80+
valueFrom:
81+
secretKeyRef:
82+
name: systemsecrets
83+
key: broker_vhost
84+
imagePullPolicy: Always
85+
resources:
86+
requests:
87+
cpu: 10m
88+
memory: 100Mi # have to be more than 50MB
89+
volumeMounts:
90+
- name: converter-pvc
91+
mountPath: /opt/converter/plugins
92+
volumes:
93+
- name: converter-pvc
94+
persistentVolumeClaim:
95+
claimName: converter-pvc
96+
---
97+
apiVersion: v1
98+
kind: PersistentVolumeClaim
99+
metadata:
100+
name: converter-pvc
101+
spec:
102+
accessModes:
103+
- ReadWriteOnce
104+
resources:
105+
requests:
106+
storage: 1Gi

‎cmd/methods/kubernetes-resources/converter-service.yaml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
spec:
3535
containers:
3636
- name: converter-service
37-
image: ${DOCKER_REGISTRY}/${CONVERTER_IMAGE}
37+
image: ${DOCKER_REGISTRY}/${CONVERTER_SERVICE_IMAGE}
3838
env:
3939
- name: PERSISTENCE_NAME
4040
valueFrom:
@@ -81,24 +81,34 @@ spec:
8181
secretKeyRef:
8282
name: systemsecrets
8383
key: broker_vhost
84-
- name: REPOTOKEN_DEFAULT
85-
valueFrom:
86-
secretKeyRef:
87-
name: systemsecrets
88-
key: repotoken_default
8984
imagePullPolicy: Always
9085
resources:
9186
requests:
9287
cpu: 10m
9388
memory: 100Mi # have to be more than 50MB
9489
volumeMounts:
9590
- name: converter-pvc
96-
mountPath: /converter
91+
mountPath: /opt/converter/plugins
9792
volumes:
9893
- name: converter-pvc
9994
persistentVolumeClaim:
10095
claimName: converter-pvc
10196
---
97+
kind: Service
98+
apiVersion: v1
99+
metadata:
100+
name: converter-service
101+
labels:
102+
app: epos-converter
103+
version: DEPLOY-TAG
104+
spec:
105+
selector:
106+
app: epos-converter
107+
version: DEPLOY-TAG
108+
ports:
109+
- protocol: TCP
110+
port: 8080
111+
---
102112
apiVersion: v1
103113
kind: PersistentVolumeClaim
104114
metadata:

‎cmd/methods/kubernetes-resources/secrets.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ stringData:
4040
monitoring_url: "${MONITORING_URL}"
4141
monitoring_user: "${MONITORING_USER}"
4242
monitoring_pwd: "${MONITORING_PWD}"
43-
repotoken_default: "${REPOTOKEN_DEFAULT}"
4443
datametadataservice_consumers: "${NUM_OF_CONSUMERS}"
4544
datametadataservice_publishers: "${NUM_OF_PUBLISHERS}"
4645
datametadataservice_connectionpoolinitsize: "${CONNECTION_POOL_INIT_SIZE}"
@@ -54,6 +53,7 @@ stringData:
5453
gateway_load_external_access_api: "${LOAD_EXTERNAL_ACCESS_API}"
5554
gateway_load_backoffice_api: "${LOAD_BACKOFFICE_API}"
5655
gateway_load_processing_api: "${LOAD_PROCESSING_API}"
56+
gateway_load_converter_api: "${LOAD_CONVERTER_API}"
5757
gateway_load_email_sender_api: "${LOAD_EMAIL_SENDER_API}"
5858
gateway_load_sharing_api: "${LOAD_SHARING_API}"
5959
is_monitoring_auth: "${IS_MONITORING_AUTH}"

‎cmd/methods/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
package methods
2020

2121
func GetVersion() string {
22-
return "1.0.6"
22+
return "1.1.0"
2323
}

0 commit comments

Comments
 (0)