Skip to content

Fix dependencies #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgoerens wants to merge 5 commits into
base: master
Choose a base branch
from
+44 −12
Open

Fix dependencies #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d1afb8
Fix postgresql Chart repository
mgoerens Jun 8, 2021
5c9e80e
Fix devture/exim-relay tag
mgoerens Jun 8, 2021
fb7caad
Update the ingress template to networking.k8s.io/v1 API version
mgoerens Jun 8, 2021
61d12b2
Update images
mgoerens Jun 9, 2021
833e73b
Set application version to 1.35.1 in Charts.yaml
mgoerens Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: postgresql
repository: https://kubernetes-charts.storage.googleapis.com
repository: https://charts.bitnami.com/bitnami
version: 8.0.0
digest: sha256:54b8dbbf92f98a307a15de995f41897aa3ea3f3252b6f594d058530755b3dfa8
generated: "2020-03-30T22:24:34.251333366-07:00"
digest: sha256:e8d946081dc8db71bc430553369010f7ce80950f091010a7fb2671e5505fa801
generated: "2021-06-08T18:04:16.014082911+02:00"
4 changes: 2 additions & 2 deletions Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ version: 2.8.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 1.22.1
appVersion: 1.35.1

maintainers:
- name: "David Cruz"
Expand All @@ -32,5 +32,5 @@ maintainers:
dependencies:
- name: postgresql
version: 8.0.0
repository: https://kubernetes-charts.storage.googleapis.com
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
34 changes: 33 additions & 1 deletion templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
Expand Down Expand Up @@ -28,26 +30,56 @@ spec:
- host: {{ .Values.ingress.hosts.synapse }}
http:
paths:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
- backend:
service:
name: "{{ include "matrix.fullname" . }}-synapse"
port:
number: {{ .Values.synapse.service.port }}
path: /
pathType: ImplementationSpecific
{{- else -}}
- path: "/"
backend:
serviceName: "{{ include "matrix.fullname" . }}-synapse"
servicePort: {{ .Values.synapse.service.port }}
{{- end -}}
{{- if .Values.riot.enabled }}
- host: {{ .Values.ingress.hosts.riot }}
http:
paths:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
- backend:
service:
name: "{{ include "matrix.fullname" . }}-riot"
port:
number: {{ .Values.riot.service.port }}
path: /
pathType: ImplementationSpecific
{{- else -}}
- path: "/"
backend:
serviceName: "{{ include "matrix.fullname" . }}-riot"
servicePort: {{ .Values.riot.service.port }}
{{- end -}}
{{- end }}
{{- if .Values.ingress.federation }}
- host: {{ .Values.ingress.hosts.federation }}
http:
paths:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
- backend:
service:
name: "{{ include "matrix.fullname" . }}-synapse-federation"
port:
number: {{ .Values.synapse.service.federation.port }}
path: /
pathType: ImplementationSpecific
{{- else -}}
- path: "/"
backend:
serviceName: "{{ include "matrix.fullname" . }}-synapse-federation"
servicePort: {{ .Values.synapse.service.federation.port }}
{{- end -}}
{{- end }}
{{- end }}
12 changes: 6 additions & 6 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ postgresql:
synapse:
image:
repository: "matrixdotorg/synapse"
tag: v1.22.1
tag: v1.35.1
pullPolicy: IfNotPresent
service:
type: ClusterIP
Expand Down Expand Up @@ -375,7 +375,7 @@ riot:
# Element Kubernetes resource settings
image:
repository: "vectorim/riot-web"
tag: v1.7.12
tag: v1.7.30
pullPolicy: IfNotPresent
service:
type: ClusterIP
Expand Down Expand Up @@ -434,8 +434,8 @@ coturn:
type: ClusterIP

image:
repository: "instrumentisto/coturn"
tag: "4.5.1.3"
repository: "coturn/coturn"
tag: "4.5.2"
pullPolicy: IfNotPresent
replicaCount: 1
resources: {}
Expand All @@ -461,7 +461,7 @@ mail:
enabled: true
image:
repository: "devture/exim-relay"
tag: "4.93.1-r0"
tag: "4.94.2-r0-1"
pullPolicy: IfNotPresent
service:
type: ClusterIP
Expand Down Expand Up @@ -511,7 +511,7 @@ bridges:

image:
repository: "matrixdotorg/matrix-appservice-irc"
tag: "release-0.22.0-rc1"
tag: "release-0.26.0"
pullPolicy: IfNotPresent
replicaCount: 1
resources: {}
Expand Down