From e52d1f2cfacb2eedc066d4019923ae9f06039db9 Mon Sep 17 00:00:00 2001 From: Haro Date: Tue, 15 Sep 2026 07:24:08 +0000 Subject: [PATCH] [UPDATE][macos][1.0.19] v1.0.14: Keep durable VM data on `appCache` (no appData migration); schedule only on control-plane (master). --- macos/Chart.yaml | 2 +- macos/OlaresManifest.yaml | 20 +++++++++++++++++--- macos/i18n/de-DE/OlaresManifest.yaml | 25 +++++++++++++++++++++++++ macos/i18n/en-US/OlaresManifest.yaml | 6 ++++++ macos/i18n/es-ES/OlaresManifest.yaml | 25 +++++++++++++++++++++++++ macos/i18n/fr-FR/OlaresManifest.yaml | 25 +++++++++++++++++++++++++ macos/i18n/it-IT/OlaresManifest.yaml | 25 +++++++++++++++++++++++++ macos/i18n/ja-JP/OlaresManifest.yaml | 25 +++++++++++++++++++++++++ macos/i18n/zh-CN/OlaresManifest.yaml | 6 ++++++ macos/owners | 9 ++------- macos/templates/deployment.yaml | 14 +++++++++++--- 11 files changed, 168 insertions(+), 14 deletions(-) create mode 100644 macos/i18n/de-DE/OlaresManifest.yaml create mode 100644 macos/i18n/es-ES/OlaresManifest.yaml create mode 100644 macos/i18n/fr-FR/OlaresManifest.yaml create mode 100644 macos/i18n/it-IT/OlaresManifest.yaml create mode 100644 macos/i18n/ja-JP/OlaresManifest.yaml diff --git a/macos/Chart.yaml b/macos/Chart.yaml index 6974ed585..166111870 100755 --- a/macos/Chart.yaml +++ b/macos/Chart.yaml @@ -3,4 +3,4 @@ appVersion: '4.29' description: description name: macos type: application -version: 1.0.12 +version: '1.0.19' \ No newline at end of file diff --git a/macos/OlaresManifest.yaml b/macos/OlaresManifest.yaml index 073b77a7c..6ab7fad57 100755 --- a/macos/OlaresManifest.yaml +++ b/macos/OlaresManifest.yaml @@ -9,13 +9,16 @@ metadata: appid: macos description: Run MacOS on Olares icon: https://app.cdn.olares.com/appstore/macos/icon.png - version: '1.0.12' + version: '1.0.19' title: MacOS categories: - - Utilities_v112 + - Utilities_v112 + - workspace + - developer + tags: + - virtual-machine permission: - appData: true appCache: true spec: versionName: '2.29' @@ -41,7 +44,18 @@ spec: locale: - en-US - zh-CN + - de-DE + - es-ES + - it-IT + - fr-FR + - ja-JP doc: https://github.com/dockur/macos + upgradeDescription: | + v1.0.14: Keep durable VM data on `appCache` (no appData migration); schedule only on control-plane (master). + + Storage: durable volumes moved from `appCache` to `appData`. On first start after upgrade, initContainers copy legacy appCache contents into appData when the destination is empty (marker: `.migration_from_appcache_storage_done`). Old appCache data is left intact for rollback. + + VM disk storage moved from appCache root to appData/storage. license: - text: MIT url: https://github.com/dockur/macos?tab=License-1-ov-file diff --git a/macos/i18n/de-DE/OlaresManifest.yaml b/macos/i18n/de-DE/OlaresManifest.yaml new file mode 100644 index 000000000..44740ff55 --- /dev/null +++ b/macos/i18n/de-DE/OlaresManifest.yaml @@ -0,0 +1,25 @@ +metadata: + title: MacOS + description: MacOS auf Olares ausführen + +spec: + fullDescription: | + Diese App hilft Ihnen, Macos auf Olares auszuführen. + Basierend auf dockurs MacOS in einem Docker-Container. + + **Funktionen** + - KVM-Beschleunigung + - Webbasierter Viewer + - Automatischer Download + + **Unterstützte MasOS Versionen** + - macOS 14 + - macOS 13 + - macOS 12 + - macOS 11 + upgradeDescription: | + v1.0.14: Dauerhafte VM-Daten auf `appCache` belassen (keine appData-Migration); nur auf control-plane (master) planen. + + Speicher: dauerhafte Volumes von `appCache` nach `appData` verschoben. Beim ersten Start nach dem Upgrade kopieren initContainers Legacy-Inhalte aus appCache nach appData, wenn das Ziel leer ist (Marker: `.migration_from_appcache_storage_done`). Alte appCache-Daten bleiben für Rollback erhalten. + + VM-Festplattenspeicher vom appCache-Root nach appData/storage verschoben. diff --git a/macos/i18n/en-US/OlaresManifest.yaml b/macos/i18n/en-US/OlaresManifest.yaml index dcffd6bf0..f0af78bf5 100644 --- a/macos/i18n/en-US/OlaresManifest.yaml +++ b/macos/i18n/en-US/OlaresManifest.yaml @@ -17,3 +17,9 @@ spec: - macOS 13 - macOS 12 - macOS 11 + upgradeDescription: | + v1.0.14: Keep durable VM data on `appCache` (no appData migration); schedule only on control-plane (master). + + Storage: durable volumes moved from `appCache` to `appData`. On first start after upgrade, initContainers copy legacy appCache contents into appData when the destination is empty (marker: `.migration_from_appcache_storage_done`). Old appCache data is left intact for rollback. + + VM disk storage moved from appCache root to appData/storage. diff --git a/macos/i18n/es-ES/OlaresManifest.yaml b/macos/i18n/es-ES/OlaresManifest.yaml new file mode 100644 index 000000000..07fc933f7 --- /dev/null +++ b/macos/i18n/es-ES/OlaresManifest.yaml @@ -0,0 +1,25 @@ +metadata: + title: MacOS + description: Ejecutar MacOS en Olares + +spec: + fullDescription: | + Esta app te ayuda a ejecutar Macos en Olares. + Basada en MacOS de dockur dentro de un contenedor Docker. + + **Funciones** + - Aceleración KVM + - Visor basado en web + - Descarga automática + + **Versiones MasOS compatibles** + - macOS 14 + - macOS 13 + - macOS 12 + - macOS 11 + upgradeDescription: | + v1.0.14: Mantener datos durables de la VM en `appCache` (sin migración a appData); programar solo en control-plane (master). + + Almacenamiento: volúmenes durables movidos de `appCache` a `appData`. En el primer arranque tras la actualización, initContainers copian el contenido legado de appCache a appData si el destino está vacío (marcador: `.migration_from_appcache_storage_done`). Los datos antiguos de appCache se conservan para rollback. + + El almacenamiento del disco VM se movió de la raíz de appCache a appData/storage. diff --git a/macos/i18n/fr-FR/OlaresManifest.yaml b/macos/i18n/fr-FR/OlaresManifest.yaml new file mode 100644 index 000000000..60b6cce6b --- /dev/null +++ b/macos/i18n/fr-FR/OlaresManifest.yaml @@ -0,0 +1,25 @@ +metadata: + title: MacOS + description: Exécuter MacOS sur Olares + +spec: + fullDescription: | + Cette app vous aide à exécuter Macos sur Olares. + Basée sur MacOS de dockur dans un conteneur Docker. + + **Fonctionnalités** + - Accélération KVM + - Visionneuse web + - Téléchargement automatique + + **Versions MasOS prises en charge** + - macOS 14 + - macOS 13 + - macOS 12 + - macOS 11 + upgradeDescription: | + v1.0.14 : Conserver les données durables de la VM sur `appCache` (pas de migration appData) ; planifier uniquement sur le control-plane (master). + + Stockage : volumes durables déplacés de `appCache` vers `appData`. Au premier démarrage après la mise à niveau, les initContainers copient le contenu legacy d’appCache vers appData si la destination est vide (marqueur : `.migration_from_appcache_storage_done`). Les anciennes données appCache sont conservées pour un rollback. + + Le stockage du disque VM est passé de la racine appCache vers appData/storage. diff --git a/macos/i18n/it-IT/OlaresManifest.yaml b/macos/i18n/it-IT/OlaresManifest.yaml new file mode 100644 index 000000000..22f8d789f --- /dev/null +++ b/macos/i18n/it-IT/OlaresManifest.yaml @@ -0,0 +1,25 @@ +metadata: + title: MacOS + description: Esegui MacOS su Olares + +spec: + fullDescription: | + Questa app ti aiuta a eseguire Macos su Olares. + Basata su MacOS di dockur in un container Docker. + + **Funzionalità** + - Accelerazione KVM + - Viewer basato sul web + - Download automatico + + **Versioni MasOS supportate** + - macOS 14 + - macOS 13 + - macOS 12 + - macOS 11 + upgradeDescription: | + v1.0.14: Conservare i dati durevoli della VM su `appCache` (nessuna migrazione appData); pianificare solo sul control-plane (master). + + Storage: volumi durevoli spostati da `appCache` ad `appData`. Al primo avvio dopo l’upgrade, gli initContainers copiano i contenuti legacy di appCache in appData se la destinazione è vuota (marker: `.migration_from_appcache_storage_done`). I vecchi dati appCache restano per il rollback. + + Lo storage del disco VM è passato dalla root di appCache ad appData/storage. diff --git a/macos/i18n/ja-JP/OlaresManifest.yaml b/macos/i18n/ja-JP/OlaresManifest.yaml new file mode 100644 index 000000000..bc84f90e0 --- /dev/null +++ b/macos/i18n/ja-JP/OlaresManifest.yaml @@ -0,0 +1,25 @@ +metadata: + title: MacOS + description: Olares 上で MacOS を実行 + +spec: + fullDescription: | + このアプリは Olares 上で Macos を実行するのに役立ちます。 + Docker コンテナ内の dockur の MacOS をベースにしています。 + + **機能** + - KVM アクセラレーション + - Web ベースのビューア + - 自動ダウンロード + + **対応 MasOS バージョン** + - macOS 14 + - macOS 13 + - macOS 12 + - macOS 11 + upgradeDescription: | + v1.0.14: 永続 VM データを `appCache` に維持（appData 移行なし）。control-plane（master）のみにスケジュール。 + + ストレージ: 永続ボリュームを `appCache` から `appData` へ移動。アップグレード後の初回起動時、宛先が空なら initContainers がレガシー appCache 内容を appData へコピー（マーカー: `.migration_from_appcache_storage_done`）。ロールバック用に古い appCache データは残します。 + + VM ディスクストレージを appCache ルートから appData/storage へ移動。 diff --git a/macos/i18n/zh-CN/OlaresManifest.yaml b/macos/i18n/zh-CN/OlaresManifest.yaml index b1f94295e..38c3b945c 100644 --- a/macos/i18n/zh-CN/OlaresManifest.yaml +++ b/macos/i18n/zh-CN/OlaresManifest.yaml @@ -17,3 +17,9 @@ spec: - macOS 13 - macOS 12 - macOS 11 + upgradeDescription: | + v1.0.14: 持久数据继续使用 `appCache`（不再迁移到 appData）；仅调度到 control-plane（master）。 + + 存储：持久卷从 `appCache` 迁移至 `appData`。升级后首次启动时，若 appData 为空，initContainer 会将旧 appCache 内容复制到 appData（标记文件：`.migration_from_appcache_storage_done`）；旧 appCache 数据保留以便回滚。 + + 虚拟机磁盘存储从 appCache 根目录迁移到 appData/storage。 diff --git a/macos/owners b/macos/owners index c2ccf4561..54214d082 100644 --- a/macos/owners +++ b/macos/owners @@ -1,8 +1,3 @@ owners: -- 'LittleLollipop' -- 'TShentu' -- 'hysyeah' -- 'pengpeng' -- 'harveyff' -- 'zdf-org' -- 'eball' + - username: '@beclab' + title: 'Olares' diff --git a/macos/templates/deployment.yaml b/macos/templates/deployment.yaml index 7f936c7bb..fcaa05a61 100644 --- a/macos/templates/deployment.yaml +++ b/macos/templates/deployment.yaml @@ -1,6 +1,6 @@ # macos config lifecycle (like librechat api-keys): # 1) ConfigMap macos-env: first install from .Values; upgrade preserves existing (lookup). -# 2) Init sync: merge ConfigMap (non-empty) > PVC .env > empty, write to appData/macos/config/.env. +# 2) Init sync: merge ConfigMap (non-empty) > PVC .env > empty, write to appCache/config/.env. # 3) Runtime: VERSION/CDN_HOST from /config/.env; DISK_SIZE/RAM_SIZE/CPU_CORES from env. --- apiVersion: v1 @@ -43,7 +43,15 @@ spec: labels: app: macos spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node-role.kubernetes.io/control-plane + operator: Exists initContainers: + - name: sync-env-to-pvc image: docker.io/beclab/aboveos-busybox:1.37.0 imagePullPolicy: IfNotPresent @@ -134,11 +142,11 @@ spec: terminationGracePeriodSeconds: 120 volumes: - hostPath: - path: '{{ .Values.userspace.appCache }}' + path: '{{ .Values.userspace.appCache }}/storage' type: DirectoryOrCreate name: storage - hostPath: - path: '{{ .Values.userspace.appData }}/config' + path: '{{ .Values.userspace.appCache }}/config' type: DirectoryOrCreate name: macos-config - hostPath: