From 6b84adbed236db1094f2ba6939f7cf0be80ecc0a Mon Sep 17 00:00:00 2001 From: Roman Pytkov Date: Mon, 27 Oct 2025 23:57:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D1=83=D1=8E?= =?UTF-8?q?=D1=89=D0=B8=D0=B9=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liquid-code/Chart.yaml | 4 +- .../Deployments/backend-deployment.yaml | 2 +- .../Deployments/queue-deployment.yaml | 26 ------------- .../testing-module-gateway-deployment.yaml | 37 +++++++++++++++++++ .../testing-module-worker-deployment.yaml | 26 +++++++++++++ .../templates/Services/queue-service.yaml | 13 ------- .../testing-module-gateway-service.yaml | 14 +++++++ .../testing-module-worker-service.yaml | 14 +++++++ liquid-code/values.yaml | 4 +- 9 files changed, 96 insertions(+), 44 deletions(-) delete mode 100644 liquid-code/templates/Deployments/queue-deployment.yaml create mode 100644 liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml create mode 100644 liquid-code/templates/Deployments/testing-module-worker-deployment.yaml delete mode 100644 liquid-code/templates/Services/queue-service.yaml create mode 100644 liquid-code/templates/Services/testing-module-gateway-service.yaml create mode 100644 liquid-code/templates/Services/testing-module-worker-service.yaml diff --git a/liquid-code/Chart.yaml b/liquid-code/Chart.yaml index f7738c3..7026d15 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.0 +version: 1.0.2 # 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.1" +appVersion: "1.0.2" diff --git a/liquid-code/templates/Deployments/backend-deployment.yaml b/liquid-code/templates/Deployments/backend-deployment.yaml index df9bcc0..739c93e 100644 --- a/liquid-code/templates/Deployments/backend-deployment.yaml +++ b/liquid-code/templates/Deployments/backend-deployment.yaml @@ -38,7 +38,7 @@ spec: name: {{ .Values.s3.secretName | quote }} key: {{ required "secret-key-ref!" .Values.s3.secretKeyRef | quote }} - name: TESTING_MODULE_URL - value: http://{{ .Release.Name }}-queue-service:8080/ + value: http://{{ .Release.Name }}-testing-module-gateway-service:8080/ - name: PG_URI valueFrom: secretKeyRef: diff --git a/liquid-code/templates/Deployments/queue-deployment.yaml b/liquid-code/templates/Deployments/queue-deployment.yaml deleted file mode 100644 index fb2d2a3..0000000 --- a/liquid-code/templates/Deployments/queue-deployment.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{ if .Values.queue.enable }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Release.Name }}-queue-deployment - labels: - app: {{ .Release.Name }}-queue -spec: - replicas: 1 - selector: - matchLabels: - app: {{ .Release.Name }}-queue - template: - metadata: - labels: - app: {{ .Release.Name }}-queue - spec: - containers: - - name: {{ .Release.Name }}-queue - image: ghcr.io/nullptroma/liquid-queue:latest - imagePullPolicy: Always - ports: - - containerPort: 8080 - securityContext: - privileged: true -{{ end }} \ No newline at end of file diff --git a/liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml b/liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml new file mode 100644 index 0000000..ba3ea45 --- /dev/null +++ b/liquid-code/templates/Deployments/testing-module-gateway-deployment.yaml @@ -0,0 +1,37 @@ +{{ if .Values.testingModule.enable }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-testing-module-gateway-deployment + labels: + app: {{ .Release.Name }}-testing-module-gateway +spec: + replicas: 1 + selector: + matchLabels: + app: {{ .Release.Name }}-testing-module-gateway + template: + metadata: + labels: + app: {{ .Release.Name }}-testing-module-gateway + annotations: + redeploy-timestamp: "{{ now | unixEpoch }}" + spec: + containers: + - name: {{ .Release.Name }}-testing-module-gateway + image: git.nullptr.top/liquidcode/liquidcode-tester-gateway:latest + imagePullPolicy: Always + ports: + - containerPort: 8080 + env: + - name: Workers__Cpp + value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + - name: Workers__Java + value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + - name: Workers__Kotlin + value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + - name: Workers__CSharp + value: http://{{ .Release.Name }}-testing-module-worker-service:8080 + - name: Workers__Python + value: http://{{ .Release.Name }}-testing-module-worker-service:8080 +{{ end }} diff --git a/liquid-code/templates/Deployments/testing-module-worker-deployment.yaml b/liquid-code/templates/Deployments/testing-module-worker-deployment.yaml new file mode 100644 index 0000000..e73c1de --- /dev/null +++ b/liquid-code/templates/Deployments/testing-module-worker-deployment.yaml @@ -0,0 +1,26 @@ +{{ if .Values.testingModule.enable }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-testing-module-worker-deployment + labels: + app: {{ .Release.Name }}-testing-module-worker +spec: + replicas: 1 + selector: + matchLabels: + app: {{ .Release.Name }}-testing-module-worker + template: + metadata: + labels: + app: {{ .Release.Name }}-testing-module-worker + annotations: + redeploy-timestamp: "{{ now | unixEpoch }}" + spec: + containers: + - name: {{ .Release.Name }}-testing-module-worker + image: git.nullptr.top/liquidcode/liquidcode-tester-worker:latest + imagePullPolicy: Always + ports: + - containerPort: 8080 +{{ end }} diff --git a/liquid-code/templates/Services/queue-service.yaml b/liquid-code/templates/Services/queue-service.yaml deleted file mode 100644 index c3b3cfa..0000000 --- a/liquid-code/templates/Services/queue-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{ if .Values.queue.enable }} -apiVersion: v1 -kind: Service -metadata: - name: {{ .Release.Name }}-queue-service -spec: - selector: - app: {{ .Release.Name }}-queue - ports: - - protocol: TCP - port: 8080 - targetPort: 8080 -{{ end }} \ No newline at end of file diff --git a/liquid-code/templates/Services/testing-module-gateway-service.yaml b/liquid-code/templates/Services/testing-module-gateway-service.yaml new file mode 100644 index 0000000..57bd993 --- /dev/null +++ b/liquid-code/templates/Services/testing-module-gateway-service.yaml @@ -0,0 +1,14 @@ +{{ if .Values.testingModule.enable }} +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-testing-module-gateway-service +spec: + selector: + app: {{ .Release.Name }}-testing-module-gateway + ports: + - name: http + protocol: TCP + port: 8080 + 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 new file mode 100644 index 0000000..c526022 --- /dev/null +++ b/liquid-code/templates/Services/testing-module-worker-service.yaml @@ -0,0 +1,14 @@ +{{ if .Values.testingModule.enable }} +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-testing-module-worker-service +spec: + selector: + app: {{ .Release.Name }}-testing-module-worker + ports: + - name: http + protocol: TCP + port: 8080 + targetPort: 8080 +{{ end }} diff --git a/liquid-code/values.yaml b/liquid-code/values.yaml index 06801a2..411a821 100644 --- a/liquid-code/values.yaml +++ b/liquid-code/values.yaml @@ -12,5 +12,5 @@ database: dropDb: true frontend: enable: true -queue: - enable: false \ No newline at end of file +testingModule: + enable: true \ No newline at end of file