Skip to content

Commit 2b94cf0

Browse files
authored
Merge branch 'main' into remove-secret-psql-hostname
2 parents 8289bd2 + 534e36b commit 2b94cf0

17 files changed

+39
-33
lines changed

.github/workflows/cd-helm-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
4343
- name: Run chart-releaser
4444
id: helm-release
45-
uses: helm/chart-releaser-action@v1.6.0
45+
uses: helm/chart-releaser-action@v1.7.0
4646
env:
4747
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
4848
CR_GENERATE_RELEASE_NOTES: true

.github/workflows/ci-helm-lint-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
helm repo add matrix-authentication-service https://small-hack.github.io/matrix-authentication-service-chart
3030
3131
- name: Set up chart-testing
32-
uses: helm/chart-testing-action@v2.6.1
32+
uses: helm/chart-testing-action@v2.7.0
3333

3434
- name: Run chart-testing (list-changed)
3535
id: list-changed

.github/workflows/renovate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
schedule:
55
# This should be every hour
6-
- cron: '0 * * * *'
6+
- cron: '55 * * * *'
77
push:
88
branches:
99
- main
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: Get token
2020
id: app-token
21-
uses: actions/create-github-app-token@v1
21+
uses: actions/create-github-app-token@v2
2222
with:
2323
private-key: ${{ secrets.PRIVATE_KEY }}
2424
app-id: ${{ secrets.APP_ID }}
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/[email protected]
2828

2929
- name: Self-hosted Renovate
30-
uses: renovatebot/github-action@v41.0.13
30+
uses: renovatebot/github-action@v42.0.4
3131
with:
3232
token: '${{ steps.app-token.outputs.token }}'
3333
configurationFile: .github/renovate-config.json

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ matrix:
208208
experimental_features:
209209
msc3861:
210210
# Likely needed if using OIDC on synapse and you want to allow usage of Element-X (the beta of element)
211-
enabled: false
211+
enabled: true
212212
# -- Synapse will call `{issuer}/.well-known/openid-configuration` to get the OIDC configuration
213213
issuer: http://my-mas-domain.com/
214214
# -- Matches the `mas.mas.client_id` in the auth service config

charts/matrix/Chart.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
22
- name: postgresql
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 16.3.1
4+
version: 16.7.10
55
- name: coturn
66
repository: https://small-hack.github.io/coturn-chart
7-
version: 7.1.0
7+
version: 8.1.1
88
- name: matrix-authentication-service
99
repository: https://small-hack.github.io/matrix-authentication-service-chart
10-
version: 1.3.1
11-
digest: sha256:6b0142f382eb3594972bb20f9b355bcc3ae1469b394577691a9724fbd4157e9e
12-
generated: "2025-01-19T15:10:37.052774754Z"
10+
version: 1.6.0
11+
digest: sha256:936cb363ea2af9f2ed2481b6b332cfa0d9c9b857e831b053948aea52770b6646
12+
generated: "2025-06-07T20:51:06.810460075Z"

charts/matrix/Chart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ sources:
88

99
type: application
1010

11-
version: 18.4.1
11+
version: 19.10.1
1212

1313
# renovate: image=ghcr.io/element-hq/synapse
14-
appVersion: v1.122.0
14+
appVersion: v1.131.0
1515

1616
maintainers:
1717
- name: "jessebot"
1818
url: "https://github.com/jessebot"
1919

2020
dependencies:
2121
- name: postgresql
22-
version: 16.3.1
22+
version: 16.7.10
2323
repository: oci://registry-1.docker.io/bitnamicharts
2424
condition: postgresql.enabled
2525

2626
- name: coturn
27-
version: 7.1.0
27+
version: 8.1.1
2828
repository: https://small-hack.github.io/coturn-chart
2929
condition: coturn.enabled
3030

3131
- name: matrix-authentication-service
3232
alias: mas
33-
version: 1.3.1
33+
version: 1.6.0
3434
repository: https://small-hack.github.io/matrix-authentication-service-chart
3535
condition: mas.enabled

charts/matrix/README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# matrix
22

