diff --git a/cnpg-liquid/values.yaml b/cnpg-liquid/values.yaml index cf8a4a4..e6b0b00 100644 --- a/cnpg-liquid/values.yaml +++ b/cnpg-liquid/values.yaml @@ -8,8 +8,8 @@ cnpg: backup: enable: true schedule: "0 0 0 * * *" - destinationPath: "s3://liquid-code/backup" + destinationPath: "s3://liquid-code/backup-hexcore" recovery: - enable: false + enable: true oldClusterName: liquid-db sourcePath: "s3://liquid-code/backup" \ No newline at end of file diff --git a/liquid-code-chart/templates/Deployments/backend-deployment.yaml b/liquid-code-chart/templates/Deployments/backend-deployment.yaml index 97278a2..1b648c6 100644 --- a/liquid-code-chart/templates/Deployments/backend-deployment.yaml +++ b/liquid-code-chart/templates/Deployments/backend-deployment.yaml @@ -37,6 +37,8 @@ spec: secretKeyRef: name: {{ .Values.s3.secretName | quote }} key: {{ required "secret-key-key!" .Values.s3.secretKeyKey | quote }} + - name: TESTING_MODULE_URL + value: http://{{ .Release.Name }}-queue-service:8080/ - name: PG_URI valueFrom: secretKeyRef: diff --git a/liquid-code-chart/templates/Deployments/queue-deployment.yaml b/liquid-code-chart/templates/Deployments/queue-deployment.yaml new file mode 100644 index 0000000..bfeb75f --- /dev/null +++ b/liquid-code-chart/templates/Deployments/queue-deployment.yaml @@ -0,0 +1,27 @@ +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 + + imagePullSecrets: + - name: github-registry diff --git a/liquid-code-chart/templates/Services/queue-service.yaml b/liquid-code-chart/templates/Services/queue-service.yaml new file mode 100644 index 0000000..2784788 --- /dev/null +++ b/liquid-code-chart/templates/Services/queue-service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-queue-service +spec: + selector: + app: {{ .Release.Name }}-queue + ports: + - protocol: TCP + port: 8080 + targetPort: 8080 diff --git a/liquid-code-chart/templates/certificate-issuer.yaml b/liquid-code-chart/templates/certificate-issuer.yaml new file mode 100644 index 0000000..a8491f0 --- /dev/null +++ b/liquid-code-chart/templates/certificate-issuer.yaml @@ -0,0 +1,21 @@ +apiVersion: cert-manager.io/v1 +kind: Issuer +metadata: + name: {{ .Release.Name }}-certificate-issuer +spec: + acme: + {{ if .Values.staging }} + server: https://acme-staging-v02.api.letsencrypt.org/directory + {{ else }} + server: https://acme-v02.api.letsencrypt.org/directory + {{ end }} + # Email address used for ACME registration + email: mr.pytkov@gmail.com + # Name of a secret used to store the ACME account private key + privateKeySecretRef: + name: {{ .Release.Name }}-acme-private-key + # Enable the HTTP-01 challenge provider + solvers: + - http01: + ingress: + ingressClassName: traefik \ No newline at end of file diff --git a/liquid-code-chart/templates/default-ingress.yaml b/liquid-code-chart/templates/default-ingress.yaml index 2cc26ba..dfb42e3 100644 --- a/liquid-code-chart/templates/default-ingress.yaml +++ b/liquid-code-chart/templates/default-ingress.yaml @@ -2,9 +2,16 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ .Release.Name }}-ingress + annotations: + cert-manager.io/issuer: "{{ .Release.Name }}-certificate-issuer" spec: + tls: + - hosts: + - liquidcode.ru + - api.liquidcode.ru + secretName: {{ .Release.Name }}-tls-secret rules: - - host: api.nullptr.top + - host: api.liquidcode.ru http: paths: - path: / @@ -14,7 +21,7 @@ spec: name: {{ .Release.Name }}-backend-service port: number: 80 - - host: nullptr.top + - host: liquidcode.ru http: paths: - path: / diff --git a/liquid-code-chart/values.yaml b/liquid-code-chart/values.yaml index 32992d1..d1ce437 100644 --- a/liquid-code-chart/values.yaml +++ b/liquid-code-chart/values.yaml @@ -11,4 +11,5 @@ database: secretName: liquid-db-app migrateDb: true dropDb: false +staging: false imagePullSecret: github-registry diff --git a/scripts/client/setup-certmanager.sh b/scripts/client/setup-certmanager.sh new file mode 100644 index 0000000..078dfcf --- /dev/null +++ b/scripts/client/setup-certmanager.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml