Мини правки

Updates the chart and app versions.

Modifies service configurations to use port 80 for both the testing module gateway and worker services.

Updates ingress to include a host for the tester, directing traffic to the testing module gateway service on port 80.

Updates backend deployment to include the correct URL for the testing module and the base service URL.

Disables database dropping on application startup.

cnpg-liquid/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.1
 
 # 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.0"
+appVersion: "1.0.1"

cnpg-liquid/templates/cnpg-cluster.yaml

@@ -31,6 +31,9 @@ spec:
   {{ end }}
 
   bootstrap:
+    initdb:
+      postInitSQL:
+        - ALTER ROLE app WITH CREATEDB;
     {{ if .Values.cnpg.recovery.enable }}
     recovery:
       source: {{ required "Old cluster name required" .Values.cnpg.recovery.oldClusterName }}

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.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.0"
+appVersion: "1.0.3"

liquid-code/templates/Deployments/backend-deployment.yaml

@@ -13,6 +13,8 @@ spec:
     metadata:
       labels:
         app: {{ .Release.Name }}-backend
+      annotations:
+        redeploy-timestamp: "{{ now | unixEpoch }}"
     spec:
       containers:
         - name: {{ .Release.Name }}-backend
@@ -25,6 +27,8 @@ spec:
               value: {{ required "s3 endpoint!" .Values.s3.endpointUrl | quote }}
             - name: S3_PRIVATE_BUCKET
               value: {{ required "privateBucket!" .Values.s3.privateBucket | quote }}
+            - name: S3_PUBLIC_BUCKET
+              value: {{ required "publicBucket!" .Values.s3.publicBucket | quote }}
             - name: S3_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
@@ -35,8 +39,15 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.s3.secretName | quote }}
                   key: {{ required "secret-key-ref!" .Values.s3.secretKeyRef | quote }}
+            - name: SUBMIT_CALLBACK_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.tester.secretName | quote }}
+                  key: {{ required "secret-key-ref!" .Values.tester.secretKeyRef | quote }}
             - name: TESTING_MODULE_URL
-              value: http://{{ .Release.Name }}-queue-service:8080/
+              value: http://{{ .Release.Name }}-testing-module-gateway-service/api/tester/submit
+            - name: SERVICE_BASE_URL
+              value: http://{{ .Release.Name }}-backend-service
             - name: PG_URI
               valueFrom:
                 secretKeyRef:

liquid-code/templates/Deployments/frontend-deployment.yaml

@@ -14,11 +14,13 @@ spec:
     metadata:
       labels:
         app: {{ .Release.Name }}-frontend
+      annotations:
+        redeploy-timestamp: "{{ now | unixEpoch }}"
     spec:
       containers:
       - name: {{ .Release.Name }}-frontend
-        image: ghcr.io/nullptroma/liquid-frontend:latest
+        image: git.nullptr.top/liquidcode/liquidcode-frontend:latest
         imagePullPolicy: Always
         ports:
-          - containerPort: 8000
+          - containerPort: 3000
 {{ end }}

liquid-code/templates/Deployments/queue-deployment.yaml

@@ -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 }}

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-roman:latest
+        imagePullPolicy: Always
+        ports:
+          - containerPort: 8080
+        env:
+          - name: Workers__Cpp
+            value: http://{{ .Release.Name }}-testing-module-worker-service
+          - name: Workers__Java
+            value: http://{{ .Release.Name }}-testing-module-worker-service
+          - name: Workers__Kotlin
+            value: http://{{ .Release.Name }}-testing-module-worker-service
+          - name: Workers__CSharp
+            value: http://{{ .Release.Name }}-testing-module-worker-service
+          - name: Workers__Python
+            value: http://{{ .Release.Name }}-testing-module-worker-service
+{{ end }}

liquid-code/templates/Deployments/testing-module-worker-deployment.yaml

@@ -0,0 +1,28 @@
+{{ 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-roman:latest
+        imagePullPolicy: Always
+        ports:
+          - containerPort: 8080
+        securityContext:
+          privileged: true
+{{ end }}

liquid-code/templates/Services/frontend-service.yaml

@@ -9,6 +9,6 @@ spec:
   ports:
   - protocol: TCP
     port: 80
-    targetPort: 8000
+    targetPort: 3000
 
 {{ end }}

liquid-code/templates/Services/queue-service.yaml

@@ -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 }}

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: 80
+      targetPort: 8080
+{{ end }}

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: 80
+      targetPort: 8080
+{{ end }}

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

liquid-code/templates/hook-drob.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
   annotations:
-    "helm.sh/hook": pre-install
+    "helm.sh/hook": "pre-install,pre-upgrade"
     "helm.sh/hook-weight": "-1"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:

liquid-code/templates/hook-migration.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
   annotations:
-    "helm.sh/hook": pre-install
+    "helm.sh/hook": "pre-install,pre-upgrade"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   template:

liquid-code/values.yaml

@@ -4,13 +4,17 @@ s3:
   accessKeyRef: ACCESS_KEY_ID
   secretKeyRef: ACCESS_SECRET_KEY
   privateBucket: liquid-code
+  publicBucket: liquid-code-public
+tester:
+  secretName: tester-callback
+  secretKeyRef: SUBMIT_CALLBACK_SECRET
 jwt:
   secretName: jwt-secrets
 database:
   secretName: liquid-db-app
   migrateDb: true
-  dropDb: true
+  dropDb: false
 frontend:
-  enable: false
-queue:
-  enable: false
+  enable: true
+testingModule:
+  enable: true