Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Revert "feat: files remove zinc and dify-gateway provider call (#207)" #212

Merged
merged 1 commit into from
Jul 12, 2024
Merged

feat: Revert "feat: files remove zinc and dify-gateway provider call (#207)" #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
272 changes: 136 additions & 136 deletions apps/files/config/user/helm-charts/files/templates/files_deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ spec:
- containerPort: 8080
env:
- name: FILES_SERVER_TAG
value: 'beclab/files-server:v0.2.27'
value: 'beclab/files-server:v0.2.25'
- name: NAMESPACE
valueFrom:
fieldRef:
Expand All @@ -94,7 +94,7 @@ spec:
value: system-server.user-system-{{ .Values.bfl.username }}

- name: files
image: beclab/files-server:v0.2.27
image: beclab/files-server:v0.2.25
imagePullPolicy: IfNotPresent
volumeMounts:
- name: fb-data
Expand Down Expand Up @@ -325,120 +325,120 @@ spec:
status:
state: active

#---
#apiVersion: sys.bytetrade.io/v1alpha1
#kind: ApplicationPermission
#metadata:
# name: files
# namespace: user-system-{{ .Values.bfl.username }}
#spec:
# app: files
# appid: files
# key: {{ .Values.os.files.appKey }}
# secret: {{ .Values.os.files.appSecret }}
# permissions:
# - dataType: gateway
# group: service.difyfusionclient
# ops:
# - DifyGatewayBaseProvider
# version: v1
#status:
# state: active
---
apiVersion: sys.bytetrade.io/v1alpha1
kind: ApplicationPermission
metadata:
name: files
namespace: user-system-{{ .Values.bfl.username }}
spec:
app: files
appid: files
key: {{ .Values.os.files.appKey }}
secret: {{ .Values.os.files.appSecret }}
permissions:
- dataType: gateway
group: service.difyfusionclient
ops:
- DifyGatewayBaseProvider
version: v1
status:
state: active

#---
#apiVersion: v1
#data:
# mappings: |
# {
# "properties": {
# "@timestamp": {
# "type": "date",
# "index": true,
# "store": false,
# "sortable": true,
# "aggregatable": true,
# "highlightable": false
# },
# "_id": {
# "type": "keyword",
# "index": true,
# "store": false,
# "sortable": true,
# "aggregatable": true,
# "highlightable": false
# },
# "content": {
# "type": "text",
# "index": true,
# "store": true,
# "sortable": false,
# "aggregatable": false,
# "highlightable": true
# },
# "created": {
# "type": "numeric",
# "index": true,
# "store": false,
# "sortable": true,
# "aggregatable": true,
# "highlightable": false
# },
# "format_name": {
# "type": "text",
# "index": true,
# "store": false,
# "sortable": false,
# "aggregatable": false,
# "highlightable": false
# },
# "md5": {
# "type": "text",
# "analyzer": "keyword",
# "index": true,
# "store": false,
# "sortable": false,
# "aggregatable": false,
# "highlightable": false
# },
# "name": {
# "type": "text",
# "index": true,
# "store": false,
# "sortable": false,
# "aggregatable": false,
# "highlightable": false
# },
# "size": {
# "type": "numeric",
# "index": true,
# "store": false,
# "sortable": true,
# "aggregatable": true,
# "highlightable": false
# },
# "updated": {
# "type": "numeric",
# "index": true,
# "store": false,
# "sortable": true,
# "aggregatable": true,
# "highlightable": false
# },
# "where": {
# "type": "text",
# "analyzer": "keyword",
# "index": true,
# "store": false,
# "sortable": false,
# "aggregatable": false,
# "highlightable": false
# }
# }
# }
#kind: ConfigMap
#metadata:
# name: zinc-files
# namespace: user-system-{{ .Values.bfl.username }}
---
apiVersion: v1
data:
mappings: |
{
"properties": {
"@timestamp": {
"type": "date",
"index": true,
"store": false,
"sortable": true,
"aggregatable": true,
"highlightable": false
},
"_id": {
"type": "keyword",
"index": true,
"store": false,
"sortable": true,
"aggregatable": true,
"highlightable": false
},
"content": {
"type": "text",
"index": true,
"store": true,
"sortable": false,
"aggregatable": false,
"highlightable": true
},
"created": {
"type": "numeric",
"index": true,
"store": false,
"sortable": true,
"aggregatable": true,
"highlightable": false
},
"format_name": {
"type": "text",
"index": true,
"store": false,
"sortable": false,
"aggregatable": false,
"highlightable": false
},
"md5": {
"type": "text",
"analyzer": "keyword",
"index": true,
"store": false,
"sortable": false,
"aggregatable": false,
"highlightable": false
},
"name": {
"type": "text",
"index": true,
"store": false,
"sortable": false,
"aggregatable": false,
"highlightable": false
},
"size": {
"type": "numeric",
"index": true,
"store": false,
"sortable": true,
"aggregatable": true,
"highlightable": false
},
"updated": {
"type": "numeric",
"index": true,
"store": false,
"sortable": true,
"aggregatable": true,
"highlightable": false
},
"where": {
"type": "text",
"analyzer": "keyword",
"index": true,
"store": false,
"sortable": false,
"aggregatable": false,
"highlightable": false
}
}
}
kind: ConfigMap
metadata:
name: zinc-files
namespace: user-system-{{ .Values.bfl.username }}

---
apiVersion: v1
Expand All @@ -451,27 +451,27 @@ data:
password: {{ $password }}
redis_password: {{ $redis_password }}

#---
#apiVersion: apr.bytetrade.io/v1alpha1
#kind: MiddlewareRequest
#metadata:
# name: zinc-files
# namespace: user-system-{{ .Values.bfl.username }}
#spec:
# app: files
# appNamespace: user-space-{{ .Values.bfl.username }}
# middleware: zinc
# zinc:
# user: zincuser-files-{{ .Values.bfl.username }}
# password:
# valueFrom:
# secretKeyRef:
# key: password
# name: zinc-files-secrets
# indexes:
# - name: zinc-files
# namespace: user-system-{{ .Values.bfl.username }}
# key: mappings
---
apiVersion: apr.bytetrade.io/v1alpha1
kind: MiddlewareRequest
metadata:
name: zinc-files
namespace: user-system-{{ .Values.bfl.username }}
spec:
app: files
appNamespace: user-space-{{ .Values.bfl.username }}
middleware: zinc
zinc:
user: zincuser-files-{{ .Values.bfl.username }}
password:
valueFrom:
secretKeyRef:
key: password
name: zinc-files-secrets
indexes:
- name: zinc-files
namespace: user-system-{{ .Values.bfl.username }}
key: mappings

---
apiVersion: apr.bytetrade.io/v1alpha1
Expand Down
Loading