element-web: Update to 1.9.9

This commit is contained in:
Alexander Olofsson 2022-01-17 16:17:28 +01:00
parent 373ee3cef8
commit e517cfa24a
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
11 changed files with 201 additions and 8 deletions

View file

@ -7,10 +7,10 @@ description: |
Talk to everyone through the open global Matrix network, protected by proper
end-to-end encryption.
icon: https://element.io/images/element-logo.svg
appVersion: 1.9.8
appVersion: 1.9.9
type: application
version: 1.0.43
version: 1.0.44
maintainers:
- name: Alexander Olofsson

View file

@ -15,3 +15,7 @@ dependencies:
version: ~8.9.4
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
- name: redis
version: ~10.6.10
repository: https://charts.bitnami.com/bitnami
condition: redis.enabled

View file

@ -146,3 +146,67 @@ Set postgresql database
{{ required "A valid externalPostgresql.database is required" .Values.externalPostgresql.database }}
{{- end -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "matrix-media-repo.redis.fullname" -}}
{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Set redis host
*/}}
{{- define "matrix-media-repo.redis.host" -}}
{{- if .Values.redis.enabled -}}
{{- template "matrix-media-repo.redis.fullname" . -}}-master
{{- else -}}
{{ required "A valid externalRedis.host is required" .Values.externalRedis.host }}
{{- end -}}
{{- end -}}
{{/*
Set redis secret
*/}}
{{- define "matrix-media-repo.redis.secret" -}}
{{- if .Values.redis.enabled -}}
{{- template "matrix-media-repo.redis.fullname" . -}}
{{- else -}}
{{- template "matrix-media-repo.fullname" . -}}
{{- end -}}
{{- end -}}
{{/*
Set redis port
*/}}
{{- define "matrix-media-repo.redis.port" -}}
{{- if .Values.redis.enabled -}}
{{- default 6379 .Values.redis.redisPort }}
{{- else -}}
{{ required "A valid externalRedis.port is required" .Values.externalRedis.port }}
{{- end -}}
{{- end -}}
{{/*
Set redis password
*/}}
{{- define "matrix-media-repo.redis.user" -}}
{{- if .Values.redis.enabled -}}
{{ .Values.redis.user }}
{{- else if .Values.externalRedis.user -}}
{{ .Values.externalRedis.user }}
{{- end -}}
{{- end -}}
{{/*
Set redis password
*/}}
{{- define "matrix-media-repo.redis.password" -}}
{{- if .Values.redis.enabled -}}
{{ .Values.redis.password }}
{{- else if .Values.externalRedis.password -}}
{{ .Values.externalRedis.password }}
{{- end -}}
{{- end -}}

View file

@ -13,3 +13,39 @@ stringData:
{{- end }}
postgres: "postgres://{{ include "matrix-media-repo.postgresql.username" . }}:{{ required "A password must be provided for Postgres" (include "matrix-media-repo.postgresql.password" .) }}@{{ include "matrix-media-repo.postgresql.host" . }}/{{ include "matrix-media-repo.postgresql.database" . }}{{ $sslmode }}"
00-redis.yaml: |
redis:
{{- if .Values.redis.enabled }}
enabled: true
databaseNumber: 0
shards:
{{- $redisHost := include "matrix-media-repo.redis.host" . }}
{{- $redisPort := include "matrix-media-repo.redis.port" . }}
{{- if .Values.redis.usePassword }}
{{- $redisUser := include "matrix-media-repo.redis.usr" . }}
{{- $redisPass := include "matrix-media-repo.redis.password" . }}
- name: k8s
addr: "redis://{{ $redisUser }}:{{ $redisPass}}@{{ $redisHost }}:{{ $redisPort }}/0"
{{- else }}
- name: k8s
addr: "{{ $redisHost }}:{{ $redisPass }}"
{{- end }}
{{- else if .Values.externalRedis.host }}
enabled: {{ .Values.externalRedis.host }}
databaseNumber: {{ .Values.externalRedis.database | default 0 }}
shards:
{{- $redisHost := include "matrix-media-repo.redis.host" . }}
{{- $redisPort := include "matrix-media-repo.redis.port" . }}
{{- $redisUser := include "matrix-media-repo.redis.usr" . }}
{{- $redisPass := include "matrix-media-repo.redis.password" . }}
- name: external
{{- if (or $redisUser $redisPass) }}
addr: "redis://{{ $redisUser }}:{{ $redisPass}}@{{ $redisHost }}:{{ $redisPort }}/0"
{{- else }}
addr: {{ .Values.externalRedis.host }}:{{ .Values.externalRedis.port }}
{{- end }}
{{- else }}
enabled: false
databaseNumber: 0
shards: []
{{- end }}

