Skip to content
Snippets Groups Projects
Unverified Commit 8311c042 authored by Andrej Shadura's avatar Andrej Shadura
Browse files

Add more settings, including SSO and msmtp

parent 63e4fed3
No related branches found
No related tags found
No related merge requests found
Pipeline #39411 passed
...@@ -2,6 +2,8 @@ apiVersion: v1 ...@@ -2,6 +2,8 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ include "backend.fullname" . }}-config name: {{ include "backend.fullname" . }}-config
labels:
{{- include "backend.labels" . | nindent 4 }}
data: data:
BSConfig.local.pm: {{ BSConfig.local.pm: {{
printf "%s\n%s\n1;\n" "$ipaccess->{\".*\"} = \"rw,worker\";" ( printf "%s\n%s\n1;\n" "$ipaccess->{\".*\"} = \"rw,worker\";" (
......
...@@ -38,6 +38,8 @@ spec: ...@@ -38,6 +38,8 @@ spec:
{{- if .Values.global.frontend }} {{- if .Values.global.frontend }}
- name: OBS_FRONTEND_WORKERS - name: OBS_FRONTEND_WORKERS
value: {{ default 4 .Values.global.frontend.workers | quote }} value: {{ default 4 .Values.global.frontend.workers | quote }}
- name: OBS_LOG_LEVEL
value: {{ default "info" .Values.global.frontend.loglevel | quote }}
{{- end }} {{- end }}
- name: OBS_MEMCACHE_HOST - name: OBS_MEMCACHE_HOST
value: {{ include "frontend.memcached.fullname" . | quote }} value: {{ include "frontend.memcached.fullname" . | quote }}
...@@ -86,6 +88,12 @@ spec: ...@@ -86,6 +88,12 @@ spec:
mountPath: /tmp mountPath: /tmp
- name: frontend-logs - name: frontend-logs
mountPath: /obs/src/api/log mountPath: /obs/src/api/log
- name: frontend-secrets
mountPath: /run/secrets/msmtprc
subPath: msmtprc
- name: frontend-secrets
mountPath: /run/secrets/ssoauth
subPath: ssoauth
- name: {{ .Chart.Name }}-weblog - name: {{ .Chart.Name }}-weblog
image: busybox image: busybox
args: args:
...@@ -130,6 +138,10 @@ spec: ...@@ -130,6 +138,10 @@ spec:
emptyDir: {} emptyDir: {}
- name: frontend-logs - name: frontend-logs
emptyDir: {} emptyDir: {}
- name: frontend-secrets
secret:
secretName: {{ .Values.global.frontend.existingSecret | default (include "frontend.fullname" .) }}
optional: true
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
......
{{- if (not .Values.global.frontend.existingSecret) -}}
apiVersion: v1
kind: Secret
type: Opaque
metadata:
name: {{ include "frontend.fullname" . }}
labels:
{{- include "frontend.labels" . | nindent 4 }}
data:
msmtprc: {{ default "" .Values.global.frontend.msmtprc | b64enc | quote }}
ssoauth: {{ default "" .Values.global.frontend.ssoauth | toYaml | b64enc | quote }}
{{- end }}
...@@ -17,6 +17,7 @@ fullnameOverride: "" ...@@ -17,6 +17,7 @@ fullnameOverride: ""
global: global:
frontend: {} frontend: {}
# workers: 8 # workers: 8
# loglevel: debug
backend: {} backend: {}
# host: backend # host: backend
......
...@@ -20,10 +20,24 @@ frontend: ...@@ -20,10 +20,24 @@ frontend:
# size: 8Gi # size: 8Gi
# existingClaim: "" # existingClaim: ""
# SSO secrets and msmtp config can be passed as a secret
# using existingSecret setting
global: global:
frontend: frontend:
workers: 4 workers: 4
# host: frontend # host: frontend
# msmtprc: |
# ...
# ssoauth:
# fdo-gitlab:
# strategy: gitlab
# description: Freedesktop.org GitLab
# scope: read_user openid profile email
# client_id: hexhexhexhex
# client_secret: hexhexhexhex
# client_options:
# site: https://gitlab.freedesktop.org/api/v4
# existingSecret: ""
backend: {} backend: {}
# host: backend # host: backend
# extraConfig: | # extraConfig: |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment