From 681b9324a857bc287cc350463ad412bac96d4167 Mon Sep 17 00:00:00 2001 From: "artem.drozdov" Date: Tue, 13 Aug 2024 10:04:44 +0300 Subject: [PATCH] update --- yonote-chart/templates/ingress.yaml | 10 ++-- yonote-chart/values.yaml | 82 +++++++++++++++++++++-------- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/yonote-chart/templates/ingress.yaml b/yonote-chart/templates/ingress.yaml index 74ee4aa..04bc8a6 100644 --- a/yonote-chart/templates/ingress.yaml +++ b/yonote-chart/templates/ingress.yaml @@ -1,3 +1,4 @@ +{{- if .Values.ingress.enabled }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -16,10 +17,11 @@ spec: - "{{ . }}" {{- end }} rules: - - host: "{{ .Values.ingress.hostname }}" + {{- range .Values.ingress.rules }} + - host: "{{ .host }}" http: paths: - {{- range .Values.ingress.rules.paths }} + {{- range .paths }} - path: {{ .path }} pathType: {{ .pathType }} backend: @@ -27,4 +29,6 @@ spec: name: {{ .service.name }} port: number: {{ .service.port | int }} - {{- end }} \ No newline at end of file + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/yonote-chart/values.yaml b/yonote-chart/values.yaml index dbf92b2..b3bd94d 100644 --- a/yonote-chart/values.yaml +++ b/yonote-chart/values.yaml @@ -6,16 +6,13 @@ global: username: yonote yonote: - # ingress: - # ingressClassName: traefik - dbMigrationEnv: production-ssl-disabled # Режим подключения к базе данных при выполнении миграций. При использовании SSL подключения, установите значение `production` - baseListenAddress: onprem-test.stands.wilix.dev config: plain: data: + DEPLOYMENT: hosted NODE_ENV: production FORCE_HTTPS: "false" PGSSLMODE: disable # Отключает SSL подключение к базе данных. Уберите эту строку, если вы используете SSL подключение к PostgreSQL @@ -86,28 +83,27 @@ global: # pathType: Prefix # annotations: # cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev - # traefik.ingress.kubernetes.io/router.middlewares: '{{ .Release.Namespace }}-redirect-https@kubernetescrd,{{.Release.Namespace }}-wss-headers@kubernetescrd,kube-system-wilix-office-ipwhitelist@kubernetescrd' # # nginx.ingress.kubernetes.io/force-ssl-redirect: "false" # # nginx.ingress.kubernetes.io/configuration-snippet: | # # more_set_headers "Host $http_host"; # # more_set_headers "X-Real-IP $remote_addr"; # # more_set_headers "X-Forwarded-Proto $scheme"; # # more_set_headers "X-Forwarded-For $proxy_add_x_forwarded_for"; - # extraTls: - # - hosts: - # - "app.onprem-test.stands.wilix.dev" - # secretName: "app.onprem-test.stands.wilix.dev" + ingress: enabled: true name: yonote-ingress namespace: yonote-onprem ingressClassName: traefik - hostname: 'app.onprem-test.stands.wilix.dev' + # hostname: "*.onprem-test.stands.wilix.dev" tls: - secretName: "app.onprem-test.stands.wilix.dev" - hosts: - - "app.onprem-test.stands.wilix.dev" + secretName: "wildcard.onprem-test.stands.wilix.dev" + hosts: + - "*.onprem-test.stands.wilix.dev" + # - "tete.onprem-test.stands.wilix.dev" + # - "dada.onprem-test.stands.wilix.dev" rules: + - host: "*.onprem-test.stands.wilix.dev" paths: - path: / pathType: Prefix @@ -129,10 +125,54 @@ ingress: service: name: yonote-collaboration port: 80 + # - host: "tete.onprem-test.stands.wilix.dev" + # paths: + # - path: / + # pathType: Prefix + # service: + # name: yonote-web + # port: 80 + # - path: /realtime + # pathType: Prefix + # service: + # name: yonote-websockets + # port: 80 + # - path: /whiteboard + # pathType: Prefix + # service: + # name: yonote-whiteboard + # port: 80 + # - path: /collaboration + # pathType: Prefix + # service: + # name: yonote-collaboration + # port: 80 + # - host: "dada.onprem-test.stands.wilix.dev" + # paths: + # - path: / + # pathType: Prefix + # service: + # name: yonote-web + # port: 80 + # - path: /realtime + # pathType: Prefix + # service: + # name: yonote-websockets + # port: 80 + # - path: /whiteboard + # pathType: Prefix + # service: + # name: yonote-whiteboard + # port: 80 + # - path: /collaboration + # pathType: Prefix + # service: + # name: yonote-collaboration + # port: 80 + annotations: cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev - traefik.ingress.kubernetes.io/router.middlewares: '{{ .Release.Namespace }}-redirect-https@kubernetescrd,{{.Release.Namespace }}-wss-headers@kubernetescrd,kube-system-wilix-office-ipwhitelist@kubernetescrd' - + yonote-web: fullnameOverride: yonote-web nameOverride: yonote-web @@ -141,7 +181,7 @@ yonote-web: image: registry: images.updates.yonote.ru repository: yonote - tag: 1.19.5 + tag: 1.19.8 pullPolicy: IfNotPresent command: ["/bin/sh", "-c"] @@ -149,7 +189,7 @@ yonote-web: initContainers: - name: yonote-migration - image: images.updates.yonote.ru/yonote:1.19.5 + image: images.updates.yonote.ru/yonote:1.19.8 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -245,7 +285,7 @@ yonote-websocket: image: registry: images.updates.yonote.ru repository: yonote - tag: 1.19.5 + tag: 1.19.8 pullPolicy: IfNotPresent command: ["/bin/sh", "-c"] @@ -334,7 +374,7 @@ yonote-whiteboard: image: registry: images.updates.yonote.ru repository: yonote - tag: 1.19.5 + tag: 1.19.8 pullPolicy: IfNotPresent command: ["/bin/sh", "-c"] @@ -424,7 +464,7 @@ yonote-worker: image: registry: images.updates.yonote.ru repository: yonote - tag: 1.19.5 + tag: 1.19.8 pullPolicy: IfNotPresent command: ["/bin/sh", "-c"] @@ -493,7 +533,7 @@ yonote-collaboration: image: registry: images.updates.yonote.ru repository: yonote - tag: 1.19.5 + tag: 1.19.8 pullPolicy: IfNotPresent command: ["/bin/sh", "-c"]