View file

@ -100,6 +100,44 @@ externalPostgresql:
database: matrix_media_repo
# sslMode: require
redis:
enabled: false
usePassword: true
# XXX Change me!
password: media-repo
## Or use existing secret with "redis-password" key
## instead of static password
##
# existingSecret: redis-secret
cluster:
enabled: false
master:
persistence:
## Note that Synapse only uses redis as a synchronization utility, so no
## data will ever need to be persisted.
##
enabled: false
statefulset:
updateStrategy: RollingUpdate
## An externally configured Redis server to use for workers/sharding.
##
externalRedis:
# host: redis
port: 6379
# user: media-repo
# password: media-repo
# database: 0
## The name of an existing secret with redis credentials
#existingSecret: redis-secrets
## Password key to be retrieved from existing secret
#existingSecretPasswordKey: redis-password
## Configures an application-specific service account.
##
serviceAccount:

View file

@ -7,10 +7,10 @@ description: |
Important; With chart version 4.0.0 there are major upgrades to the packaged Redis and Postgres,
as well as a major version bump of Netbox that introduces housekeeping. Take care when upgrading.
icon: https://raw.githubusercontent.com/digitalocean/netbox/develop/netbox/project-static/img/netbox.ico
appVersion: 3.0.8
appVersion: 3.1.0
type: application
version: 4.0.1
version: 4.1.0
maintainers:
- name: Alexander Olofsson
email: ace@haxalot.com

View file

@ -1,3 +1,17 @@
{{- if .Values.extraConfiguration }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Chart.Name }}-extra
labels:
app.kubernetes.io/name: {{ include "netbox.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "netbox.chart" . }}
data:
extra.py: {{ .Values.extraConfiguration | toYaml | indent 2 }}
{{- end }}
---
apiVersion: v1
kind: ConfigMap

View file

@ -57,10 +57,22 @@ spec:
name: {{ include "netbox.fullname" . }}
resources:
{{- toYaml .Values.housekeeping.resources | nindent 12 }}
{{- with .Values.housekeeping.nodeSelector }}
{{- if .Values.extraConfiguration }}
volumeMounts:
- name: netbox-extra-config
mountPath: /etc/netbox/config/extra.py
subPath: extra.py
{{- end }}
{{- with .Values.housekeeping.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- if .Values.extraConfiguration }}
volumes:
- name: netbox-extra-config
configMap:
name: {{ .Chart.Name }}-extra
{{- end }}
{{- with .Values.housekeeping.affinity }}
affinity:
{{- toYaml . | nindent 8 }}

View file

@ -59,10 +59,22 @@ spec:
name: {{ include "netbox.fullname" . }}
resources:
{{- toYaml .Values.worker.resources | nindent 12 }}
{{- with .Values.worker.nodeSelector }}
{{- if .Values.extraConfiguration }}
volumeMounts:
- name: netbox-extra-config
mountPath: /etc/netbox/config/extra.py
subPath: extra.py
{{- end }}
{{- with .Values.worker.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- if .Values.extraConfiguration }}
volumes:
- name: netbox-extra-config
configMap:
name: {{ .Chart.Name }}-extra
{{- end }}
{{- with .Values.worker.affinity }}
affinity:
{{- toYaml . | nindent 8 }}

View file

@ -89,6 +89,11 @@ spec:
volumeMounts:
- name: data
mountPath: /etc/netbox/media
{{- if .Values.extraConfiguration }}
- name: netbox-extra-config
mountPath: /etc/netbox/config/extra.py
subPath: extra.py
{{- end }}
{{- with .Values.extraVolumeMounts }}
{{ toYaml . | nindent 12 }}
{{- end }}
@ -100,6 +105,11 @@ spec:
- name: netbox-config-files
configMap:
name: {{ .Chart.Name }}-config-files
{{- if .Values.extraConfiguration }}
- name: netbox-extra-config
configMap:
name: {{ .Chart.Name }}-extra
{{- end }}
- name: data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:

View file

@ -88,6 +88,9 @@ extraSecrets: {}
# EMAIL_PASSWORD: netbox
# NAPALM_PASSWORD: ''
# Ends up stored as extra.py in the netbox configuration
extraConfiguration: ''
superuser:
name: ''
email: ''