diff --git a/liquid-code/Chart.yaml b/liquid-code/Chart.yaml index 7026d15..693a7b5 100644 --- a/liquid-code/Chart.yaml +++ b/liquid-code/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.2 +version: 1.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.2" +appVersion: "1.0.3" diff --git a/liquid-code/templates/Deployments/backend-deployment.yaml b/liquid-code/templates/Deployments/backend-deployment.yaml index 7d980db..01749bc 100644 --- a/liquid-code/templates/Deployments/backend-deployment.yaml +++ b/liquid-code/templates/Deployments/backend-deployment.yaml @@ -40,7 +40,9 @@ spec: name: {{ .Values.s3.secretName | quote }} key: {{ required "secret-key-ref!" .Values.s3.secretKeyRef | quote }} - name: TESTING_MODULE_URL - value: http://{{ .Release.Name }}-testing-module-gateway-service:8080/ + value: http://{{ .Release.Name }}-testing-module-gateway-service/api/tester/submit + - name: SERVICE_BASE_URL + value: {{ .Release.Name }}-backend-service - name: PG_URI valueFrom: secretKeyRef: diff --git a/liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml b/liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml index ba3ea45..5681253 100644 --- a/liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml +++ b/liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml @@ -25,13 +25,13 @@ spec: - containerPort: 8080 env: - name: Workers__Cpp - value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + value: http://{{ .Release.Name }}-testing-module-worker-service - name: Workers__Java - value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + value: http://{{ .Release.Name }}-testing-module-worker-service - name: Workers__Kotlin - value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + value: http://{{ .Release.Name }}-testing-module-worker-service - name: Workers__CSharp - value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + value: http://{{ .Release.Name }}-testing-module-worker-service - name: Workers__Python - value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + value: http://{{ .Release.Name }}-testing-module-worker-service {{ end }} diff --git a/liquid-code/templates/Services/testing-module-gateway-service.yaml b/liquid-code/templates/Services/testing-module-gateway-service.yaml index 57bd993..d36bc35 100644 --- a/liquid-code/templates/Services/testing-module-gateway-service.yaml +++ b/liquid-code/templates/Services/testing-module-gateway-service.yaml @@ -9,6 +9,6 @@ spec: ports: - name: http protocol: TCP - port: 8080 + port: 80 targetPort: 8080 {{ end }} diff --git a/liquid-code/templates/Services/testing-module-worker-service.yaml b/liquid-code/templates/Services/testing-module-worker-service.yaml index c526022..2f77754 100644 --- a/liquid-code/templates/Services/testing-module-worker-service.yaml +++ b/liquid-code/templates/Services/testing-module-worker-service.yaml @@ -9,6 +9,6 @@ spec: ports: - name: http protocol: TCP - port: 8080 + port: 80 targetPort: 8080 {{ end }} diff --git a/liquid-code/templates/default-ingress.yaml b/liquid-code/templates/default-ingress.yaml index 41fdb5b..6b52c76 100644 --- a/liquid-code/templates/default-ingress.yaml +++ b/liquid-code/templates/default-ingress.yaml @@ -26,3 +26,13 @@ spec: name: {{ .Release.Name }}-frontend-service port: number: 80 + - host: tester.liquidcode.ru + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ .Release.Name }}-testing-module-gateway-service + port: + number: 80 diff --git a/liquid-code/values.yaml b/liquid-code/values.yaml index b465c8a..5396411 100644 --- a/liquid-code/values.yaml +++ b/liquid-code/values.yaml @@ -10,7 +10,7 @@ jwt: database: secretName: liquid-db-app migrateDb: true - dropDb: true + dropDb: false frontend: enable: true testingModule: