From 8d1afb80c100f7556d8aa9f221c8fb5fba7999db Mon Sep 17 00:00:00 2001 From: mgoerens Date: Tue, 8 Jun 2021 18:18:39 +0200 Subject: [PATCH 1/5] Fix postgresql Chart repository https://kubernetes-charts.storage.googleapis.com has been deprecated. postgresql/stable is now hosted on https://charts.bitnami.com/bitnami --- Chart.lock | 6 +++--- Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Chart.lock b/Chart.lock index 8b3b211..4fc33d0 100644 --- a/Chart.lock +++ b/Chart.lock @@ -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" diff --git a/Chart.yaml b/Chart.yaml index 27a9850..3932d96 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -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 From 5c9e80e924671a79c44640be5d4018ac03ddd0c5 Mon Sep 17 00:00:00 2001 From: mgoerens Date: Tue, 8 Jun 2021 18:20:35 +0200 Subject: [PATCH 2/5] Fix devture/exim-relay tag See: https://github.com/devture/exim-relay/issues/4 --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index db2f79c..9f64581 100644 --- a/values.yaml +++ b/values.yaml @@ -461,7 +461,7 @@ mail: enabled: true image: repository: "devture/exim-relay" - tag: "4.93.1-r0" + tag: "4.93-r1" pullPolicy: IfNotPresent service: type: ClusterIP From fb7caadb9038802eb22608640eda1f9b6e7a1ab2 Mon Sep 17 00:00:00 2001 From: mgoerens Date: Tue, 8 Jun 2021 20:05:48 +0200 Subject: [PATCH 3/5] Update the ingress template to networking.k8s.io/v1 API version https://kubernetes.io/docs/reference/using-api/deprecation-guide/#ingress-v122 --- templates/ingress.yaml | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/templates/ingress.yaml b/templates/ingress.yaml index 3a35306..22f84e7 100644 --- a/templates/ingress.yaml +++ b/templates/ingress.yaml @@ -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 @@ -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 }} From 61d12b26e45693d3c4bc046e81ff75468ca7f123 Mon Sep 17 00:00:00 2001 From: mgoerens Date: Wed, 9 Jun 2021 12:09:12 +0200 Subject: [PATCH 4/5] Update images --- values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/values.yaml b/values.yaml index 9f64581..8976fac 100644 --- a/values.yaml +++ b/values.yaml @@ -277,7 +277,7 @@ postgresql: synapse: image: repository: "matrixdotorg/synapse" - tag: v1.22.1 + tag: v1.35.1 pullPolicy: IfNotPresent service: type: ClusterIP @@ -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 @@ -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: {} @@ -461,7 +461,7 @@ mail: enabled: true image: repository: "devture/exim-relay" - tag: "4.93-r1" + tag: "4.94.2-r0-1" pullPolicy: IfNotPresent service: type: ClusterIP @@ -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: {} From 833e73bc68abae115b2f41178aed15735aba7390 Mon Sep 17 00:00:00 2001 From: mgoerens Date: Fri, 18 Jun 2021 16:45:40 +0200 Subject: [PATCH 5/5] Set application version to 1.35.1 in Charts.yaml --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 3932d96..a71a186 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -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"