3-
![Version: 18.4.0](https://img.shields.io/badge/Version-18.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.122.0](https://img.shields.io/badge/AppVersion-v1.122.0-informational?style=flat-square)
3+
![Version: 19.10.0](https://img.shields.io/badge/Version-19.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.131.0](https://img.shields.io/badge/AppVersion-v1.131.0-informational?style=flat-square)
44

55
A Helm chart to deploy a Matrix homeserver stack on Kubernetes
66

@@ -20,9 +20,9 @@ A Helm chart to deploy a Matrix homeserver stack on Kubernetes
2020

2121
| Repository | Name | Version |
2222
|------------|------|---------|
23-
| https://small-hack.github.io/coturn-chart | coturn | 7.1.0 |
24-
| https://small-hack.github.io/matrix-authentication-service-chart | mas(matrix-authentication-service) | 1.3.1 |
25-
| oci://registry-1.docker.io/bitnamicharts | postgresql | 16.3.1 |
23+
| https://small-hack.github.io/coturn-chart | coturn | 8.1.1 |
24+
| https://small-hack.github.io/matrix-authentication-service-chart | mas(matrix-authentication-service) | 1.6.0 |
25+
| oci://registry-1.docker.io/bitnamicharts | postgresql | 16.7.10 |
2626

2727
## Values
2828

@@ -284,7 +284,7 @@ A Helm chart to deploy a Matrix homeserver stack on Kubernetes
284284
| bridges.hookshot.existingSecret.registration | string | `""` | optionally use existing kubernetes Secret for registration |
285285
| bridges.hookshot.image.pullPolicy | string | `"IfNotPresent"` | hookshot bridge docker image pull policy. If tag is "latest", set tag to "Always" |
286286
| bridges.hookshot.image.repository | string | `"halfshot/matrix-hookshot"` | hookshot bridge docker image |
287-
| bridges.hookshot.image.tag | string | `"6.0.1"` | hookshot bridge docker image tag |
287+
| bridges.hookshot.image.tag | string | `"7.0.0"` | hookshot bridge docker image tag |
288288
| bridges.hookshot.passkey | string | `""` | If bridges.hookshot.passkey AND bridges.hookshot.existingSecret.passkey are BOTH empty strings, we will generate a passkey for you. To Generate yourself: openssl genpkey -out passkey.pem -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:4096 |
289289
| bridges.hookshot.podSecurityContext | object | `{}` | hookshot pod security context |
290290
| bridges.hookshot.registration.existingSecret | string | `""` | |
@@ -365,6 +365,7 @@ A Helm chart to deploy a Matrix homeserver stack on Kubernetes
365365
| coturn.coturn.realm | string | `"turn.example.com"` | hostname for the coturn server realm |
366366
| coturn.enabled | bool | `false` | Set to false to disable the included deployment of Coturn |
367367
| coturn.existingSecret | string | `""` | Optional: name of an existingSecret with key for sharedSecret |
368+
| coturn.external | bool | `false` | Set to true to use an external Coturn deployment |
368369
| coturn.externalDatabase.database | string | `""` | database to create, ignored if existingSecret is passed in |
369370
| coturn.externalDatabase.enabled | bool | `false` | enables the use of postgresql instead of the default sqlite for coturn to use the bundled subchart, enable this, and postgresql.enable |
370371
| coturn.externalDatabase.existingSecret | string | `""` | name of existing Secret to use for postgresql credentials |
@@ -417,7 +418,7 @@ A Helm chart to deploy a Matrix homeserver stack on Kubernetes
417418
| element.enabled | bool | `true` | Set to false to disable a deployment of Element. Users will still be able to connect via any other instances of Element e.g. https://app.element.io, Element Desktop, or any other Matrix clients |
418419
| element.image.pullPolicy | string | `"IfNotPresent"` | pullPolicy to use for element image, set to Always if using latest tag |
419420
| element.image.repository | string | `"vectorim/element-web"` | registry and repository to use for element docker image |
420-
| element.image.tag | string | `"v1.11.90"` | tag to use for element docker image |
421+
| element.image.tag | string | `"v1.11.96"` | tag to use for element docker image |
421422
| element.ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-staging"` | required for TLS certs issued by cert-manager |
422423
| element.ingress.annotations."nginx.ingress.kubernetes.io/configuration-snippet" | string | `"proxy_intercept_errors off;\n"` | |
423424
| element.ingress.className | string | `"nginx"` | ingressClassName for the k8s ingress |
-141 KB
Binary file not shown.
152 KB
Binary file not shown.
-96.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)