Skip to content

Commit 6c1c94a

Browse files
eballeball
authored
Revert "feat(Files&Vault&Wise&Files server): update LarePass new version to v1.3.14" (#864)
Revert "feat(Files&Vault&Wise&Files server): update LarePass new version to v…" This reverts commit 5b35eb2.
1 parent 5b35eb2 commit 6c1c94a

File tree

5 files changed

+8
-195
lines changed

5 files changed

+8
-195
lines changed

‎apps/files/config/cluster/deploy/files_deploy.yaml

+2-67
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
{{ $files_redis_password = randAlphaNum 16 | b64enc }}
1616
{{- end -}}
1717

18-
{{- $files_nats_secret := (lookup "v1" "Secret" "os-system" "files-nats-secrets") -}}
19-
{{- $files_nats_password := "" -}}
20-
{{ if $files_nats_secret -}}
21-
{{ $files_nats_password = (index $files_nats_secret "data" "files_nats_password") }}
22-
{{ else -}}
23-
{{ $files_nats_password = randAlphaNum 16 | b64enc }}
24-
{{- end -}}
25-
2618
---
2719
apiVersion: apps/v1
2820
kind: Deployment
@@ -109,7 +101,7 @@ spec:
109101
{{ end }}
110102

111103
- name: files
112-
image: beclab/files-server:v0.2.47
104+
image: beclab/files-server:v0.2.46
113105
imagePullPolicy: IfNotPresent
114106
securityContext:
115107
allowPrivilegeEscalation: true
@@ -199,16 +191,6 @@ spec:
199191
# use redis db 0 for redis cache
200192
- name: REDIS_DB
201193
value: '0'
202-
- name: NATS_HOST
203-
value: nats
204-
- name: NATS_PORT
205-
value: '4222'
206-
- name: NATS_USERNAME
207-
value: os-system-files-server
208-
- name: NATS_PASSWORD
209-
value: {{ $files_nats_password | b64dec }}
210-
- name: NATS_SUBJECT
211-
value: terminus.os-system.files-notify
212194
- name: POD_NAME
213195
valueFrom:
214196
fieldRef:
@@ -363,13 +345,7 @@ spec:
363345
- sh
364346
- -c
365347
- |
366-
chown -R 1000:1000 /appdata
367-
- args:
368-
- -it
369-
- nats.os-system:4222
370-
image: owncloudci/wait-for:latest
371-
imagePullPolicy: IfNotPresent
372-
name: check-nats
348+
chown -R 1000:1000 /appdata
373349
containers:
374350
- name: files
375351
image: beclab/files-server:v0.2.46
@@ -436,16 +412,6 @@ data:
436412
password: {{ $password }}
437413
files_redis_password: {{ $files_redis_password }}
438414

439-
---
440-
apiVersion: v1
441-
kind: Secret
442-
metadata:
443-
name: files-nats-secrets
444-
namespace: os-system
445-
data:
446-
files_nats_password: {{ $files_nats_password }}
447-
type: Opaque
448-
449415
---
450416
apiVersion: apr.bytetrade.io/v1alpha1
451417
kind: MiddlewareRequest
@@ -464,37 +430,6 @@ spec:
464430
name: files-secrets
465431
namespace: files-redis
466432

467-
---
468-
apiVersion: apr.bytetrade.io/v1alpha1
469-
kind: MiddlewareRequest
470-
metadata:
471-
name: files-server-nat
472-
namespace: os-system
473-
spec:
474-
app: files-server
475-
appNamespace: os-system
476-
middleware: nats
477-
nats:
478-
password:
479-
valueFrom:
480-
secretKeyRef:
481-
key: files_nats_password
482-
name: files-nats-secrets
483-
refs: []
484-
subjects:
485-
- export:
486-
- appName: files-frontend
487-
pub: allow
488-
sub: allow
489-
- appName: vault
490-
pub: allow
491-
sub: allow
492-
name: files-notify
493-
permission:
494-
pub: allow
495-
sub: allow
496-
user: os-system-files-server
497-
498433
---
499434
kind: ConfigMap
500435
apiVersion: v1

‎apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml

+1-61
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@
2727
{{ $pg_password = randAlphaNum 16 | b64enc }}
2828
{{- end -}}
2929

30-
{{- $files_frontend_nats_secret := (lookup "v1" "Secret" $namespace "files-frontend-nats-secrets") -}}
31-
{{- $files_frontend_nats_password := "" -}}
32-
{{ if $files_frontend_nats_secret -}}
33-
{{ $files_frontend_nats_password = (index $files_frontend_nats_secret "data" "files_frontend_nats_password") }}
34-
{{ else -}}
35-
{{ $files_frontend_nats_password = randAlphaNum 16 | b64enc }}
36-
{{- end -}}
37-
3830

3931
---
4032
apiVersion: v1
@@ -142,12 +134,6 @@ spec:
142134
image: owncloudci/wait-for:latest
143135
imagePullPolicy: IfNotPresent
144136
name: check-auth
145-
- args:
146-
- -it
147-
- nats.user-system-{{ .Values.bfl.username }}:4222
148-
image: owncloudci/wait-for:latest
149-
imagePullPolicy: IfNotPresent
150-
name: check-nats
151137
- name: terminus-sidecar-init
152138
image: openservicemesh/init:v1.2.3
153139
imagePullPolicy: IfNotPresent
@@ -297,24 +283,13 @@ spec:
297283
# - /filebrowser
298284
# - --noauth
299285
- name: files-frontend
300-
image: beclab/files-frontend:v1.3.14
286+
image: beclab/files-frontend:v1.3.9
301287
imagePullPolicy: IfNotPresent
302288
securityContext:
303289
runAsNonRoot: false
304290
runAsUser: 0
305291
ports:
306292
- containerPort: 80
307-
env:
308-
- name: NATS_HOST
309-
value: nats.user-system-{{ .Values.bfl.username }}
310-
- name: NATS_PORT
311-
value: '4222'
312-
- name: NATS_USERNAME
313-
value: user-system-{{ .Values.bfl.username }}-files-frontend
314-
- name: NATS_PASSWORD
315-
value: {{ $files_frontend_nats_password | b64dec }}
316-
- name: NATS_SUBJECT
317-
value: terminus.os-system.files-notify
318293
volumeMounts:
319294
- name: userspace-dir
320295
mountPath: /data
@@ -631,16 +606,6 @@ data:
631606
redis_password: {{ $redis_password }}
632607
pg_password: {{ $pg_password }}
633608

634-
---
635-
apiVersion: v1
636-
kind: Secret
637-
metadata:
638-
name: files-frontend-nats-secrets
639-
namespace: user-system-{{ .Values.bfl.username }}
640-
data:
641-
files_frontend_nats_password: {{ $files_frontend_nats_password }}
642-
type: Opaque
643-
644609
#---
645610
#apiVersion: apr.bytetrade.io/v1alpha1
646611
#kind: MiddlewareRequest
@@ -681,31 +646,6 @@ spec:
681646
name: zinc-files-secrets
682647
namespace: zinc-files
683648

684-
---
685-
apiVersion: apr.bytetrade.io/v1alpha1
686-
kind: MiddlewareRequest
687-
metadata:
688-
name: files-frontend-nat
689-
namespace: user-system-{{ .Values.bfl.username }}
690-
spec:
691-
app: files-frontend
692-
appNamespace: user-space-{{ .Values.bfl.username }}
693-
middleware: nats
694-
nats:
695-
password:
696-
valueFrom:
697-
secretKeyRef:
698-
key: files_frontend_nats_password
699-
name: files-frontend-nats-secrets
700-
refs:
701-
- appName: files-server
702-
appNamespace: os-system
703-
subjects:
704-
- name: files-notify
705-
perm:
706-
- pub
707-
- sub
708-
user: user-system-{{ .Values.bfl.username }}-files-frontend
709649

710650
---
711651
apiVersion: v1

‎apps/vault/config/cluster/deploy/vault_server_deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ spec:
8383
value: os_system_vault
8484
containers:
8585
- name: vault-server
86-
image: beclab/vault-server:v1.3.14
86+
image: beclab/vault-server:v1.3.11
8787
imagePullPolicy: IfNotPresent
8888
ports:
8989
- containerPort: 3000
@@ -114,7 +114,7 @@ spec:
114114
- name: vault-attach
115115
mountPath: /padloc/packages/server/attachments
116116
- name: vault-admin
117-
image: beclab/vault-admin:v1.3.14
117+
image: beclab/vault-admin:v1.3.11
118118
imagePullPolicy: IfNotPresent
119119
ports:
120120
- containerPort: 3010

‎apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml

+2-64
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
{{- $namespace := printf "%s%s" "user-system-" .Values.bfl.username -}}
2-
3-
{{- $vault_nats_secret := (lookup "v1" "Secret" $namespace "vault-nats-secrets") -}}
4-
{{- $vault_nats_password := "" -}}
5-
{{ if $vault_nats_secret -}}
6-
{{ $vault_nats_password = (index $vault_nats_secret "data" "vault_nats_password") }}
7-
{{ else -}}
8-
{{ $vault_nats_password = randAlphaNum 16 | b64enc }}
9-
{{- end -}}
10-
111

122

133
---
@@ -46,12 +36,6 @@ spec:
4636
image: owncloudci/wait-for:latest
4737
imagePullPolicy: IfNotPresent
4838
name: check-auth
49-
- args:
50-
- -it
51-
- nats.user-system-{{ .Values.bfl.username }}:4222
52-
image: owncloudci/wait-for:latest
53-
imagePullPolicy: IfNotPresent
54-
name: check-nats
5539
- name: terminus-sidecar-init
5640
image: openservicemesh/init:v1.2.3
5741
imagePullPolicy: IfNotPresent
@@ -88,13 +72,13 @@ spec:
8872

8973
containers:
9074
- name: vault-frontend
91-
image: beclab/vault-frontend:v1.3.14
75+
image: beclab/vault-frontend:v1.3.9
9276
imagePullPolicy: IfNotPresent
9377
ports:
9478
- containerPort: 80
9579

9680
- name: notification-server
97-
image: beclab/vault-notification:v1.3.14
81+
image: beclab/vault-notification:v1.3.9
9882
imagePullPolicy: IfNotPresent
9983
ports:
10084
- containerPort: 3010
@@ -109,17 +93,6 @@ spec:
10993
value: '{{ .Values.os.vault.appSecret }}'
11094
- name: OS_APP_KEY
11195
value: {{ .Values.os.vault.appKey }}
112-
- name: NATS_HOST
113-
value: nats.user-system-{{ .Values.bfl.username }}
114-
- name: NATS_PORT
115-
value: '4222'
116-
- name: NATS_USERNAME
117-
value: user-system-{{ .Values.bfl.username }}-vault
118-
- name: NATS_PASSWORD
119-
value: {{ $vault_nats_password | b64dec }}
120-
- name: NATS_SUBJECT
121-
value: terminus.os-system.files-notify
122-
12396

12497
- name: terminus-envoy-sidecar
12598
image: bytetrade/envoy:v1.25.11
@@ -265,38 +238,3 @@ spec:
265238
version: v1
266239
status:
267240
state: active
268-
---
269-
apiVersion: v1
270-
kind: Secret
271-
metadata:
272-
name: vault-nats-secrets
273-
namespace: user-system-{{ .Values.bfl.username }}
274-
data:
275-
vault_nats_password: {{ $vault_nats_password }}
276-
type: Opaque
277-
278-
---
279-
apiVersion: apr.bytetrade.io/v1alpha1
280-
kind: MiddlewareRequest
281-
metadata:
282-
name: vault-nat
283-
namespace: user-system-{{ .Values.bfl.username }}
284-
spec:
285-
app: vault
286-
appNamespace: user-space-{{ .Values.bfl.username }}
287-
middleware: nats
288-
nats:
289-
password:
290-
valueFrom:
291-
secretKeyRef:
292-
key: vault_nats_password
293-
name: vault-nats-secrets
294-
refs:
295-
- appName: files-server
296-
appNamespace: os-system
297-
subjects:
298-
- name: files-notify
299-
perm:
300-
- pub
301-
- sub
302-
user: user-system-{{ .Values.bfl.username }}-vault

‎frameworks/tapr/config/cluster/deploy/middleware_deploy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
- name: DISABLE_TELEMETRY
100100
value: "false"
101101
- name: operator-api
102-
image: beclab/middleware-operator:0.1.38
102+
image: beclab/middleware-operator:0.1.37
103103
imagePullPolicy: IfNotPresent
104104
ports:
105105
- containerPort: 9080

0 commit comments

Comments
 (0)