Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7967df9b42 | |||
| afebdb54d1 | |||
| 9452c65bf4 | |||
| c8a6d8f433 | |||
| 63e6446422 | |||
| 140bd582ef | |||
| e6f9dcd5ba | |||
| e26931850f | |||
| edcd138d0f |
@@ -77,8 +77,19 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
name: adminpanel
|
name: adminpanel
|
||||||
namespace: {{ .Values.namespace }}
|
namespace: {{ .Values.namespace }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
annotations:
|
||||||
|
cert-manager.io/cluster-issuer: {{ .Values.ingress.tls.clusterIssuer | quote }}
|
||||||
|
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: {{ .Values.ingress.className }}
|
ingressClassName: {{ .Values.ingress.className }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
- {{ .Values.ingress.host }}
|
||||||
|
secretName: {{ .Values.ingress.tls.secretName }}
|
||||||
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.ingress.host }}
|
- host: {{ .Values.ingress.host }}
|
||||||
http:
|
http:
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
ingress:
|
ingress:
|
||||||
host: adm.dev.sovamed.ru
|
host: adm.dev.sovamed.ru
|
||||||
env:
|
tls:
|
||||||
|
enabled: true
|
||||||
|
clusterIssuer: letsencrypt-prod
|
||||||
|
secretName: adminpanel-tls
|
||||||
|
runtimeEnv:
|
||||||
API_BASE_URL: https://api.dev.sovamed.ru
|
API_BASE_URL: https://api.dev.sovamed.ru
|
||||||
image:
|
image:
|
||||||
tag: adminpanel-v1.0.10-test
|
tag: adminpanel-v1.0.12-test
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
repository: git.sova.local/sova/adminpanel
|
repository: git.sova.local/sova/adminpanel
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
|
|||||||
@@ -193,8 +193,19 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
name: backend
|
name: backend
|
||||||
namespace: {{ .Values.namespace }}
|
namespace: {{ .Values.namespace }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
annotations:
|
||||||
|
cert-manager.io/cluster-issuer: {{ .Values.ingress.tls.clusterIssuer | quote }}
|
||||||
|
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: {{ .Values.ingress.className }}
|
ingressClassName: {{ .Values.ingress.className }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
- {{ .Values.ingress.host }}
|
||||||
|
secretName: {{ .Values.ingress.tls.secretName }}
|
||||||
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.ingress.host }}
|
- host: {{ .Values.ingress.host }}
|
||||||
http:
|
http:
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
ingress:
|
ingress:
|
||||||
host: api.dev.sovamed.ru
|
host: api.dev.sovamed.ru
|
||||||
|
tls:
|
||||||
|
enabled: true
|
||||||
|
clusterIssuer: letsencrypt-prod
|
||||||
|
secretName: backend-tls
|
||||||
image:
|
image:
|
||||||
tag: backend-v1.0.10-test
|
tag: backend-v1.0.12-test
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
repository: git.sova.local/sova/backend
|
repository: git.sova.local/sova/backend
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
|
|||||||
@@ -50,13 +50,13 @@ env:
|
|||||||
CORS_ALLOW_ORIGIN: "['http://admin.test.sova.local','https://admin.test.sova.local']"
|
CORS_ALLOW_ORIGIN: "['http://admin.test.sova.local','https://admin.test.sova.local']"
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
APP_SECRET: change-me-test-secret
|
APP_SECRET: In-brrZjIpzgCNAMq_CqBv-1VxOiS7h_1gDAUd7OkpI
|
||||||
DATABASE_URL: postgresql://sova_test:sova_test_pass@postgresql-test.sova-data-test.svc.cluster.local:5432/sova_backend_test?serverVersion=16&charset=utf8
|
DATABASE_URL: postgresql://sova_test:c%%25EDQxAr91khfvhle3CV4Mxg@postgresql-test.sova-data-test.svc.cluster.local:5432/sova_backend_test?serverVersion=16&charset=utf8
|
||||||
DATABASE_CABINET_URL: postgresql://sova_test:sova_test_pass@postgresql-test.sova-data-test.svc.cluster.local:5432/sova_cabinet_test?serverVersion=16&charset=utf8
|
DATABASE_CABINET_URL: postgresql://sova_test:c%%25EDQxAr91khfvhle3CV4Mxg@postgresql-test.sova-data-test.svc.cluster.local:5432/sova_cabinet_test?serverVersion=16&charset=utf8
|
||||||
DATABASE_BITRIX_URL: mysql://bitrix_test:bitrix_test_pass@mysql-bitrix-test.sova-data-test.svc.cluster.local:3306/sova_bitrix_test?serverVersion=8.0
|
DATABASE_BITRIX_URL: mysql://bitrix_test:xEpMvDAaCb%%21U1U%%2AwBOg8GAk%%2B@mysql-bitrix-test.sova-data-test.svc.cluster.local:3306/sova_bitrix_test?serverVersion=8.0
|
||||||
REDIS_URL: redis://:redis_test_pass@redis-test-master.sova-data-test.svc.cluster.local:6379/0
|
REDIS_URL: redis://:u96%%3Dbi6a%%21weD6xW3n%%23GGZQTZ@redis-test-master.sova-data-test.svc.cluster.local:6379/0
|
||||||
JWT_PASSPHRASE: ""
|
JWT_PASSPHRASE: ""
|
||||||
AES_SECRET_KEY: test-aes-secret-key-32bytes-min!!
|
AES_SECRET_KEY: o*HTus#3tw^%#sT*z_ZvY#!Uf46AFXRg
|
||||||
MAILER_ACCESS_TOKEN: test-mailer-token
|
MAILER_ACCESS_TOKEN: test-mailer-token
|
||||||
SMSRU_URL: http://noop.invalid
|
SMSRU_URL: http://noop.invalid
|
||||||
SMSRU_TOKEN: noop
|
SMSRU_TOKEN: noop
|
||||||
|
|||||||
@@ -177,8 +177,19 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
name: cabinet
|
name: cabinet
|
||||||
namespace: {{ .Values.namespace }}
|
namespace: {{ .Values.namespace }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
annotations:
|
||||||
|
cert-manager.io/cluster-issuer: {{ .Values.ingress.tls.clusterIssuer | quote }}
|
||||||
|
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: {{ .Values.ingress.className }}
|
ingressClassName: {{ .Values.ingress.className }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
- {{ .Values.ingress.host }}
|
||||||
|
secretName: {{ .Values.ingress.tls.secretName }}
|
||||||
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.ingress.host }}
|
- host: {{ .Values.ingress.host }}
|
||||||
http:
|
http:
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
ingress:
|
ingress:
|
||||||
host: cabinet.dev.sovamed.ru
|
host: cabinet.dev.sovamed.ru
|
||||||
|
tls:
|
||||||
|
enabled: true
|
||||||
|
clusterIssuer: letsencrypt-prod
|
||||||
|
secretName: cabinet-tls
|
||||||
image:
|
image:
|
||||||
tag: cabinet-v1.0.10-test
|
tag: cabinet-v1.0.12-test
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
repository: git.sova.local/sova/cabinet
|
repository: git.sova.local/sova/cabinet
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
|
|||||||
@@ -44,10 +44,10 @@ env:
|
|||||||
CORS_ALLOW_ORIGIN: "^https?://(cabinet\\.test\\.sova\\.local|localhost)(:[0-9]+)?$"
|
CORS_ALLOW_ORIGIN: "^https?://(cabinet\\.test\\.sova\\.local|localhost)(:[0-9]+)?$"
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
APP_SECRET: change-me-cabinet-test-secret
|
APP_SECRET: sUkQq2K4-57_woq1NgLTuApbRZNGayc41QY3j5CI1Y4
|
||||||
DATABASE_URL: postgresql://sova_test:sova_test_pass@postgresql-test.sova-data-test.svc.cluster.local:5432/sova_cabinet_test?serverVersion=16&charset=utf8
|
DATABASE_URL: postgresql://sova_test:c%%25EDQxAr91khfvhle3CV4Mxg@postgresql-test.sova-data-test.svc.cluster.local:5432/sova_cabinet_test?serverVersion=16&charset=utf8
|
||||||
DATABASE_BITRIX_URL: mysql://bitrix_test:bitrix_test_pass@mysql-bitrix-test.sova-data-test.svc.cluster.local:3306/sova_bitrix_test?serverVersion=8.0
|
DATABASE_BITRIX_URL: mysql://bitrix_test:xEpMvDAaCb%%21U1U%%2AwBOg8GAk%%2B@mysql-bitrix-test.sova-data-test.svc.cluster.local:3306/sova_bitrix_test?serverVersion=8.0
|
||||||
REDIS_URL: redis://:redis_test_pass@redis-test-master.sova-data-test.svc.cluster.local:6379/1
|
REDIS_URL: redis://:u96%%3Dbi6a%%21weD6xW3n%%23GGZQTZ@redis-test-master.sova-data-test.svc.cluster.local:6379/1
|
||||||
MAILER_DSN: smtp://mailpit.sova-mocks.svc.cluster.local:1025
|
MAILER_DSN: smtp://mailpit.sova-mocks.svc.cluster.local:1025
|
||||||
SMSRU_KEY_API: noop
|
SMSRU_KEY_API: noop
|
||||||
SMSRU_FROM_SOVAMED: noop
|
SMSRU_FROM_SOVAMED: noop
|
||||||
|
|||||||
Vendored
+11
@@ -47,8 +47,19 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
name: docs
|
name: docs
|
||||||
namespace: {{ .Values.namespace }}
|
namespace: {{ .Values.namespace }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
annotations:
|
||||||
|
cert-manager.io/cluster-issuer: {{ .Values.ingress.tls.clusterIssuer | quote }}
|
||||||
|
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: {{ .Values.ingress.className }}
|
ingressClassName: {{ .Values.ingress.className }}
|
||||||
|
{{- if .Values.ingress.tls.enabled }}
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
- {{ .Values.ingress.host }}
|
||||||
|
secretName: {{ .Values.ingress.tls.secretName }}
|
||||||
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.ingress.host }}
|
- host: {{ .Values.ingress.host }}
|
||||||
http:
|
http:
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
ingress:
|
ingress:
|
||||||
host: docs.dev.sovamed.ru
|
host: docs.dev.sovamed.ru
|
||||||
|
tls:
|
||||||
|
enabled: true
|
||||||
|
clusterIssuer: letsencrypt-prod
|
||||||
|
secretName: docs-tls
|
||||||
image:
|
image:
|
||||||
tag: docs-v1.0.10-test
|
tag: docs-v1.0.12-test
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
repository: git.sova.local/sova/docs
|
repository: git.sova.local/sova/docs
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ namespace: sova-data-test
|
|||||||
postgres:
|
postgres:
|
||||||
host: postgresql-test.sova-data-test.svc.cluster.local
|
host: postgresql-test.sova-data-test.svc.cluster.local
|
||||||
user: sova_test
|
user: sova_test
|
||||||
password: sova_test_pass
|
password: c%EDQxAr91khfvhle3CV4Mxg
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
host: mysql-bitrix-test.sova-data-test.svc.cluster.local
|
host: mysql-bitrix-test.sova-data-test.svc.cluster.local
|
||||||
user: bitrix_test
|
user: bitrix_test
|
||||||
password: bitrix_test_pass
|
password: xEpMvDAaCb!U1U*wBOg8GAk+
|
||||||
database: sova_bitrix_test
|
database: sova_bitrix_test
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ postgresql:
|
|||||||
fullnameOverride: postgresql-test
|
fullnameOverride: postgresql-test
|
||||||
auth:
|
auth:
|
||||||
username: sova_test
|
username: sova_test
|
||||||
password: sova_test_pass
|
password: c%EDQxAr91khfvhle3CV4Mxg
|
||||||
database: sova_backend_test
|
database: sova_backend_test
|
||||||
primary:
|
primary:
|
||||||
persistence:
|
persistence:
|
||||||
@@ -28,9 +28,9 @@ mysql:
|
|||||||
enabled: true
|
enabled: true
|
||||||
fullnameOverride: mysql-bitrix-test
|
fullnameOverride: mysql-bitrix-test
|
||||||
auth:
|
auth:
|
||||||
rootPassword: bitrix_root_test
|
rootPassword: NTv$fys*Y$m1sKcH+@F^^77F
|
||||||
username: bitrix_test
|
username: bitrix_test
|
||||||
password: bitrix_test_pass
|
password: xEpMvDAaCb!U1U*wBOg8GAk+
|
||||||
database: sova_bitrix_test
|
database: sova_bitrix_test
|
||||||
primary:
|
primary:
|
||||||
persistence:
|
persistence:
|
||||||
@@ -46,7 +46,7 @@ redis:
|
|||||||
enabled: true
|
enabled: true
|
||||||
fullnameOverride: redis-test
|
fullnameOverride: redis-test
|
||||||
auth:
|
auth:
|
||||||
password: redis_test_pass
|
password: u96=bi6a!weD6xW3n#GGZQTZ
|
||||||
master:
|
master:
|
||||||
persistence:
|
persistence:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
Reference in New Issue
Block a user