From 920d8529c8c7f588c1d185b34a0a6913207b7302 Mon Sep 17 00:00:00 2001
From: Tommy <tommy@rodl.no>
Date: Fri, 12 Apr 2024 16:31:53 +0200
Subject: [PATCH] fix: flatten global in config and add MAS to readme

---
 README.org                                           |  2 ++
 charts/matrix-authentication-service/Chart.yaml      |  2 +-
 .../templates/deployment.yaml                        | 12 ++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.org b/README.org
index 7c2a3a3..b0d5473 100644
--- a/README.org
+++ b/README.org
@@ -54,6 +54,8 @@ Below you'll find an overview of the charts and an intro to get you started.
 
 🚧 [[charts/vikunja][Vikunja]]: Todo app with web and dav support.
 
+🚧 [[charts/matrix-authentication-service][Matrix Authentication Service]]: Matrix auth system implementing MSC3861
+
 🚧 [[charts/maubot][Maubot]]: Matrix bot system.
 
 🚧 [[charts/nfty-sh][nfty.sh]]: Push notification server for clients and phones.
diff --git a/charts/matrix-authentication-service/Chart.yaml b/charts/matrix-authentication-service/Chart.yaml
index 0a65d31..f6307f2 100644
--- a/charts/matrix-authentication-service/Chart.yaml
+++ b/charts/matrix-authentication-service/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: matrix-authentication-service
-description: OAuth 2.0 and OpenID Provider for Matrix Homeservers (MSC3861)
+description: OAuth 2.0 and OpenID Provider for Matrix Homeservers
 icon: https://avatars.githubusercontent.com/u/8418310?s=48&v=4
 type: application
 version: 0.1.0
diff --git a/charts/matrix-authentication-service/templates/deployment.yaml b/charts/matrix-authentication-service/templates/deployment.yaml
index 5f2aa44..543f16d 100644
--- a/charts/matrix-authentication-service/templates/deployment.yaml
+++ b/charts/matrix-authentication-service/templates/deployment.yaml
@@ -20,8 +20,8 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           {{- with .Values.image }}
-          image: "{{ coalesce $.Values.global.image.registry .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
-          imagePullPolicy: {{ coalesce $.Values.global.image.pullPolicy .pullPolicy }}
+          image: "{{ coalesce $.Values.image.registry .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
+          imagePullPolicy: {{ coalesce $.Values.image.pullPolicy .pullPolicy }}
           {{- end }}
           env:
             - name: "MAS_CONFIG"
@@ -41,8 +41,8 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           {{- with .Values.image }}
-          image: "{{ coalesce $.Values.global.image.registry .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
-          imagePullPolicy: {{ coalesce $.Values.global.image.pullPolicy .pullPolicy }}
+          image: "{{ coalesce $.Values.image.registry .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
+          imagePullPolicy: {{ coalesce $.Values.image.pullPolicy .pullPolicy }}
           {{- end }}
           env:
             - name: "MAS_CONFIG"
@@ -66,8 +66,8 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           {{- with .Values.image }}
-          image: "{{ coalesce $.Values.global.image.registry .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
-          imagePullPolicy: {{ coalesce $.Values.global.image.pullPolicy .pullPolicy }}
+          image: "{{ coalesce $.Values.image.registry .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
+          imagePullPolicy: {{ coalesce $.Values.image.pullPolicy .pullPolicy }}
           {{- end }}
           env:
             - name: "MAS_CONFIG"