fix(synapse/traefik): Synapse related fixes
This commit is contained in:
@@ -22,7 +22,7 @@ sources:
|
|||||||
- https://github.com/traefik/traefik-helm-chart
|
- https://github.com/traefik/traefik-helm-chart
|
||||||
- https://traefik.io/
|
- https://traefik.io/
|
||||||
type: application
|
type: application
|
||||||
version: 10.0.44
|
version: 10.0.45
|
||||||
annotations:
|
annotations:
|
||||||
truecharts.org/catagories: |
|
truecharts.org/catagories: |
|
||||||
- network
|
- network
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{{- $values := .Values }}
|
||||||
|
{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
|
||||||
|
{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
|
||||||
|
{{- $namespace = "default" }}
|
||||||
|
{{- end }}
|
||||||
|
---
|
||||||
|
apiVersion: traefik.containo.us/v1alpha1
|
||||||
|
kind: Middleware
|
||||||
|
metadata:
|
||||||
|
name: tc-synapse-headers
|
||||||
|
namespace: {{ $namespace }}
|
||||||
|
spec:
|
||||||
|
headers:
|
||||||
|
accesscontrolalloworigin: '*'
|
||||||
|
|
||||||
|
---
|
||||||
|
apiVersion: traefik.containo.us/v1alpha1
|
||||||
|
kind: Middleware
|
||||||
|
metadata:
|
||||||
|
name: tc-synapse-chain
|
||||||
|
namespace: {{ $namespace }}
|
||||||
|
spec:
|
||||||
|
chain:
|
||||||
|
middlewares:
|
||||||
|
- name: tc-synapse-headers
|
||||||
@@ -24,7 +24,7 @@ maintainers:
|
|||||||
name: synapse
|
name: synapse
|
||||||
sources: []
|
sources: []
|
||||||
type: application
|
type: application
|
||||||
version: 0.0.8
|
version: 0.0.9
|
||||||
annotations:
|
annotations:
|
||||||
truecharts.org/catagories: |
|
truecharts.org/catagories: |
|
||||||
- cloud
|
- cloud
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ metadata:
|
|||||||
rollme: {{ randAlphaNum 5 | quote }}
|
rollme: {{ randAlphaNum 5 | quote }}
|
||||||
stringData:
|
stringData:
|
||||||
{{- $previous := lookup "v1" "Secret" .Release.Namespace "synapse-secret" }}
|
{{- $previous := lookup "v1" "Secret" .Release.Namespace "synapse-secret" }}
|
||||||
{{- $msk := "" }}
|
{{- $msk = randAlphaNum 50 }}
|
||||||
secret.yaml: |
|
secret.yaml: |
|
||||||
{{- if .Values.mail.enabled }}
|
{{- if .Values.mail.enabled }}
|
||||||
email:
|
email:
|
||||||
@@ -43,7 +43,7 @@ stringData:
|
|||||||
{{- if $previous }}
|
{{- if $previous }}
|
||||||
{{- $msk = ( index $previous.data "macaroon_secret_key" ) }}
|
{{- $msk = ( index $previous.data "macaroon_secret_key" ) }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{- $msk = randAlphaNum 50 }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
macaroon_secret_key: {{ $msk }}
|
macaroon_secret_key: {{ $msk }}
|
||||||
|
|
||||||
|
|||||||
@@ -7,5 +7,8 @@
|
|||||||
{{/* Render secret for synapse */}}
|
{{/* Render secret for synapse */}}
|
||||||
{{- include "synapse.secret" . }}
|
{{- include "synapse.secret" . }}
|
||||||
|
|
||||||
|
{{- $newMiddlewares := append .Values.ingress.main.fixedMiddlewares "tc-synapse-chain" }}
|
||||||
|
{{- $_ := set .Values.ingress.main "fixedMiddlewares" $newMiddlewares -}}
|
||||||
|
|
||||||
{{/* Render the templates */}}
|
{{/* Render the templates */}}
|
||||||
{{ include "common.postSetup" . }}
|
{{ include "common.postSetup" . }}
|
||||||
|
|||||||
Reference in New Issue
Block a user