feat: update helm chart matrix-synapse to 2.6.1
This PR contains the following updates:
| Package | Update | Change |
|---|---|---|
| matrix-synapse | minor | 2.1.36 -> 2.6.1 |
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Renovate will not automatically rebase this PR, because other commits have been found.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
- [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ Warning: custom changes will be lost.
This PR has been generated by Renovate Bot.
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.3.4
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"h6WzMIvWVSKLv6TgBh3d1iBX\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"SIeNTktHt3t1qp6xRJt3Czze\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: e7229d5cdde787052d0b09882b197d2e90a59f8298ec458366bfcf7e046e071f
+ checksum/config: e4a7be182cd7b3d5b638a12fceb10e0981534f997fbe7d47ba7e38a9ccd10cf9
+ checksum/secrets: 394b3be05d62316b832f01504ffbab57fc0b2a427478126a01b9dc1d5ecd5b96
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: 854c6d254bd99e8841ef26f302783fd1fcc66ddac282902a14a4a30c5344d456
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.3.5
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"eAoFs9cAdn0AvKS2ncEu6tgM\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"5t4O8a0q87dfmTlxuv3M1HlE\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: 72719257e81441e9d842106cea124de1cb0b9f6854687028095b5afce5f19ce6
+ checksum/config: 555ff4570c0483a413ef167bf415e0ea205151e1e95fb00b5028bcdbeb50eafe
+ checksum/secrets: 19007935b06994cf677b1e320510f6016e278ebdd988bacaf8c422b857981469
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: 5a7f436c4d6f7adc8865c8f0531e5f77bde1226b19fb30b80d0552e6da3fb56e
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.3.6
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"i8ZlFZusAuOWDILbdM2EwhZS\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"HucyjHhIvYDe0Z0rpPsgKKoN\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: fbfcab6c33ff4481c3e1414655b4449507f194f16d4d640fecd29807644f0739
+ checksum/config: 187a40963334efec31456c6a97102b5ac5705c5318f0e2f63928bb6c371c02b8
+ checksum/secrets: 51dada7d34f1c24bdc376ff59944dec44d06f72b4319858f9c605eb48a7361b5
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: 1692d808e92e58f253789c25f5bcfc90cf32e9d5286002f57ea28b4e4349892a
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.4.0
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"cFdCUJYAFcJFkfI2f0AyxUpp\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"zofk83RLkMY07bfXsULci9d4\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: 2ea58bb132ce5918806e720d8239d1e696623936417988842deeff685dc3c11a
+ checksum/config: 63adb596deae71303a1763a3dc4463e3f5dbc33104b648b4df2a1f1cd59cfe1d
+ checksum/secrets: db72a9c1ffc7fffb5d2e8f7e9c2b22d45380e861c20a1c5fa8146e7f6e51a534
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: 14a30580475e8c821aa732fbf4f294161a45dc0dff1ba881d30a44cfd7a4679f
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.6.0
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"NKKBCkfKmhNK2UiH9xMu4bHP\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"KYByktFYoLPUaZ46DOK2sBGh\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: 06e4a1589bf0c6bc8cddd8acccc198b9b48439135a208638fb6a0fcf0698216f
+ checksum/config: ce10053a70aa53be054f09421e29e87338814149cb95021b485c3e54304928d9
+ checksum/secrets: c9ed530f16d7f179b5f46f2d5b9f9dba25734dbfa7b47c2637043f873d99250e
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: f0b112ce707b68ddee31c0661e414bbb67cf9a0181a9d04ae1eb18ba381ceefd
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.6.1
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"xD6U3IMIZgr46xveMEQHIBqc\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"tgkCNzPtnyklIzhRuJ9P81UD\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: d485eb3cd1c5c6513f063e734a508fdeb0fcfb811e9d6c26a85d5814b99ab9f5
+ checksum/config: 505529057ec8464316176d54e249a3fe0a53d8f3162b5ee4c6cb92999b561866
+ checksum/secrets: 9dfced719a0472f6f3cb75bcff44745a55e6e54aec48732e3ecd8865f7858ecd
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: c02bf88bd3ea7780f32ac01eb7a3ace9c3e66bf222af38405a842f26da0f1f5f
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.6.1
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"Cpg47iuz6B6tO1urvlLtkIld\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"Uf6U3XPto8kx81gO96FTlhDw\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: bc7c04d26a0ecb92c56da22c91ba2f4099925386c1fbe12485044b6b53b61093
+ checksum/config: 505529057ec8464316176d54e249a3fe0a53d8f3162b5ee4c6cb92999b561866
+ checksum/secrets: 87e3922bcaa91f8c73173b7d6ecd6aa00ec647d9e88ee8ed9d05fcd658e40bf6
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: c02bf88bd3ea7780f32ac01eb7a3ace9c3e66bf222af38405a842f26da0f1f5f
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.6.2
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"JB1vRF49Qc8Luw7uBgkxfsIc\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"3bgjyIiwiIcu2OPsTPnF6IZB\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: bb20e0e098ce345e9c19de7e00e66f001df32bba1e9988a12bc2fe0ecbcaea42
+ checksum/config: a4a56c5ce40559ec43b7a5a73b1231a49e7435de9c6fb5b65852e0e75a89f093
+ checksum/secrets: 7c1bf059ced6b44065680e8141c6e01161681f736aa83858895489a13201c0dd
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: f80431cf0bab6df106875230b671e558df74e70818160e995bf1036e825ab351
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
@@ -888,20 +906,13 @@
port:
number: 8008
pathType: Prefix
- - path: /.well-known/matrix/client
+ - path: /.well-known/matrix
backend:
service:
name: matrix-synapse-wellknown-lighttpd
port:
number: 80
- pathType: Exact
- - path: /.well-known/matrix/server
- backend:
- service:
- name: matrix-synapse-wellknown-lighttpd
- port:
- number: 80
- pathType: Exact
+ pathType: Prefix
- host: "matrix.${SECRET_DOMAIN}"
http:
paths:
Path: k8s/clusters/cluster-0/manifests/comms/matrix-synapse/helm-release.yaml
Version: 2.1.36 -> 2.6.3
@@ -35,7 +35,7 @@
app.kubernetes.io/instance: matrix-synapse
app.kubernetes.io/managed-by: Helm
stringData:
- config.yaml: "## Registration ##\n\nregistration_shared_secret: \"YnAlOEUXJWBxPaWkQ7DPGjZK\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
+ config.yaml: "## Registration ##\n\nregistration_shared_secret: \"ZQ9dAXqsSB0pEBqdbJL4HGH6\"\n\n## API Configuration ##\n\n## Database configuration ##\n\ndatabase:\n name: \"psycopg2\"\n args:\n user: \"synapse\"\n password: \"${SECRET_MATRIX_POSTGRESQL_PASSWORD}\"\n database: \"synapse\"\n host: \"matrix-synapse-postgres\"\n port: 5432\n sslmode: \"prefer\"\n cp_min: 5\n cp_max: 10\n \n\n## Redis configuration ##\n\nredis:\n enabled: true\n host: \"matrix-synapse-redis-master\"\n password: \"${SECRET_MATRIX_REDIS_PASSWORD}\"\n port: 6379\n"
---
# Source: matrix-synapse/charts/redis/templates/configmap.yaml
apiVersion: v1
@@ -63,7 +63,6 @@
# End of master configuration
replica.conf: |-
dir /data
- slave-read-only yes
# User-supplied replica configuration:
rename-command FLUSHDB ""
rename-command FLUSHALL ""
@@ -92,6 +91,10 @@
-p $REDIS_PORT \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -108,7 +111,12 @@
-p $REDIS_PORT \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
echo "$response"
exit 1
fi
@@ -124,6 +132,10 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
@@ -140,7 +152,12 @@
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
- if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+ if [ "$?" -eq "124" ]; then
+ echo "Timed out"
+ exit 1
+ fi
+ responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+ if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
echo "$response"
exit 1
fi
@@ -452,6 +469,7 @@
app.kubernetes.io/component: master
spec:
type: ClusterIP
+ sessionAffinity: None
ports:
- name: tcp-redis
port: 6379
@@ -549,8 +567,8 @@
template:
metadata:
annotations:
- checksum/config: 3b2253fd5132dd9c0d3f1c915d27efc8927147cae692c26a8b66a89435f6a570
- checksum/secrets: 60d01a40c4cd63523cffac2b2d49df673210696a4d3d7832393a6034c696cb01
+ checksum/config: f6751c7a53b57c04531f5167b1ad1eac9a13e689cda6bbc49038761c5ed3c05c
+ checksum/secrets: 9fd97c39c1a0937efc867623131b8093a25778535b1b3943efc0406f714b1e9d
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -670,7 +688,7 @@
template:
metadata:
annotations:
- checksum/config: 4e7c1ec4d229bfcc59c8270fead1e6c532817b9e7d8bda734adf8bf834e42202
+ checksum/config: 05227897e1b64757c758151d6876d223552c5321e4034125604fb8a1feabff50
labels:
app.kubernetes.io/name: matrix-synapse
app.kubernetes.io/instance: matrix-synapse
@@ -713,7 +731,7 @@
- name: run
emptyDir: {}
---
-# Source: matrix-synapse/charts/redis/templates/master/statefulset.yaml
+# Source: matrix-synapse/charts/redis/templates/master/application.yaml
apiVersion: apps/v1
kind: StatefulSet
metadata:
@@ -743,10 +761,10 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: master
annotations:
- checksum/configmap: 3dc8c0f89c03ee4de0281898def9bbf88f8b9270469158f43a8c4a2af9556ee4
- checksum/health: 04f1695510c783a8ae23cbfdf49f3ac88394929eae5a9cbb0396c3e7783f1929
- checksum/scripts: 5baa355edb67172e688230e2ef578065ac09c86c9c0a5743357dc32aca716ec2
- checksum/secret: a0eac965d76e1232a5b7e1172130888c1b2dd8c2d227cf6e6358e6d2cf511d1a
+ checksum/configmap: 5ab09380dcfcdfb8743647c06f03f5e3829547f2986c876a19c1cc5c399da306
+ checksum/health: 76b159a53ac6f7651745516399be3f807707e3501a995769cac28dfd02c84fbd
+ checksum/scripts: 0bd449b9f14d8d664f63837cc079551bfe12a8535ceb326b2e03bd08e03ac693
+ checksum/secret: 0301657d8458a41230190df02f82bdf03550ad06d68f204a1b2df6778c05afb4
spec:
securityContext:
fsGroup: 1001
@@ -769,7 +787,7 @@
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:6.2.6-debian-10-r103
+ image: docker.io/bitnami/redis:6.2.7-debian-11-r11
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
@@ -888,20 +906,13 @@
port:
number: 8008
pathType: Prefix
- - path: /.well-known/matrix/client
+ - path: /.well-known/matrix
backend:
service:
name: matrix-synapse-wellknown-lighttpd
port:
number: 80
- pathType: Exact
- - path: /.well-known/matrix/server
- backend:
- service:
- name: matrix-synapse-wellknown-lighttpd
- port:
- number: 80
- pathType: Exact
+ pathType: Prefix
- host: "matrix.${SECRET_DOMAIN}"
http:
paths: