diff --git a/onlyofficev3/Chart.yaml b/onlyofficev3/Chart.yaml index 74bd47006..9d6bb6426 100644 --- a/onlyofficev3/Chart.yaml +++ b/onlyofficev3/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: onlyofficev3 description: A Olares Application Chart. type: application -version: 1.1.14 +version: 1.1.20 appVersion: "9.2.0" diff --git a/onlyofficev3/OlaresManifest.yaml b/onlyofficev3/OlaresManifest.yaml index 1b4a46ed4..255128c8b 100644 --- a/onlyofficev3/OlaresManifest.yaml +++ b/onlyofficev3/OlaresManifest.yaml @@ -6,10 +6,13 @@ metadata: description: Run your private office with the ONLYOFFICE icon: https://app.cdn.olares.com/appstore/onlyoffice/icon.png appid: onlyofficev3 - version: '1.1.14' + version: '1.1.20' title: OnlyOffice categories: - - Productivity_v112 + - Productivity_v112 + - workspace + tags: + - doc-process entrances: - name: onlyofficeproxy @@ -58,6 +61,10 @@ spec: **Spell-checking** upgradeDescription: | + + Run the official OpenResty entrance as UID/GID 1000 with writable runtime paths. + Raise the OpenResty reverse-proxy upload limit to `client_max_body_size 100m` so document uploads are not rejected with HTTP 413 (official OpenResty defaults to 1m). Roll `onlyofficeproxy` when the nginx ConfigMap changes (`checksum/nginx-config`), because a `subPath` mount does not pick up in-place ConfigMap updates. + Switch the reverse-proxy image from Bitnami OpenResty (`beclab/aboveos-bitnami-openresty:1.25.3-2`) to the official OpenResty image `openresty/openresty:1.29.2.5-bookworm-fat`. Align nginx config mounts and log paths with the official image layout (`/etc/nginx/conf.d/default.conf`, `/usr/local/openresty/nginx/logs/...`), and drop Bitnami-specific `OPENRESTY_CONF_FILE` wiring. @@ -87,6 +94,11 @@ spec: locale: - en-US - zh-CN + - de-DE + - es-ES + - it-IT + - fr-FR + - ja-JP doc: https://helpcenter.onlyoffice.com/index.aspx license: - text: AGPL-3.0 diff --git a/onlyofficev3/i18n/de-DE/OlaresManifest.yaml b/onlyofficev3/i18n/de-DE/OlaresManifest.yaml new file mode 100644 index 000000000..48b3d50f5 --- /dev/null +++ b/onlyofficev3/i18n/de-DE/OlaresManifest.yaml @@ -0,0 +1,36 @@ +metadata: + title: OnlyOffice + description: Betreiben Sie Ihr privates Office mit ONLYOFFICE +spec: + fullDescription: | + ONLYOFFICE Docs ist eine kostenlose kollaborative Online-Office-Suite mit Viewern und Editoren für Texte, Tabellen und Präsentationen, Formulare und PDF, vollständig kompatibel mit Office Open XML-Formaten: .docx, .xlsx, .pptx, und ermöglicht kollaboratives Bearbeiten in Echtzeit. + + **WICHTIGER HINWEIS** + Beim ersten Start von ONLYOFFICE navigieren Sie zu ControlHub. Im onlyoffice-Pod öffnen Sie das Terminal des Containers „onlyoffice“. Geben Sie den Befehl `supervisorctl start ds:example` ein. Kehren Sie dann zur Willkommensseite zurück und klicken Sie auf „go to test example“, um es auszuprobieren. + + ONLYOFFICE Docs umfasst folgende Editoren: + **ONLYOFFICE Document Editor** + **ONLYOFFICE Spreadsheet Editor** + **ONLYOFFICE Presentation Editor** + **ONLYOFFICE Form Creator** + **ONLYOFFICE PDF editor, reader & converter** + + Die Editoren ermöglichen das Erstellen, Bearbeiten, Speichern und Exportieren von Text-, Tabellen- und Präsentationsdokumenten und bieten zusätzlich: + **Collaborative editing** + **Hieroglyph support** + **Reviewing** + **Spell-checking** + upgradeDescription: | + Upload-Limit des OpenResty-Reverse-Proxys auf `client_max_body_size 100m` erhöhen, damit Dokument-Uploads nicht mit HTTP 413 abgelehnt werden (offizielles OpenResty standardmäßig 1m). `onlyofficeproxy` bei Änderungen der nginx-ConfigMap rollen (`checksum/nginx-config`), da ein `subPath`-Mount In-Place-ConfigMap-Updates nicht übernimmt. + + Wechsel des Reverse-Proxy-Images von Bitnami OpenResty (`beclab/aboveos-bitnami-openresty:1.25.3-2`) zum offiziellen OpenResty-Image `openresty/openresty:1.29.2.5-bookworm-fat`. + + Nginx-Konfigurations-Mounts und Log-Pfade an das Layout des offiziellen Images anpassen (`/etc/nginx/conf.d/default.conf`, `/usr/local/openresty/nginx/logs/...`) und Bitnami-spezifisches `OPENRESTY_CONF_FILE`-Wiring entfernen. + + ONLYOFFICE auf das Shared-App-Muster apiVersion v3 migriert (onlyofficev2 → onlyofficev3). + + **Was sich geändert hat** + + - **Architektur**: onlyofficev2/onlyofficev2server-Untercharts in einen einzelnen Chart abgeflacht; das DocumentServer-Deployment heißt jetzt nach dem Release (`{{ .Release.Name }}` == appid) für die v3-Workload-Verifikation, und das nginx-Eingangs-Deployment ist `onlyofficeproxy`. Backend-Referenzen werden jetzt im Release-Namespace aufgelöst statt der alten `*-shared` Cross-Namespace-Namen. + - **Skalierung**: `workloadReplicas` deklariert Replikazahlen für DocumentServer `onlyofficev3`, `jwtgeter`, `onlyofficeclient` und Eingangs-Workload `onlyofficeproxy`. + - **Runtime**: ONLYOFFICE DocumentServer 9.2.0 (unverändert). diff --git a/onlyofficev3/i18n/en-US/OlaresManifest.yaml b/onlyofficev3/i18n/en-US/OlaresManifest.yaml index 9019f0268..6f9bc03d8 100644 --- a/onlyofficev3/i18n/en-US/OlaresManifest.yaml +++ b/onlyofficev3/i18n/en-US/OlaresManifest.yaml @@ -21,6 +21,8 @@ spec: **Reviewing** **Spell-checking** upgradeDescription: | + Raise the OpenResty reverse-proxy upload limit to `client_max_body_size 100m` so document uploads are not rejected with HTTP 413 (official OpenResty defaults to 1m). Roll `onlyofficeproxy` when the nginx ConfigMap changes (`checksum/nginx-config`), because a `subPath` mount does not pick up in-place ConfigMap updates. + Switch the reverse-proxy image from Bitnami OpenResty (`beclab/aboveos-bitnami-openresty:1.25.3-2`) to the official OpenResty image `openresty/openresty:1.29.2.5-bookworm-fat`. Align nginx config mounts and log paths with the official image layout (`/etc/nginx/conf.d/default.conf`, `/usr/local/openresty/nginx/logs/...`), and drop Bitnami-specific `OPENRESTY_CONF_FILE` wiring. diff --git a/onlyofficev3/i18n/es-ES/OlaresManifest.yaml b/onlyofficev3/i18n/es-ES/OlaresManifest.yaml new file mode 100644 index 000000000..2269a3bd1 --- /dev/null +++ b/onlyofficev3/i18n/es-ES/OlaresManifest.yaml @@ -0,0 +1,36 @@ +metadata: + title: OnlyOffice + description: Ejecuta tu oficina privada con ONLYOFFICE +spec: + fullDescription: | + ONLYOFFICE Docs es una suite ofimática online colaborativa gratuita con visores y editores de textos, hojas de cálculo y presentaciones, formularios y PDF, totalmente compatible con formatos Office Open XML: .docx, .xlsx, .pptx, y que permite la edición colaborativa en tiempo real. + + **NOTA IMPORTANTE** + Al iniciar ONLYOFFICE por primera vez, ve a ControlHub. En el pod onlyoffice, abre la terminal del contenedor «onlyoffice». Introduce el comando `supervisorctl start ds:example`. Luego vuelve a la página de bienvenida y haz clic en «go to test example» para probarlo. + + ONLYOFFICE Docs incluye los siguientes editores: + **ONLYOFFICE Document Editor** + **ONLYOFFICE Spreadsheet Editor** + **ONLYOFFICE Presentation Editor** + **ONLYOFFICE Form Creator** + **ONLYOFFICE PDF editor, reader & converter** + + Los editores te permiten crear, editar, guardar y exportar documentos de texto, hojas de cálculo y presentaciones, y además tienen: + **Collaborative editing** + **Hieroglyph support** + **Reviewing** + **Spell-checking** + upgradeDescription: | + Elevar el límite de subida del proxy inverso OpenResty a `client_max_body_size 100m` para que las subidas de documentos no se rechacen con HTTP 413 (OpenResty oficial por defecto 1m). Reiniciar `onlyofficeproxy` cuando cambie el ConfigMap de nginx (`checksum/nginx-config`), porque un montaje `subPath` no recoge actualizaciones in-place del ConfigMap. + + Cambiar la imagen del proxy inverso de Bitnami OpenResty (`beclab/aboveos-bitnami-openresty:1.25.3-2`) a la imagen oficial de OpenResty `openresty/openresty:1.29.2.5-bookworm-fat`. + + Alinear los montajes de configuración de nginx y las rutas de registro con el diseño de la imagen oficial (`/etc/nginx/conf.d/default.conf`, `/usr/local/openresty/nginx/logs/...`) y eliminar el cableado específico de Bitnami `OPENRESTY_CONF_FILE`. + + ONLYOFFICE migrado al patrón de app compartida apiVersion v3 (onlyofficev2 → onlyofficev3). + + **Qué cambió** + + - **Arquitectura**: subgráficos onlyofficev2/onlyofficev2server aplanados en un solo chart; el Deployment de DocumentServer ahora se nombra según el release (`{{ .Release.Name }}` == appid) para la verificación de cargas v3, y el Deployment de entrada nginx es `onlyofficeproxy`. Las referencias de backend se resuelven ahora en el namespace del release en lugar de los antiguos nombres cross-namespace `*-shared`. + - **Escalado**: `workloadReplicas` declara conteos de réplicas para DocumentServer `onlyofficev3`, `jwtgeter`, `onlyofficeclient` y la carga de entrada `onlyofficeproxy`. + - **Runtime**: ONLYOFFICE DocumentServer 9.2.0 (sin cambios). diff --git a/onlyofficev3/i18n/fr-FR/OlaresManifest.yaml b/onlyofficev3/i18n/fr-FR/OlaresManifest.yaml new file mode 100644 index 000000000..0ffc5286d --- /dev/null +++ b/onlyofficev3/i18n/fr-FR/OlaresManifest.yaml @@ -0,0 +1,36 @@ +metadata: + title: OnlyOffice + description: Exécutez votre office privé avec ONLYOFFICE +spec: + fullDescription: | + ONLYOFFICE Docs est une suite bureautique collaborative en ligne gratuite comprenant visionneuses et éditeurs pour textes, tableurs et présentations, formulaires et PDF, pleinement compatible avec les formats Office Open XML : .docx, .xlsx, .pptx, et permettant l'édition collaborative en temps réel. + + **NOTE IMPORTANTE** + Lors du premier démarrage d'ONLYOFFICE, allez dans ControlHub. Dans le pod onlyoffice, ouvrez le terminal du conteneur « onlyoffice ». Entrez la commande `supervisorctl start ds:example`. Puis revenez à la page d'accueil et cliquez sur « go to test example » pour l'essayer. + + ONLYOFFICE Docs inclut les éditeurs suivants : + **ONLYOFFICE Document Editor** + **ONLYOFFICE Spreadsheet Editor** + **ONLYOFFICE Presentation Editor** + **ONLYOFFICE Form Creator** + **ONLYOFFICE PDF editor, reader & converter** + + Les éditeurs vous permettent de créer, modifier, enregistrer et exporter des documents texte, tableurs et présentations, et offrent en plus : + **Collaborative editing** + **Hieroglyph support** + **Reviewing** + **Spell-checking** + upgradeDescription: | + Augmenter la limite d'upload du reverse-proxy OpenResty à `client_max_body_size 100m` pour que les téléversements de documents ne soient pas rejetés avec HTTP 413 (OpenResty officiel par défaut à 1m). Relancer `onlyofficeproxy` lorsque le ConfigMap nginx change (`checksum/nginx-config`), car un montage `subPath` ne prend pas en compte les mises à jour in-place du ConfigMap. + + Remplacer l'image du reverse-proxy Bitnami OpenResty (`beclab/aboveos-bitnami-openresty:1.25.3-2`) par l'image officielle OpenResty `openresty/openresty:1.29.2.5-bookworm-fat`. + + Aligner les montages de configuration nginx et les chemins de journaux sur la disposition de l'image officielle (`/etc/nginx/conf.d/default.conf`, `/usr/local/openresty/nginx/logs/...`), et supprimer le câblage spécifique à Bitnami `OPENRESTY_CONF_FILE`. + + ONLYOFFICE migré vers le modèle d'application partagée apiVersion v3 (onlyofficev2 → onlyofficev3). + + **Changements** + + - **Architecture** : sous-charts onlyofficev2/onlyofficev2server aplatis en un seul chart ; le Deployment DocumentServer porte désormais le nom de la release (`{{ .Release.Name }}` == appid) pour la vérification des charges v3, et le Deployment d'entrée nginx est `onlyofficeproxy`. Les références backend se résolvent désormais dans le namespace de la release au lieu des anciens noms cross-namespace `*-shared`. + - **Mise à l'échelle** : `workloadReplicas` déclare les comptes de réplicas pour DocumentServer `onlyofficev3`, `jwtgeter`, `onlyofficeclient` et la charge d'entrée `onlyofficeproxy`. + - **Runtime** : ONLYOFFICE DocumentServer 9.2.0 (inchangé). diff --git a/onlyofficev3/i18n/it-IT/OlaresManifest.yaml b/onlyofficev3/i18n/it-IT/OlaresManifest.yaml new file mode 100644 index 000000000..c7a8cbfc9 --- /dev/null +++ b/onlyofficev3/i18n/it-IT/OlaresManifest.yaml @@ -0,0 +1,36 @@ +metadata: + title: OnlyOffice + description: Gestisci il tuo office privato con ONLYOFFICE +spec: + fullDescription: | + ONLYOFFICE Docs è una suite office online collaborativa gratuita con visualizzatori ed editor per testi, fogli di calcolo e presentazioni, moduli e PDF, pienamente compatibile con i formati Office Open XML: .docx, .xlsx, .pptx, e che abilita l'editing collaborativo in tempo reale. + + **NOTA IMPORTANTE** + Al primo avvio di ONLYOFFICE, vai su ControlHub. Nel pod onlyoffice, apri il terminale del container «onlyoffice». Digita il comando `supervisorctl start ds:example`. Poi torna alla pagina di benvenuto e clicca su «go to test example» per provarlo. + + ONLYOFFICE Docs include i seguenti editor: + **ONLYOFFICE Document Editor** + **ONLYOFFICE Spreadsheet Editor** + **ONLYOFFICE Presentation Editor** + **ONLYOFFICE Form Creator** + **ONLYOFFICE PDF editor, reader & converter** + + Gli editor consentono di creare, modificare, salvare ed esportare documenti di testo, fogli e presentazioni e inoltre offrono: + **Collaborative editing** + **Hieroglyph support** + **Reviewing** + **Spell-checking** + upgradeDescription: | + Alzare il limite di upload del reverse proxy OpenResty a `client_max_body_size 100m` così gli upload di documenti non vengono rifiutati con HTTP 413 (OpenResty ufficiale di default 1m). Fare rolling di `onlyofficeproxy` quando cambia il ConfigMap nginx (`checksum/nginx-config`), perché un mount `subPath` non recepisce aggiornamenti in-place del ConfigMap. + + Passare l'immagine del reverse proxy da Bitnami OpenResty (`beclab/aboveos-bitnami-openresty:1.25.3-2`) all'immagine ufficiale OpenResty `openresty/openresty:1.29.2.5-bookworm-fat`. + + Allineare i mount della configurazione nginx e i percorsi dei log al layout dell'immagine ufficiale (`/etc/nginx/conf.d/default.conf`, `/usr/local/openresty/nginx/logs/...`) e rimuovere il wiring specifico Bitnami `OPENRESTY_CONF_FILE`. + + ONLYOFFICE migrato al pattern di app condivisa apiVersion v3 (onlyofficev2 → onlyofficev3). + + **Cosa è cambiato** + + - **Architettura**: sottograph onlyofficev2/onlyofficev2server appiattiti in un unico chart; il Deployment DocumentServer ora prende il nome dalla release (`{{ .Release.Name }}` == appid) per la verifica workload v3, e il Deployment d'ingresso nginx è `onlyofficeproxy`. I riferimenti backend si risolvono ora nel namespace della release invece dei vecchi nomi cross-namespace `*-shared`. + - **Scaling**: `workloadReplicas` dichiara i conteggi di replica per DocumentServer `onlyofficev3`, `jwtgeter`, `onlyofficeclient` e il workload d'ingresso `onlyofficeproxy`. + - **Runtime**: ONLYOFFICE DocumentServer 9.2.0 (invariato). diff --git a/onlyofficev3/i18n/ja-JP/OlaresManifest.yaml b/onlyofficev3/i18n/ja-JP/OlaresManifest.yaml new file mode 100644 index 000000000..4baacc2e6 --- /dev/null +++ b/onlyofficev3/i18n/ja-JP/OlaresManifest.yaml @@ -0,0 +1,36 @@ +metadata: + title: OnlyOffice + description: ONLYOFFICE でプライベートオフィスを運用 +spec: + fullDescription: | + ONLYOFFICE Docs は、テキスト・表計算・プレゼンテーション・フォーム・PDF のビューアとエディタを備えた無料の共同編集オンラインオフィススイートで、Office Open XML 形式(.docx、.xlsx、.pptx)と完全互換、リアルタイム共同編集が可能です。 + + **重要なお知らせ** + ONLYOFFICE を初めて起動するときは ControlHub に移動します。onlyoffice Pod 内の「onlyoffice」コンテナのターミナルを開き、`supervisorctl start ds:example` を実行します。その後ウェルカムページに戻り、「go to test example」をクリックして試してください。 + + ONLYOFFICE Docs には次のエディタが含まれます: + **ONLYOFFICE Document Editor** + **ONLYOFFICE Spreadsheet Editor** + **ONLYOFFICE Presentation Editor** + **ONLYOFFICE Form Creator** + **ONLYOFFICE PDF editor, reader & converter** + + エディタではテキスト・表計算・プレゼン文書の作成・編集・保存・エクスポートができ、さらに次の機能があります: + **Collaborative editing** + **Hieroglyph support** + **Reviewing** + **Spell-checking** + upgradeDescription: | + OpenResty リバースプロキシのアップロード上限を `client_max_body_size 100m` に引き上げ、文書アップロードが HTTP 413 で拒否されないようにします(公式 OpenResty のデフォルトは 1m)。nginx ConfigMap 変更時に `onlyofficeproxy` をロール(`checksum/nginx-config`)。`subPath` マウントは ConfigMap のその場更新を拾いません。 + + リバースプロキシのイメージを Bitnami OpenResty(`beclab/aboveos-bitnami-openresty:1.25.3-2`)から公式 OpenResty イメージ `openresty/openresty:1.29.2.5-bookworm-fat` に切り替えます。 + + nginx 設定のマウントとログパスを公式イメージのレイアウト(`/etc/nginx/conf.d/default.conf`、`/usr/local/openresty/nginx/logs/...`)に合わせ、Bitnami 固有の `OPENRESTY_CONF_FILE` 配線を削除します。 + + ONLYOFFICE を apiVersion v3 共有アプリパターンへ移行(onlyofficev2 → onlyofficev3)。 + + **変更内容** + + - **アーキテクチャ**: onlyofficev2/onlyofficev2server サブチャートを単一チャートに平坦化;DocumentServer Deployment は v3 ワークロード検証のためリリース名(`{{ .Release.Name }}` == appid)に命名、nginx エントランス Deployment は `onlyofficeproxy`。バックエンド参照は旧 `*-shared` クロス名前空間名ではなくリリース名前空間内で解決。 + - **スケーリング**: `workloadReplicas` が DocumentServer `onlyofficev3`、`jwtgeter`、`onlyofficeclient`、エントランス `onlyofficeproxy` のレプリカ数を宣言。 + - **ランタイム**: ONLYOFFICE DocumentServer 9.2.0(変更なし)。 diff --git a/onlyofficev3/i18n/zh-CN/OlaresManifest.yaml b/onlyofficev3/i18n/zh-CN/OlaresManifest.yaml index 6763afc61..634560380 100644 --- a/onlyofficev3/i18n/zh-CN/OlaresManifest.yaml +++ b/onlyofficev3/i18n/zh-CN/OlaresManifest.yaml @@ -22,6 +22,8 @@ spec: **Spell-checking** upgradeDescription: | + 将 OpenResty 反向代理上传限制提升为 `client_max_body_size 100m`,避免文档上传因默认 1m 限制返回 HTTP 413。nginx ConfigMap 变更时通过 `checksum/nginx-config` 滚动重建 `onlyofficeproxy`(`subPath` 挂载不会随 ConfigMap 原地更新)。 + 将反向代理镜像从 Bitnami OpenResty(`beclab/aboveos-bitnami-openresty:1.25.3-2`)切换为官方 OpenResty 镜像 `openresty/openresty:1.29.2.5-bookworm-fat`。 同步调整 nginx 配置挂载与日志路径以匹配官方镜像布局(`/etc/nginx/conf.d/default.conf`、`/usr/local/openresty/nginx/logs/...`),并移除 Bitnami 专用的 `OPENRESTY_CONF_FILE` 配置。 diff --git a/onlyofficev3/owners b/onlyofficev3/owners index ecd48b503..54214d082 100644 --- a/onlyofficev3/owners +++ b/onlyofficev3/owners @@ -1,8 +1,3 @@ owners: -- 'LittleLollipop' -- 'TShentu' -- 'hysyeah' -- 'pengpeng' -- 'harveyff' -- 'zdf-org' -- 'aby913' + - username: '@beclab' + title: 'Olares' diff --git a/onlyofficev3/templates/_helpers.tpl b/onlyofficev3/templates/_helpers.tpl new file mode 100644 index 000000000..d448bceec --- /dev/null +++ b/onlyofficev3/templates/_helpers.tpl @@ -0,0 +1,68 @@ +{{/* +Nginx reverse proxy config for onlyofficeproxy. +Referenced by onlyofficeproxy.yaml; checksum in Deployment triggers rollout on change. +*/}} +{{- define "onlyofficev3.nginx.conf" -}} +server { + client_body_temp_path /tmp/client_body; + proxy_temp_path /tmp/proxy; + fastcgi_temp_path /tmp/fastcgi; + uwsgi_temp_path /tmp/uwsgi; + scgi_temp_path /tmp/scgi; + listen 8080; + access_log /dev/stdout; + error_log /dev/stderr; + + # Official OpenResty defaults to 1m; office document uploads need more. + client_max_body_size 100m; + + proxy_connect_timeout 30s; + proxy_send_timeout 60s; + proxy_read_timeout 300s; + + proxy_set_header host $host; + proxy_set_header x-forwarded-host $http_host; + proxy_http_version 1.1; + proxy_set_header upgrade $http_upgrade; + proxy_set_header connection "upgrade"; + + proxy_set_header X-BFL-USER {{ .Values.bfl.username }}; + proxy_set_header Cookie $http_cookie; + proxy_set_header X-Authorization $http_x_authorization; + + location /coauthoring/CommandService.ashx { + add_header X-Frame-Options ""; + proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/coauthoring/CommandService.ashx; + } + + location /ConvertService.ashx { + add_header X-Frame-Options ""; + proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/ConvertService.ashx; + } + + location /coauthoring/ { + add_header X-Frame-Options ""; + proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/coauthoring/; + } + + location /web-apps { + add_header X-Frame-Options ""; + proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/web-apps; + } + + location ~ ^/9.2.0 { + add_header X-Frame-Options ""; + proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80; + } + + location /cache { + add_header X-Frame-Options ""; + proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/cache; + } + + location / { + add_header X-Frame-Options ""; + proxy_pass http://onlyofficeclient.{{ .Release.Namespace }}.svc.cluster.local:3000; + } +} +{{- end -}} diff --git a/onlyofficev3/templates/onlyofficeproxy.yaml b/onlyofficev3/templates/onlyofficeproxy.yaml index 601d42851..20133bde4 100644 --- a/onlyofficev3/templates/onlyofficeproxy.yaml +++ b/onlyofficev3/templates/onlyofficeproxy.yaml @@ -5,60 +5,7 @@ metadata: namespace: "{{ .Release.Namespace }}" data: nginx.conf: | - server { - listen 8080; - access_log /usr/local/openresty/nginx/logs/access.log; - error_log /usr/local/openresty/nginx/logs/error.log; - - proxy_connect_timeout 30s; - proxy_send_timeout 60s; - proxy_read_timeout 300s; - - proxy_set_header host $host; - proxy_set_header x-forwarded-host $http_host; - proxy_http_version 1.1; - proxy_set_header upgrade $http_upgrade; - proxy_set_header connection "upgrade"; - - proxy_set_header X-BFL-USER {{ .Values.bfl.username }}; - proxy_set_header Cookie $http_cookie; - proxy_set_header X-Authorization $http_x_authorization; - - location /coauthoring/CommandService.ashx { - add_header X-Frame-Options ""; - proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/coauthoring/CommandService.ashx; - } - - location /ConvertService.ashx { - add_header X-Frame-Options ""; - proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/ConvertService.ashx; - } - - location /coauthoring/ { - add_header X-Frame-Options ""; - proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/coauthoring/; - } - - location /web-apps { - add_header X-Frame-Options ""; - proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/web-apps; - } - - location ~ ^/9.2.0 { - add_header X-Frame-Options ""; - proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80; - } - - location /cache { - add_header X-Frame-Options ""; - proxy_pass http://onlyoffice-svc.{{ .Release.Namespace }}.svc.cluster.local:80/cache; - } - - location / { - add_header X-Frame-Options ""; - proxy_pass http://onlyofficeclient.{{ .Release.Namespace }}.svc.cluster.local:3000; - } - } +{{ include "onlyofficev3.nginx.conf" . | indent 4 }} --- apiVersion: apps/v1 @@ -73,11 +20,15 @@ spec: selector: matchLabels: io.kompose.service: onlyoffice + strategy: + type: Recreate template: metadata: labels: io.kompose.network/chrome-default: "true" io.kompose.service: onlyoffice + annotations: + checksum/nginx-config: {{ include "onlyofficev3.nginx.conf" . | sha256sum }} spec: volumes: - name: nginx-config @@ -87,9 +38,20 @@ spec: items: - key: nginx.conf path: nginx.conf + - name: nginx-runtime + emptyDir: {} containers: - name: nginx image: "docker.io/openresty/openresty:1.29.2.5-bookworm-fat" + command: + - /usr/local/openresty/bin/openresty + args: + - -g + - "daemon off; pid /tmp/nginx.pid;" + securityContext: + runAsUser: 1000 + runAsGroup: 1000 + imagePullPolicy: IfNotPresent ports: - containerPort: 8080 @@ -118,6 +80,8 @@ spec: - name: nginx-config mountPath: /etc/nginx/conf.d/default.conf subPath: nginx.conf + - name: nginx-runtime + mountPath: /var/run/openresty --- apiVersion: v1