mirror of
https://github.com/beclab/Olares
synced 2026-05-24 01:08:23 +00:00
authelia: remove authentication with backend nonce (#1876)
* authelia: remove authentication with backend nonce * backup: remove backend nonce --------- Co-authored-by: aby913 <aby913@163.com>
This commit is contained in:
parent
fcf6c507be
commit
234b887787
5 changed files with 4 additions and 52 deletions
|
|
@ -18,14 +18,6 @@
|
|||
{{ $nats_password = randAlphaNum 16 | b64enc }}
|
||||
{{- end -}}
|
||||
|
||||
{{- $app_service_app_key := (lookup "v1" "Secret" $namespace "app-key") -}}
|
||||
{{- $app_key_random := "" -}}
|
||||
{{ if $app_service_app_key -}}
|
||||
{{ $app_key_random = (index $app_service_app_key "data" "random-key") }}
|
||||
{{ else -}}
|
||||
{{ $app_key_random = randAlphaNum 32 | b64enc }}
|
||||
{{- end -}}
|
||||
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
|
|
@ -178,7 +170,7 @@ spec:
|
|||
priorityClassName: "system-cluster-critical"
|
||||
containers:
|
||||
- name: app-service
|
||||
image: beclab/app-service:0.4.7
|
||||
image: beclab/app-service:0.4.8
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
runAsUser: 0
|
||||
|
|
@ -232,11 +224,6 @@ spec:
|
|||
value: os.groups
|
||||
- name: NATS_SUBJECT_SYSTEM_APPLICATION
|
||||
value: os.application
|
||||
- name: APP_RANDOM_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: app-key
|
||||
key: random-key
|
||||
- name: HOSTIP
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
|
|
@ -316,15 +303,6 @@ spec:
|
|||
selector:
|
||||
tier: app-service
|
||||
type: ClusterIP
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: app-key
|
||||
namespace: {{ .Release.Namespace }}
|
||||
type: Opaque
|
||||
data:
|
||||
random-key: {{ $app_key_random }}
|
||||
|
||||
---
|
||||
apiVersion: apr.bytetrade.io/v1alpha1
|
||||
|
|
|
|||
|
|
@ -429,18 +429,13 @@ spec:
|
|||
privileged: true
|
||||
containers:
|
||||
- name: authelia
|
||||
image: beclab/auth:0.2.32
|
||||
image: beclab/auth:0.2.33
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 9091
|
||||
env:
|
||||
- name: TZ
|
||||
value: UTC
|
||||
- name: APP_RANDOM_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: app-key
|
||||
key: random-key
|
||||
- name: NATS_HOST
|
||||
value: nats.os-platform
|
||||
- name: NATS_PORT
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
{{ $backupVersion := "0.3.48" }}
|
||||
{{ $backupVersion := "0.3.49" }}
|
||||
{{ $backup_server_rootpath := printf "%s%s" .Values.rootPath "/rootfs/backup-server" }}
|
||||
|
||||
{{- $backup_nats_secret := (lookup "v1" "Secret" .Release.Namespace "backup-nats-secret") -}}
|
||||
|
|
@ -99,11 +99,6 @@ spec:
|
|||
value: {{ default "false" .Values.backup.is_cloud_version | quote }}
|
||||
- name: ENABLE_MIDDLEWARE_BACKUP
|
||||
value: "true"
|
||||
- name: APP_RANDOM_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: app-key
|
||||
key: random-key
|
||||
- name: NATS_HOST
|
||||
value: nats.os-platform
|
||||
- name: NATS_PORT
|
||||
|
|
@ -153,11 +148,6 @@ spec:
|
|||
- name: {{ $key }}
|
||||
value: {{ $val | quote }}
|
||||
{{- end }}
|
||||
- name: APP_RANDOM_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: app-key
|
||||
key: random-key
|
||||
- name: NATS_HOST
|
||||
value: nats.os-platform
|
||||
- name: NATS_PORT
|
||||
|
|
|
|||
|
|
@ -41,11 +41,6 @@ spec:
|
|||
fieldPath: "status.hostIP"
|
||||
- name: S3_BUCKET
|
||||
value: {{ .Values.s3_bucket }}
|
||||
- name: APP_RANDOM_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: app-key
|
||||
key: random-key
|
||||
resources:
|
||||
requests:
|
||||
cpu: 20m
|
||||
|
|
|
|||
|
|
@ -76,14 +76,8 @@ spec:
|
|||
runAsUser: 0
|
||||
containers:
|
||||
- name: tapr-sysevent
|
||||
image: beclab/sys-event:0.2.9
|
||||
image: beclab/sys-event:0.2.10
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: APP_RANDOM_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: app-key
|
||||
key: random-key
|
||||
|
||||
---
|
||||
apiVersion: v1
|
||||
|
|
|
|||
Loading…
Reference in a new issue