Compare commits

...

18 Commits

Author SHA1 Message Date
eball
45a326230e fix: handle case for system applications without configuration in provider list (#2507) 2026-02-09 15:14:35 +08:00
eball
914c99e5df Merge branch 'main' into module-appservice
* main:
  Modify release-daemon.yaml for arm64 support
  fix: seafile trim commit_id for syncing and change psql ccnet init (#2495)
  backup: sync systemEnv default remote url (#2492)
  download-server: nats message publish modify (#2489)
  fix(cli): clear master host config when uninstalling (#2488)
  market, settings: support optional data deletion and fix bugs. (#2486)
  fix(cli): do not override upgrade target version by config file (#2483)
  app-service: feat app uninstall delete data (#2480)
2026-02-05 17:23:00 +08:00
eball
8f85a09564 app-service: handle case for system apps without configuration in permission API 2026-02-05 17:21:45 +08:00
eball
65b57fbf66 fix: handle case for system apps without configuration in permission API (#2498) 2026-02-05 17:19:13 +08:00
eball
5109ad001c Modify release-daemon.yaml for arm64 support
Add support for arm64 architecture in release daemon workflow
2026-02-05 14:24:33 +08:00
lovehunter9
4d850312f0 fix: seafile trim commit_id for syncing and change psql ccnet init (#2495) 2026-02-05 12:09:16 +08:00
aby913
1265ca929c backup: sync systemEnv default remote url (#2492)
* fix: get systemenv remove host

* backup: sync systemEnv default value
2026-02-05 00:30:52 +08:00
simon
6302bee05d download-server: nats message publish modify (#2489)
download
2026-02-05 00:29:45 +08:00
dkeven
2838d95f25 fix(cli): clear master host config when uninstalling (#2488) 2026-02-05 00:29:11 +08:00
berg
d3d7fc372d market, settings: support optional data deletion and fix bugs. (#2486)
* feat: support optional data deletion when uninstalling apps in Market

* market: add deleteData switch, add users info

* feat: update system frontend version

---------

Co-authored-by: aby913 <aby913@163.com>
2026-02-04 21:51:14 +08:00
dkeven
2bc061fcd8 fix(cli): do not override upgrade target version by config file (#2483) 2026-02-04 21:50:00 +08:00
hysyeah
b91566d6cd fix: app uninstall delete data (#2478) 2026-02-03 20:33:47 +08:00
dkeven
de87bd6b8e feat(appservice): support updating more fields in api & controller (#2472) 2026-02-03 20:32:14 +08:00
hys
95291474cb fix: add spec ports 2026-02-03 20:31:32 +08:00
hys
7a23d52b13 fix: check k8s request before into installing state 2026-02-03 20:31:32 +08:00
hys
93a9fcd834 fix: v2 app stop 2026-02-03 20:31:32 +08:00
hys
45a3e91bbd fix: helm upgrade do not use atomic param and allow upgrade failed release 2026-02-03 20:31:32 +08:00
hys
c9bac68646 fix: failed release upgrade 2026-02-03 20:31:32 +08:00
13 changed files with 58 additions and 20 deletions

View File

@@ -46,7 +46,15 @@ jobs:
- name: install udev-devel and pcap-devel
run: |
sudo apt update && sudo apt install -y libudev-dev libpcap-dev
sudo dpkg --add-architecture arm64
# Only modify ubuntu official sources, not third-party sources
sudo sed -i 's/^deb http:\/\/azure.archive.ubuntu.com/deb [arch=amd64] http:\/\/azure.archive.ubuntu.com/' /etc/apt/sources.list.d/ubuntu.sources 2>/dev/null || true
sudo sed -i 's/^Types: deb$/Types: deb\nArchitectures: amd64/' /etc/apt/sources.list.d/ubuntu.sources 2>/dev/null || true
# Add arm64 sources
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64.list
sudo apt update
sudo apt install -y libudev-dev libpcap-dev libudev-dev:arm64 libpcap-dev:arm64
- name: Install x86_64 cross-compiler
run: sudo apt-get update && sudo apt-get install -y build-essential

View File

@@ -317,7 +317,7 @@ spec:
chown -R 1000:1000 /uploadstemp && \
chown -R 1000:1000 /appdata
- name: olares-app-init
image: beclab/system-frontend:v1.8.5
image: beclab/system-frontend:v1.8.7
imagePullPolicy: IfNotPresent
command:
- /bin/sh

View File

@@ -385,6 +385,10 @@ func (a *Argument) loadMasterHostConfig() {
}
}
func (a *Argument) ClearMasterHostConfig() {
a.MasterHostConfig = &MasterHostConfig{}
}
func (a *Argument) SetManifest(manifest string) {
a.Manifest = manifest
}

View File

@@ -23,6 +23,7 @@ func UninstallTerminusPipeline() error {
arg.SetConsoleLog("uninstall.log", true)
arg.SetKubeVersion(kubeType)
arg.SetStorage(getStorageConfig())
arg.ClearMasterHostConfig()
phase := viper.GetString(common.FlagUninstallPhase)
all := viper.GetBool(common.FlagUninstallAll)

View File

@@ -30,13 +30,7 @@ func UpgradeOlaresPipeline() error {
return fmt.Errorf("error parsing current Olares version: %v", err)
}
// should only be and defaults to the current cli version
// this argument is for backwards-compatibility with older olaresd
targetVersionStr := viper.GetString(common.FlagVersion)
if targetVersionStr == "" {
targetVersionStr = version.VERSION
}
targetVersion, err := utils.ParseOlaresVersionString(targetVersionStr)
targetVersion, err := utils.ParseOlaresVersionString(version.VERSION)
if err != nil {
return fmt.Errorf("error parsing target Olares version: %v", err)
}

View File

@@ -7,15 +7,15 @@ import (
"github.com/beclab/Olares/cli/pkg/core/task"
)
type upgrader_1_12_6_20260122 struct {
type upgrader_1_12_5_20260122 struct {
breakingUpgraderBase
}
func (u upgrader_1_12_6_20260122) Version() *semver.Version {
return semver.MustParse("1.12.6-20260122")
func (u upgrader_1_12_5_20260122) Version() *semver.Version {
return semver.MustParse("1.12.5-20260122")
}
func (u upgrader_1_12_6_20260122) UpgradeSystemComponents() []task.Interface {
func (u upgrader_1_12_5_20260122) UpgradeSystemComponents() []task.Interface {
pre := []task.Interface{
&task.LocalTask{
Name: "UpgradeL4BFLProxy",
@@ -28,5 +28,5 @@ func (u upgrader_1_12_6_20260122) UpgradeSystemComponents() []task.Interface {
}
func init() {
registerDailyUpgrader(upgrader_1_12_6_20260122{})
registerDailyUpgrader(upgrader_1_12_5_20260122{})
}

View File

@@ -170,7 +170,7 @@ spec:
priorityClassName: "system-cluster-critical"
containers:
- name: app-service
image: beclab/app-service:0.5.0
image: beclab/app-service:0.5.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 6755

View File

@@ -586,6 +586,18 @@ func (h *Handler) getApplicationPermission(req *restful.Request, resp *restful.R
return
}
// sys app does not have app config
if am.Spec.Config == "" {
ret := &applicationPermission{
App: am.Spec.AppName,
Owner: owner,
Permissions: []permission{},
}
resp.WriteAsJson(ret)
return
}
var appConfig appcfg.ApplicationConfig
err = am.GetAppConfig(&appConfig)
if err != nil {
@@ -717,6 +729,12 @@ func (h *Handler) getApplicationProviderList(req *restful.Request, resp *restful
return
}
// sys app does not have app config
if am.Spec.Config == "" {
resp.WriteAsJson([]providerRegistry{})
return
}
var appConfig appcfg.ApplicationConfig
err = am.GetAppConfig(&appConfig)
if err != nil {

View File

@@ -1,6 +1,6 @@
{{ $backupVersion := "0.3.61" }}
{{ $backupVersion := "0.3.62" }}
{{ $backup_server_rootpath := printf "%s%s" .Values.rootPath "/rootfs/backup-server" }}
{{- $backup_nats_secret := (lookup "v1" "Secret" .Release.Namespace "backup-nats-secret") -}}

View File

@@ -57,6 +57,7 @@ func (s *Subscriber) Do(_ context.Context, obj interface{}, action watchers.Acti
return fmt.Errorf("invalid object type")
}
m := *mPtr
log.Infof("Sysenv data: %v", m)
// effective value can be from value or default
var newValue string
@@ -66,11 +67,14 @@ func (s *Subscriber) Do(_ context.Context, obj interface{}, action watchers.Acti
} else if d, ok := m["default"].(string); ok && d != "" {
newValue = d
}
if newValue == "" {
constant.OlaresRemoteService = constant.DefaultSyncServerURL
constant.SyncServerURL = constant.DefaultSyncServerURL
return nil
}
if constant.OlaresRemoteService == newValue {
if constant.SyncServerURL == newValue {
return nil
}

View File

@@ -180,7 +180,7 @@ spec:
memory: 300Mi
- name: download-server
image: "beclab/download-server:v0.1.20"
image: "beclab/download-server:v0.1.21"
imagePullPolicy: IfNotPresent
securityContext:
runAsUser: 0

View File

@@ -46,6 +46,14 @@ rules:
- get
- list
- watch
- apiGroups:
- iam.kubesphere.io
resources:
- users
verbs:
- get
- list
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -140,7 +148,7 @@ spec:
name: check-chart-repo
containers:
- name: appstore-backend
image: beclab/market-backend:v0.6.17
image: beclab/market-backend:v0.6.18
imagePullPolicy: IfNotPresent
ports:
- containerPort: 81

View File

@@ -166,6 +166,7 @@ data:
user = seafile_os_framework
password = {{ $pg_password | b64dec }}
db_name = os_framework_seafile
ccnet_db_name = os_framework_ccnet
connection_charset = utf8
create_tables = true
ccnet.conf: |-
@@ -248,7 +249,7 @@ spec:
containers:
- name: seafile-server
image: beclab/pg_seafile_server:v0.0.18
image: beclab/pg_seafile_server:v0.0.19
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8082