Убраны штуки

This commit is contained in:
2025-10-21 20:42:01 +03:00
parent e41ede3d3d
commit b9881ea0f2
13 changed files with 21 additions and 41 deletions

View File

@@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # 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 # 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 # 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. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "1.16.6" appVersion: "1.0.0"

View File

@@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: {{ .Release.Name }}-backend - name: {{ .Release.Name }}-backend
image: ghcr.io/nullptroma/liquid-backend:latest image: git.nullptr.top/liquidcode/liquidcode:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8080 - containerPort: 8080
@@ -31,12 +31,12 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ required "secretname!" .Values.s3.secretName | quote }} 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 - name: S3_SECRET_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.s3.secretName | quote }} 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 - name: TESTING_MODULE_URL
value: http://{{ .Release.Name }}-queue-service:8080/ value: http://{{ .Release.Name }}-queue-service:8080/
- name: PG_URI - name: PG_URI
@@ -47,6 +47,3 @@ spec:
envFrom: envFrom:
- secretRef: - secretRef:
name: {{ required "" .Values.jwt.secretName }} name: {{ required "" .Values.jwt.secretName }}
imagePullSecrets:
- name: github-registry

View File

@@ -1,3 +1,4 @@
{{ if .Values.frontend.enable }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@@ -20,6 +21,4 @@ spec:
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8000 - containerPort: 8000
{{ end }}
imagePullSecrets:
- name: github-registry

View File

@@ -1,3 +1,4 @@
{{ if .Values.queue.enable }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@@ -22,6 +23,4 @@ spec:
- containerPort: 8080 - containerPort: 8080
securityContext: securityContext:
privileged: true privileged: true
{{ end }}
imagePullSecrets:
- name: github-registry

View File

@@ -1,3 +1,4 @@
{{ if .Values.frontend.enable }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@@ -9,3 +10,5 @@ spec:
- protocol: TCP - protocol: TCP
port: 80 port: 80
targetPort: 8000 targetPort: 8000
{{ end }}

View File

@@ -1,3 +1,4 @@
{{ if .Values.queue.enable }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@@ -9,3 +10,4 @@ spec:
- protocol: TCP - protocol: TCP
port: 8080 port: 8080
targetPort: 8080 targetPort: 8080
{{ end }}

View File

@@ -24,7 +24,7 @@ spec:
restartPolicy: Never restartPolicy: Never
containers: containers:
- name: {{ .Release.Name }}-backend - name: {{ .Release.Name }}-backend
image: ghcr.io/nullptroma/liquid-backend:latest image: git.nullptr.top/liquidcode/liquidcode:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8080 - containerPort: 8080
@@ -36,6 +36,4 @@ spec:
key: uri key: uri
- name: DROP_DATABASE - name: DROP_DATABASE
value: "1" value: "1"
imagePullSecrets:
- name: github-registry
{{ end }} {{ end }}

View File

@@ -23,7 +23,7 @@ spec:
restartPolicy: Never restartPolicy: Never
containers: containers:
- name: {{ .Release.Name }}-backend - name: {{ .Release.Name }}-backend
image: ghcr.io/nullptroma/liquid-backend:latest image: git.nullptr.top/liquidcode/liquidcode:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8080 - containerPort: 8080
@@ -35,6 +35,4 @@ spec:
key: uri key: uri
- name: MIGRATE_ONLY - name: MIGRATE_ONLY
value: "1" value: "1"
imagePullSecrets:
- name: github-registry
{{ end }} {{ end }}

View File

@@ -10,5 +10,8 @@ database:
secretName: liquid-db-app secretName: liquid-db-app
migrateDb: true migrateDb: true
dropDb: false dropDb: false
staging: false staging: true
imagePullSecret: github-registry frontend:
enable: false
queue:
enable: false

View File

@@ -1,3 +0,0 @@
#!/bin/bash
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml

View File

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

View File

@@ -1,2 +0,0 @@
#!/bin/bash
curl -sfL https://get.k3s.io | sh -s -

View File

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