From b9881ea0f21328b4b59916d24975513ec7f68a49 Mon Sep 17 00:00:00 2001 From: Roman Pytkov Date: Tue, 21 Oct 2025 20:42:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D1=88?= =?UTF-8?q?=D1=82=D1=83=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liquid-code-chart/Chart.yaml | 4 ++-- .../templates/Deployments/backend-deployment.yaml | 9 +++------ .../templates/Deployments/frontend-deployment.yaml | 5 ++--- .../templates/Deployments/queue-deployment.yaml | 5 ++--- .../templates/Services/frontend-service.yaml | 3 +++ .../templates/Services/queue-service.yaml | 2 ++ liquid-code-chart/templates/pre-install-drob.yaml | 4 +--- liquid-code-chart/templates/pre-install-migration.yaml | 4 +--- liquid-code-chart/values.yaml | 7 +++++-- scripts/client/setup-certmanager.sh | 3 --- scripts/client/setup_cnpg.sh | 4 ---- scripts/server/install.sh | 2 -- traefik-config.yaml | 10 ---------- 13 files changed, 21 insertions(+), 41 deletions(-) delete mode 100644 scripts/client/setup-certmanager.sh delete mode 100755 scripts/client/setup_cnpg.sh delete mode 100644 scripts/server/install.sh delete mode 100644 traefik-config.yaml diff --git a/liquid-code-chart/Chart.yaml b/liquid-code-chart/Chart.yaml index 350100e..4a360a9 100644 --- a/liquid-code-chart/Chart.yaml +++ b/liquid-code-chart/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: 0.1.2 +version: 1.0.0 # 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.16.6" +appVersion: "1.0.0" diff --git a/liquid-code-chart/templates/Deployments/backend-deployment.yaml b/liquid-code-chart/templates/Deployments/backend-deployment.yaml index 5434040..11efc6d 100644 --- a/liquid-code-chart/templates/Deployments/backend-deployment.yaml +++ b/liquid-code-chart/templates/Deployments/backend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: {{ .Release.Name }}-backend - image: ghcr.io/nullptroma/liquid-backend:latest + image: git.nullptr.top/liquidcode/liquidcode:latest imagePullPolicy: Always ports: - containerPort: 8080 @@ -31,12 +31,12 @@ spec: valueFrom: secretKeyRef: name: {{ required "secretname!" .Values.s3.secretName | quote }} - key: {{ required "acces-key-key!" .Values.s3.accessKeyRef | quote }} + key: {{ required "acces-key-ref!" .Values.s3.accessKeyRef | quote }} - name: S3_SECRET_KEY valueFrom: secretKeyRef: name: {{ .Values.s3.secretName | quote }} - key: {{ required "secret-key-key!" .Values.s3.secretKeyRef | quote }} + key: {{ required "secret-key-ref!" .Values.s3.secretKeyRef | quote }} - name: TESTING_MODULE_URL value: http://{{ .Release.Name }}-queue-service:8080/ - name: PG_URI @@ -47,6 +47,3 @@ spec: envFrom: - secretRef: name: {{ required "" .Values.jwt.secretName }} - - imagePullSecrets: - - name: github-registry diff --git a/liquid-code-chart/templates/Deployments/frontend-deployment.yaml b/liquid-code-chart/templates/Deployments/frontend-deployment.yaml index 28ce603..81aaef6 100644 --- a/liquid-code-chart/templates/Deployments/frontend-deployment.yaml +++ b/liquid-code-chart/templates/Deployments/frontend-deployment.yaml @@ -1,3 +1,4 @@ +{{ if .Values.frontend.enable }} apiVersion: apps/v1 kind: Deployment metadata: @@ -20,6 +21,4 @@ spec: imagePullPolicy: Always ports: - containerPort: 8000 - - imagePullSecrets: - - name: github-registry +{{ end }} \ No newline at end of file diff --git a/liquid-code-chart/templates/Deployments/queue-deployment.yaml b/liquid-code-chart/templates/Deployments/queue-deployment.yaml index bfeb75f..fb2d2a3 100644 --- a/liquid-code-chart/templates/Deployments/queue-deployment.yaml +++ b/liquid-code-chart/templates/Deployments/queue-deployment.yaml @@ -1,3 +1,4 @@ +{{ if .Values.queue.enable }} apiVersion: apps/v1 kind: Deployment metadata: @@ -22,6 +23,4 @@ spec: - containerPort: 8080 securityContext: privileged: true - - imagePullSecrets: - - name: github-registry +{{ end }} \ No newline at end of file diff --git a/liquid-code-chart/templates/Services/frontend-service.yaml b/liquid-code-chart/templates/Services/frontend-service.yaml index a39afd0..54522b2 100644 --- a/liquid-code-chart/templates/Services/frontend-service.yaml +++ b/liquid-code-chart/templates/Services/frontend-service.yaml @@ -1,3 +1,4 @@ +{{ if .Values.frontend.enable }} apiVersion: v1 kind: Service metadata: @@ -9,3 +10,5 @@ spec: - protocol: TCP port: 80 targetPort: 8000 + +{{ end }} \ No newline at end of file diff --git a/liquid-code-chart/templates/Services/queue-service.yaml b/liquid-code-chart/templates/Services/queue-service.yaml index 2784788..c3b3cfa 100644 --- a/liquid-code-chart/templates/Services/queue-service.yaml +++ b/liquid-code-chart/templates/Services/queue-service.yaml @@ -1,3 +1,4 @@ +{{ if .Values.queue.enable }} apiVersion: v1 kind: Service metadata: @@ -9,3 +10,4 @@ spec: - protocol: TCP port: 8080 targetPort: 8080 +{{ end }} \ No newline at end of file diff --git a/liquid-code-chart/templates/pre-install-drob.yaml b/liquid-code-chart/templates/pre-install-drob.yaml index 2a95d78..9d90875 100644 --- a/liquid-code-chart/templates/pre-install-drob.yaml +++ b/liquid-code-chart/templates/pre-install-drob.yaml @@ -24,7 +24,7 @@ spec: restartPolicy: Never containers: - name: {{ .Release.Name }}-backend - image: ghcr.io/nullptroma/liquid-backend:latest + image: git.nullptr.top/liquidcode/liquidcode:latest imagePullPolicy: Always ports: - containerPort: 8080 @@ -36,6 +36,4 @@ spec: key: uri - name: DROP_DATABASE value: "1" - imagePullSecrets: - - name: github-registry {{ end }} \ No newline at end of file diff --git a/liquid-code-chart/templates/pre-install-migration.yaml b/liquid-code-chart/templates/pre-install-migration.yaml index ef0255f..18b40b2 100644 --- a/liquid-code-chart/templates/pre-install-migration.yaml +++ b/liquid-code-chart/templates/pre-install-migration.yaml @@ -23,7 +23,7 @@ spec: restartPolicy: Never containers: - name: {{ .Release.Name }}-backend - image: ghcr.io/nullptroma/liquid-backend:latest + image: git.nullptr.top/liquidcode/liquidcode:latest imagePullPolicy: Always ports: - containerPort: 8080 @@ -35,6 +35,4 @@ spec: key: uri - name: MIGRATE_ONLY value: "1" - imagePullSecrets: - - name: github-registry {{ end }} \ No newline at end of file diff --git a/liquid-code-chart/values.yaml b/liquid-code-chart/values.yaml index 632cbb6..44811fa 100644 --- a/liquid-code-chart/values.yaml +++ b/liquid-code-chart/values.yaml @@ -10,5 +10,8 @@ database: secretName: liquid-db-app migrateDb: true dropDb: false -staging: false -imagePullSecret: github-registry +staging: true +frontend: + enable: false +queue: + enable: false \ No newline at end of file diff --git a/scripts/client/setup-certmanager.sh b/scripts/client/setup-certmanager.sh deleted file mode 100644 index 078dfcf..0000000 --- a/scripts/client/setup-certmanager.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml diff --git a/scripts/client/setup_cnpg.sh b/scripts/client/setup_cnpg.sh deleted file mode 100755 index c9635f3..0000000 --- a/scripts/client/setup_cnpg.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -kubectl apply --server-side -f \ - https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.22/releases/cnpg-1.22.1.yaml diff --git a/scripts/server/install.sh b/scripts/server/install.sh deleted file mode 100644 index f87c84b..0000000 --- a/scripts/server/install.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -curl -sfL https://get.k3s.io | sh -s - diff --git a/traefik-config.yaml b/traefik-config.yaml deleted file mode 100644 index 4b88b50..0000000 --- a/traefik-config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: helm.cattle.io/v1 -kind: HelmChartConfig -metadata: - name: traefik-close-secure-port-config - namespace: kube-system -spec: - valuesContent: |- - ports: - websecure: - expose: false