diff --git a/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml b/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml index 891f3f3a7..c01a8a370 100644 --- a/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml +++ b/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml @@ -253,7 +253,7 @@ spec: image: owncloudci/wait-for:latest imagePullPolicy: IfNotPresent name: check-auth - - name: terminus-sidecar-init + - name: olares-sidecar-init image: openservicemesh/init:v1.2.3 imagePullPolicy: IfNotPresent securityContext: @@ -315,7 +315,7 @@ spec: name: www-dir containers: - - name: terminus-envoy-sidecar + - name: olares-envoy-sidecar image: bytetrade/envoy:v1.25.11 imagePullPolicy: IfNotPresent securityContext: @@ -329,7 +329,7 @@ spec: - name: tapr containerPort: 15080 volumeMounts: - - name: terminus-sidecar-config + - name: olares-sidecar-config readOnly: true mountPath: /etc/envoy/envoy.yaml subPath: envoy.yaml @@ -361,7 +361,7 @@ spec: cp -r /www/nginxs/* /etc/nginx/conf.d/ nginx -g 'daemon off;' volumeMounts: - - name: terminus-sidecar-config + - name: olares-sidecar-config readOnly: true mountPath: /etc/envoy/envoy.yaml subPath: envoy.yaml @@ -500,7 +500,7 @@ spec: hostPath: type: Directory path: '{{ .Values.userspace.userData }}' - - name: terminus-sidecar-config + - name: olares-sidecar-config configMap: name: user-service-sidecar-ws-configs items: diff --git a/docs/zh/developer/contribute/system-app/deployment.md b/docs/zh/developer/contribute/system-app/deployment.md index 8fa9b5cd2..9f81bdcdb 100644 --- a/docs/zh/developer/contribute/system-app/deployment.md +++ b/docs/zh/developer/contribute/system-app/deployment.md @@ -139,7 +139,7 @@ spec: app: desktop-dev spec: volumes: - - name: terminus-sidecar-config + - name: olares-sidecar-config configMap: name: sidecar-configs items: @@ -161,7 +161,7 @@ spec: path: {{ .Values.userspace.appCache }}/desktop-dev initContainers: - - name: terminus-sidecar-init + - name: olares-sidecar-init image: openservicemesh/init:v1.2.3 imagePullPolicy: IfNotPresent securityContext: @@ -213,7 +213,7 @@ spec: mountPath: /opt/code - name: appcache mountPath: /root/.config - - name: terminus-envoy-sidecar + - name: olares-envoy-sidecar image: envoyproxy/envoy-distroless:v1.25.2 imagePullPolicy: IfNotPresent securityContext: @@ -225,7 +225,7 @@ spec: - name: proxy-inbound containerPort: 15003 volumeMounts: - - name: terminus-sidecar-config + - name: olares-sidecar-config readOnly: true mountPath: /etc/envoy/envoy.yaml subPath: envoy.yaml diff --git a/framework/app-service/.olares/config/cluster/crds/app.bytetrade.io_applications.yaml b/framework/app-service/.olares/config/cluster/crds/app.bytetrade.io_applications.yaml index b0ee96a7e..e6142bbba 100644 --- a/framework/app-service/.olares/config/cluster/crds/app.bytetrade.io_applications.yaml +++ b/framework/app-service/.olares/config/cluster/crds/app.bytetrade.io_applications.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: applications.app.bytetrade.io spec: group: app.bytetrade.io @@ -91,6 +91,8 @@ spec: port: format: int32 type: integer + skip: + type: boolean title: description: Optional. if invisible=true. type: string @@ -137,6 +139,7 @@ spec: format: int32 type: integer protocol: + default: tcp/udp description: |- The protocol for this entrance. Supports "tcp" and "udp","". Default is tcp/udp, "" mean tcp and udp. diff --git a/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml b/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml index 4e770f502..d3fa78fb0 100644 --- a/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml +++ b/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml @@ -170,7 +170,7 @@ spec: priorityClassName: "system-cluster-critical" containers: - name: app-service - image: beclab/app-service:0.4.24 + image: beclab/app-service:0.4.25 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0