fix: cherry pick from the main branch (#571)

beclab · Oct 30, 2024 · 91ec508 · 91ec508
1 parent a0dff90
commit 91ec508
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 6 deletions.
diff --git a/apps/argo/config/user/helm-charts/recommend/templates/argo_fe_deploy.yaml b/apps/argo/config/user/helm-charts/recommend/templates/argo_fe_deploy.yaml
@@ -59,6 +59,7 @@ spec:
     metadata:
       labels:
         app: recommend
+        io.bytetrade.app: "true"
     spec:
       containers:
         - name: recommend-proxy

diff --git a/apps/desktop/config/user/helm-charts/desktop/templates/desktop_deploy.yaml b/apps/desktop/config/user/helm-charts/desktop/templates/desktop_deploy.yaml
@@ -65,7 +65,7 @@ spec:
 
       containers:
       - name: edge-desktop
-        image: beclab/desktop:v0.2.39
+        image: beclab/desktop:v0.2.40
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsNonRoot: false
@@ -77,7 +77,7 @@ spec:
             value: http://bfl.{{ .Release.Namespace }}:8080
 
       - name: desktop-server
-        image: beclab/desktop-server:v0.2.39
+        image: beclab/desktop-server:v0.2.40
         imagePullPolicy: IfNotPresent
         securityContext:
           allowPrivilegeEscalation: false
@@ -213,6 +213,11 @@ spec:
       - app-installation-event
     op: Create
     uri: /server/app_installation_event
+  - filters:
+      type:
+        - entrance-state-event
+    op: Create
+    uri: /server/entrance_state_event
   - filters:
       type:
       - settings-event

diff --git a/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml b/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml
@@ -103,6 +103,7 @@ spec:
     metadata:
       labels:
         app: files
+        io.bytetrade.app: "true"
     spec:
       serviceAccountName: bytetrade-controller
       securityContext:

diff --git a/apps/market/config/user/helm-charts/market/templates/market_deploy.yaml b/apps/market/config/user/helm-charts/market/templates/market_deploy.yaml
@@ -23,6 +23,7 @@ spec:
     metadata:
       labels:
         app: appstore
+        io.bytetrade.app: "true"
     spec:
       initContainers:
         - args:
@@ -65,12 +66,12 @@ spec:
                 fieldPath: status.podIP
       containers:
       - name: appstore
-        image: beclab/market-frontend:v0.2.22
+        image: beclab/market-frontend:v0.2.23
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
       - name: appstore-backend
-        image: beclab/market-backend:v0.2.22
+        image: beclab/market-backend:v0.2.23
         imagePullPolicy: IfNotPresent
         ports:
           - containerPort: 81
@@ -202,6 +203,11 @@ spec:
     ops:
       - Create
     version: v1
+  - dataType: app
+    group: service.bfl
+    ops:
+      - UserApps
+    version: v1
 status:
   state: active
 

diff --git a/apps/notifications/config/user/helm-charts/notification/templates/notification_deploy.yaml b/apps/notifications/config/user/helm-charts/notification/templates/notification_deploy.yaml
@@ -67,6 +67,7 @@ spec:
     metadata:
       labels:
         app: notifications
+        io.bytetrade.app: "true"
     spec:
       initContainers:
       - args:

diff --git a/apps/settings/config/user/helm-charts/settings/templates/settings_deploy.yaml b/apps/settings/config/user/helm-charts/settings/templates/settings_deploy.yaml
@@ -25,6 +25,7 @@ spec:
     metadata:
       labels:
         app: settings
+        io.bytetrade.app: "true"
     spec:
       initContainers:
       - args:

diff --git a/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml b/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml
@@ -106,6 +106,7 @@ spec:
     metadata:
       labels:
         app: system-frontend
+        io.bytetrade.app: "true"
     spec:
       initContainers:
         - args:

diff --git a/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml b/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml
@@ -27,6 +27,7 @@ spec:
     metadata:
       labels:
         app: vault
+        io.bytetrade.app: "true"
     spec:
       initContainers:
       - args:

diff --git a/frameworks/app-service/config/cluster/crds/app.bytetrade.io_applications.yaml b/frameworks/app-service/config/cluster/crds/app.bytetrade.io_applications.yaml
@@ -124,6 +124,31 @@ spec:
           status:
             description: ApplicationStatus defines the observed state of Application
             properties:
+              entranceStatuses:
+                items:
+                  properties:
+                    message:
+                      type: string
+                    name:
+                      type: string
+                    reason:
+                      type: string
+                    state:
+                      type: string
+                    statusTime:
+                      format: date-time
+                      type: string
+                  required:
+                  - name
+                  - reason
+                  - state
+                  - statusTime
+                  type: object
+                type: array
+              startedTime:
+                description: StartedTime is the time that app first to running state
+                format: date-time
+                type: string
               state:
                 description: 'the state of the application: draft, submitted, passed,
                   rejected, suspended, active'

diff --git a/frameworks/app-service/config/cluster/deploy/appservice_deploy.yaml b/frameworks/app-service/config/cluster/deploy/appservice_deploy.yaml
@@ -148,7 +148,7 @@ spec:
       serviceAccount: os-internal
       containers:
       - name: app-service
-        image: beclab/app-service:0.2.43
+        image: beclab/app-service:0.2.44
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsUser: 0

diff --git a/frameworks/bfl/config/launcher/templates/bfl_deploy.yaml b/frameworks/bfl/config/launcher/templates/bfl_deploy.yaml
@@ -242,7 +242,7 @@ spec:
 
       containers:
       - name: api
-        image: beclab/bfl:v0.3.48
+        image: beclab/bfl:v0.3.49
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsUser: 1000

diff --git a/third-party/infisical/config/user/helm-charts/infisical/templates/infisical_deploy.yaml b/third-party/infisical/config/user/helm-charts/infisical/templates/infisical_deploy.yaml
@@ -189,6 +189,7 @@ spec:
     metadata:
       labels:
         app: infisical
+        io.bytetrade.app: "true"
     spec:
       serviceAccountName: infisical-sa
       initContainers:

diff --git a/third-party/ks-console/charts/templates/ks-console.yaml b/third-party/ks-console/charts/templates/ks-console.yaml
@@ -65,6 +65,7 @@ spec:
       labels:
         app: ks-console
         tier: frontend
+        io.bytetrade.app: "true"
     spec:   
       containers:
       - image: kubesphere/ks-console:v3.3.0