Merge branch 'main' into module-bfl

* main:
  settings: add settings new version and update provider api (#2456)
  refactor(cli): unify config of command line options and envs (#2453)
  appservice: v2 app stop (#2455)
  download-server:add download err category && modify aria2 max concurrent (#2445)
  docs: add storage expansion via CLI (#2409)
  cli: upgrade l4-bfl-proxy to v0.3.10 (#2442)
  l4: skip invalid expose port  (#2441)
  appservice: add clickhouse support (#2440)
  daemon: change pcap open timeout to 1 millisecond to prevent close hang (#2439)
  tapr: add clickhouse support  (#2437)
  feat(gpu): supports dynamic detection of hot plugged-in GPUs (#2435)
  feat(olares-app): update version to v1.8.2 (#2433)
  bfl: myapps api add rawAppName  (#2432)
  cli: feat amdgpu install (#2430)
  feat(cli): collect nginx logs stored temporarily in some containers (#2429)
  docs/update/olares-space-storage-info

# Conflicts:
#	framework/bfl/.olares/config/launcher/templates/bfl_deploy.yaml

Author: eball

apps/.olares/config/user/helm-charts/system-apps/templates/files-provider.yaml

@@ -54,6 +54,7 @@ rules:
   - "/system/configuration/encoding"
   - "/api/search/get_directory/"
   - "/api/search/sync_search/"
+  - "/api/share/smb_share_user/"
   verbs: ["*"]
 
 ---

apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml

@@ -317,7 +317,7 @@ spec:
             chown -R 1000:1000 /uploadstemp && \
             chown -R 1000:1000 /appdata 
         - name: olares-app-init
-          image: beclab/system-frontend:v1.7.7
+          image: beclab/system-frontend:v1.8.3
           imagePullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -439,7 +439,7 @@ spec:
             - name: NATS_SUBJECT_VAULT
               value: os.vault.{{ .Values.bfl.username}}
         - name: user-service
-          image: beclab/user-service:v0.0.82
+          image: beclab/user-service:v0.0.83
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 3000

apps/.olares/config/user/helm-charts/system-apps/templates/search-provider.yaml

@@ -12,4 +12,5 @@ rules:
   - "/task/*"
   - "/search/*"
   - "/monitorsetting/*"
+  - "/file/*"
   verbs: ["*"]

build/base-package/install.sh

@@ -66,13 +66,7 @@ if ! command_exists tar; then
     exit 1
 fi
 
-if [[ x"$KUBE_TYPE" == x"" ]]; then
-    echo "the KUBE_TYPE env var is not set, defaulting to \"k3s\""
-    echo ""
-    export KUBE_TYPE="k3s"
-fi
-
-BASE_DIR="$HOME/.olares"
+export BASE_DIR="$HOME/.olares"
 if [ ! -d $BASE_DIR ]; then
     mkdir -p $BASE_DIR
 fi
@@ -148,10 +142,6 @@ else
     fi
 fi
 
-PARAMS="--version $VERSION --base-dir $BASE_DIR"
-KUBE_PARAM="--kube $KUBE_TYPE"
-CDN="--cdn-service ${cdn_url}"
-
 if [[ -f $BASE_DIR/.prepared ]]; then
     echo "file $BASE_DIR/.prepared detected, skip preparing phase"
     echo ""
@@ -162,7 +152,7 @@ else
             echo ""
         else
             echo "building local release ..."
-            $sh_c "$INSTALL_OLARES_CLI release $PARAMS $CDN"
+            $sh_c "$INSTALL_OLARES_CLI release"
             if [[ $? -ne 0 ]]; then
                 echo "error: failed to build local release"
                 exit 1
@@ -171,16 +161,13 @@ else
     else
         echo "running system prechecks ..."
         echo ""
-        $sh_c "$INSTALL_OLARES_CLI precheck $PARAMS"
+        $sh_c "$INSTALL_OLARES_CLI precheck"
         if [[ $? -ne 0 ]]; then
             exit 1
         fi
         echo "downloading installation wizard..."
         echo ""
-        if [[ ! -z "$RELEASE_ID_SUFFIX" ]]; then
-            DOWNLOAD_WIZARD_RELEASE_ID_PARAM="--release-id $RELEASE_ID"
-        fi
-        $sh_c "$INSTALL_OLARES_CLI download wizard $PARAMS $KUBE_PARAM $CDN $DOWNLOAD_WIZARD_RELEASE_ID_PARAM"
+        $sh_c "$INSTALL_OLARES_CLI download wizard"
         if [[ $? -ne 0 ]]; then
             echo "error: failed to download installation wizard"
             exit 1
@@ -189,19 +176,15 @@ else
 
     echo "downloading installation packages..."
     echo ""
-    $sh_c "$INSTALL_OLARES_CLI download component $PARAMS $KUBE_PARAM $CDN"
+    $sh_c "$INSTALL_OLARES_CLI download component"
     if [[ $? -ne 0 ]]; then
         echo "error: failed to download installation packages"
         exit 1
     fi
 
     echo "preparing installation environment..."
     echo ""
-    # env 'REGISTRY_MIRRORS' is a docker image cache mirrors, separated by commas
-    if [ x"$REGISTRY_MIRRORS" != x"" ]; then
-        extra="--registry-mirrors $REGISTRY_MIRRORS"
-    fi
-    $sh_c "$INSTALL_OLARES_CLI prepare $PARAMS $KUBE_PARAM $extra"
+    $sh_c "$INSTALL_OLARES_CLI prepare"
     if [[ $? -ne 0 ]]; then
         echo "error: failed to prepare installation environment"
         exit 1
@@ -218,38 +201,18 @@ if [ "$PREINSTALL" == "1" ]; then
     exit 0
 fi
 
-if [[ "$JUICEFS" == "1" ]]; then
-    echo "JuiceFS is enabled"
-    fsflag="--with-juicefs=true"
-    if [[ "$STORAGE" == "" ]]; then
-        echo "installing MinIO ..."
-    else
-        echo "checking storage config ..."
-    fi
-    $sh_c "$INSTALL_OLARES_CLI install storage $PARAMS"
-    if [[ $? -ne 0 ]]; then
-      exit 1
-    fi
-fi
 
-if [[ -n "$SWAPPINESS" ]]; then
-    swapflag="$swapflag --swappiness $SWAPPINESS"
-fi
-if [[ "$ENABLE_POD_SWAP" == "1" ]]; then
-    swapflag="$swapflag --enable-pod-swap"
-fi
-if [[ "$ENABLE_ZRAM" == "1" ]]; then
-    swapflag="$swapflag --enable-zram"
-fi
-if [[ -n "$ZRAM_SIZE" ]]; then
-    swapflag="$swapflag --zram-size $ZRAM_SIZE"
-fi
-if [[ -n "$ZRAM_SWAP_PRIORITY" ]]; then
-    swapflag="$swapflag --zram-swap-priority $ZRAM_SWAP_PRIORITY"
+echo "configuring storage ..."
+$sh_c "$INSTALL_OLARES_CLI install storage"
+if [[ $? -ne 0 ]]; then
+    echo "error: failed to configure storage"
+    exit 1
 fi
+
+
 echo "installing Olares..."
 echo ""
-$sh_c "$INSTALL_OLARES_CLI install $PARAMS $KUBE_PARAM $fsflag $swapflag"
+$sh_c "$INSTALL_OLARES_CLI install"
 
 if [[ $? -ne 0 ]]; then
     echo "error: failed to install Olares"