mass update and migrate to networking.k8s.io/v1 api

This commit is contained in:
ace
2022-07-31 06:28:07 +03:00
parent 6db00394ad
commit 3d09476cce
16 changed files with 139 additions and 60 deletions

View File

@ -6,12 +6,18 @@ wikijs_default_values:
fullnameOverride: "wikijs"
ingress:
enabled: true
annotations:
className: "{{ external_ingress_class if wikijs_publish else internal_ingress_class }}"
annotations:
cert-manager.io/cluster-issuer: "letsencrypt-prod"
kubernetes.io/ingress.class: "{{ external_ingress_class if wikijs_publish else internal_ingress_class }}"
kubernetes.io/tls-acme: "true"
nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
hosts:
- host: "{{ wikijs_short_name }}.{{ domain }}"
paths: ["/"]
paths:
- path: /
pathType: ImplementationSpecific
tls:
- secretName: "{{ wikijs_short_name }}.{{ domain }}-tls"
hosts:
@ -25,28 +31,32 @@ wikijs_default_values:
postgresqlDatabase: "{{ wikijs_db_name | default('wikijs') }}"
wikijs_readonly_ingress_definition: |
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
kubernetes.io/ingress.class: "{{ external_ingress_class }}"
nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
name: wikijs-public
namespace: "{{ wikijs_namespace | default(namespace) }}"
spec:
ingressClassName: "{{ external_ingress_class }}"
rules:
- host: "{{ wikijs_readonly_ingress }}"
http:
paths:
- backend:
serviceName: wikijs
servicePort: 80
service:
name: wikijs
port:
number: 80
path: /
pathType: ImplementationSpecific
tls:
- hosts:
- "{{ wikijs_readonly_ingress }}"
secretName: "{{ wikijs_readonly_ingress }}-tls"