From e5dd1fe6f6303513a7753f4ca30023499323310e Mon Sep 17 00:00:00 2001 From: Oleg Fiksel Date: Sun, 5 Jan 2020 18:49:57 +0100 Subject: [PATCH 1/2] Fixed indention --- kubernetes/synapse.yaml | 77 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/kubernetes/synapse.yaml b/kubernetes/synapse.yaml index 990f3eb..18ef3a8 100644 --- a/kubernetes/synapse.yaml +++ b/kubernetes/synapse.yaml @@ -89,45 +89,44 @@ spec: app: matrix-synapse spec: containers: - - command: # As an example of how to add rest_auth to the container without requiring a separate image - - sh - - -c - - | - wget https://github.com/kamax-io/matrix-synapse-rest-auth/raw/master/rest_auth_provider.py -O /usr/local/lib/python2.7/site-packages/rest_auth_provider.py - /matrix-synapse - env: - - name: SYNAPSE_CACHE_FACTOR - value: "5.00" - image: ananace/matrix-synapse:1.7.3 - imagePullPolicy: IfNotPresent - livenessProbe: - httpGet: - path: /_matrix/client/versions - port: 8008 - scheme: HTTP - initialDelaySeconds: 120 - name: matrix-synapse - readinessProbe: - httpGet: - path: /_matrix/client/versions - port: 8008 - scheme: HTTP - initialDelaySeconds: 10 - resources: - # These are just some arbitrary values, will have to be tuned or removed per-deployment - requests: - memory: 250Mi - cpu: 250m - limits: - memory: 1Gi - cpu: 1 - volumeMounts: - - mountPath: /synapse/data - name: matrix-synapse-data - - mountPath: /synapse/keys - name: matrix-synapse-keys - - mountPath: /synapse/config - name: matrix-synapse-config + - command: # As an example of how to add rest_auth to the container without requiring a separate image + - sh + - -c + - | + wget https://github.com/kamax-io/matrix-synapse-rest-auth/raw/master/rest_auth_provider.py -O /usr/local/lib/python2.7/site-packages/rest_auth_provider.py /matrix-synapse + env: + - name: SYNAPSE_CACHE_FACTOR + value: "5.00" + image: ananace/matrix-synapse:1.7.3 + imagePullPolicy: IfNotPresent + livenessProbe: + httpGet: + path: /_matrix/client/versions + port: 8008 + scheme: HTTP + initialDelaySeconds: 120 + name: matrix-synapse + readinessProbe: + httpGet: + path: /_matrix/client/versions + port: 8008 + scheme: HTTP + initialDelaySeconds: 10 + resources: + # These are just some arbitrary values, will have to be tuned or removed per-deployment + requests: + memory: 250Mi + cpu: 250m + limits: + memory: 1Gi + cpu: 1 + volumeMounts: + - mountPath: /synapse/data + name: matrix-synapse-data + - mountPath: /synapse/keys + name: matrix-synapse-keys + - mountPath: /synapse/config + name: matrix-synapse-config restartPolicy: Always volumes: # Will need to be a persistant volume of some kind to support media uploads, unless using matrix-media-repo From dde9e5a18258c1cd3b5e8c153409154e13759169 Mon Sep 17 00:00:00 2001 From: Oleg Fiksel Date: Sun, 5 Jan 2020 19:02:03 +0100 Subject: [PATCH 2/2] Fixed the indention (again) --- kubernetes/synapse.yaml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/kubernetes/synapse.yaml b/kubernetes/synapse.yaml index 18ef3a8..9d6dc50 100644 --- a/kubernetes/synapse.yaml +++ b/kubernetes/synapse.yaml @@ -94,18 +94,18 @@ spec: - -c - | wget https://github.com/kamax-io/matrix-synapse-rest-auth/raw/master/rest_auth_provider.py -O /usr/local/lib/python2.7/site-packages/rest_auth_provider.py /matrix-synapse + name: matrix-synapse + image: ananace/matrix-synapse:1.7.3 + imagePullPolicy: IfNotPresent env: - name: SYNAPSE_CACHE_FACTOR value: "5.00" - image: ananace/matrix-synapse:1.7.3 - imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /_matrix/client/versions port: 8008 scheme: HTTP initialDelaySeconds: 120 - name: matrix-synapse readinessProbe: httpGet: path: /_matrix/client/versions @@ -127,14 +127,13 @@ spec: name: matrix-synapse-keys - mountPath: /synapse/config name: matrix-synapse-config - restartPolicy: Always - volumes: - # Will need to be a persistant volume of some kind to support media uploads, unless using matrix-media-repo - - name: matrix-synapse-data - emptyDir: {} - - name: matrix-synapse-keys - secret: - secretName: matrix-synapse-keys - - configMap: - name: matrix-synapse - name: matrix-synapse-config + restartPolicy: Always + volumes: + - name: matrix-synapse-data + emptyDir: {} + - name: matrix-synapse-keys + secret: + secretName: matrix-synapse-keys + - configMap: + name: matrix-synapse + name: matrix-synapse-config