Refactor yc-ecp Istio and cert-manager configurations: adjust ClusterIssuer specs, update certificate and VirtualService keys, and add port names.
This commit is contained in:
parent
6b107c872a
commit
e491466a37
@ -19,27 +19,33 @@ spec:
|
|||||||
yc-ecp:
|
yc-ecp:
|
||||||
namespaces: []
|
namespaces: []
|
||||||
certManager:
|
certManager:
|
||||||
|
# чарт рендерит ClusterIssuer как `spec: {{ toYaml $ci.spec }}`,
|
||||||
|
# поэтому спека обязана лежать под ключом spec
|
||||||
clusterIssuers:
|
clusterIssuers:
|
||||||
letsencrypt-prod:
|
letsencrypt-prod:
|
||||||
acme:
|
spec:
|
||||||
email: "sarex@sarex.io"
|
acme:
|
||||||
server: "https://acme-v02.api.letsencrypt.org/directory"
|
email: "sarex@sarex.io"
|
||||||
privateKeySecretRef:
|
server: "https://acme-v02.api.letsencrypt.org/directory"
|
||||||
name: letsencrypt-prod
|
privateKeySecretRef:
|
||||||
solvers:
|
name: letsencrypt-prod
|
||||||
- http01:
|
solvers:
|
||||||
ingress:
|
- http01:
|
||||||
class: istio
|
ingress:
|
||||||
|
class: istio
|
||||||
|
# имя Certificate = ключ, имя секрета задаётся отдельно
|
||||||
certificates:
|
certificates:
|
||||||
gitea-tls-secret:
|
gitea-cert:
|
||||||
namespace: istio-system
|
namespace: istio-system
|
||||||
|
secretName: gitea-tls-secret
|
||||||
dnsNames:
|
dnsNames:
|
||||||
- gitea.invest.cps.sarex.lonsdaleites.ru
|
- gitea.invest.cps.sarex.lonsdaleites.ru
|
||||||
issuerRef:
|
issuerRef:
|
||||||
name: letsencrypt-prod
|
name: letsencrypt-prod
|
||||||
kind: ClusterIssuer
|
kind: ClusterIssuer
|
||||||
vault-tls:
|
vault-cert:
|
||||||
namespace: istio-system
|
namespace: istio-system
|
||||||
|
secretName: vault-tls
|
||||||
dnsNames:
|
dnsNames:
|
||||||
- vault.invest.cps.sarex.lonsdaleites.ru
|
- vault.invest.cps.sarex.lonsdaleites.ru
|
||||||
issuerRef:
|
issuerRef:
|
||||||
@ -53,6 +59,8 @@ spec:
|
|||||||
servers:
|
servers:
|
||||||
- hosts:
|
- hosts:
|
||||||
- gitea.invest.cps.sarex.lonsdaleites.ru
|
- gitea.invest.cps.sarex.lonsdaleites.ru
|
||||||
|
httpPortName: http
|
||||||
|
httpsPortName: https
|
||||||
tls:
|
tls:
|
||||||
credentialName: gitea-tls-secret
|
credentialName: gitea-tls-secret
|
||||||
vault:
|
vault:
|
||||||
@ -61,12 +69,16 @@ spec:
|
|||||||
servers:
|
servers:
|
||||||
- hosts:
|
- hosts:
|
||||||
- vault.invest.cps.sarex.lonsdaleites.ru
|
- vault.invest.cps.sarex.lonsdaleites.ru
|
||||||
|
httpPortName: http
|
||||||
|
httpsPortName: https
|
||||||
tls:
|
tls:
|
||||||
credentialName: vault-tls
|
credentialName: vault-tls
|
||||||
|
# имя VirtualService = ключ, поле name чарт игнорирует.
|
||||||
|
# noCors: чарт иначе навешивает corsPolicy с дефолтными origins sarex.io
|
||||||
virtualServices:
|
virtualServices:
|
||||||
gitea:
|
gitea-virt-service:
|
||||||
name: gitea-virt-service
|
|
||||||
namespace: gitea
|
namespace: gitea
|
||||||
|
noCors: true
|
||||||
hosts:
|
hosts:
|
||||||
- gitea.invest.cps.sarex.lonsdaleites.ru
|
- gitea.invest.cps.sarex.lonsdaleites.ru
|
||||||
gateways:
|
gateways:
|
||||||
@ -76,9 +88,9 @@ spec:
|
|||||||
prefix: /
|
prefix: /
|
||||||
service: gitea.gitea.svc.cluster.local
|
service: gitea.gitea.svc.cluster.local
|
||||||
port: 3000
|
port: 3000
|
||||||
vault:
|
vault-virt-service:
|
||||||
name: vault-virt-service
|
|
||||||
namespace: vault
|
namespace: vault
|
||||||
|
noCors: true
|
||||||
hosts:
|
hosts:
|
||||||
- vault.invest.cps.sarex.lonsdaleites.ru
|
- vault.invest.cps.sarex.lonsdaleites.ru
|
||||||
gateways:
|
gateways:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user