From 9e57f7523cd162c2e127b20d6a2ee32cb638e4af Mon Sep 17 00:00:00 2001
From: Garry O'Donnell <garry.o'donnell@diamond.ac.uk>
Date: Thu, 18 Jul 2024 11:17:59 +0100
Subject: [PATCH] Prefix oauth2 client secret name with helm release name

---
 charts/apps/Chart.yaml                           |  2 +-
 charts/graph/templates/oauth2-client-secret.yaml | 16 +++++++++-------
 charts/graph/values.yaml                         |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/charts/apps/Chart.yaml b/charts/apps/Chart.yaml
index ff2d4fb..c5a0642 100644
--- a/charts/apps/Chart.yaml
+++ b/charts/apps/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: graph
 description: ArgoCD Apps used to deploy the Graph
 type: application
-version: 0.2.1
+version: 0.2.2
diff --git a/charts/graph/templates/oauth2-client-secret.yaml b/charts/graph/templates/oauth2-client-secret.yaml
index 91bc05e..a87d3fb 100644
--- a/charts/graph/templates/oauth2-client-secret.yaml
+++ b/charts/graph/templates/oauth2-client-secret.yaml
@@ -1,15 +1,17 @@
 apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
-  creationTimestamp: null
-  name: oauth2-client
+  annotations:
+    sealedsecrets.bitnami.com/namespace-wide: "true"
+  name: "{{ .Release.Name }}-oauth2-client"
   namespace: graph
 spec:
-  encryptedData:
-    secret: AgCC4dhJKFpNi4zBFd/29g/YalIXn1GER4wwg9JAaJNJCECQcYGolFrjuA2BXJO3v1KQCvXKr+EuR1JH0sDKaOHbhbJQ/kDeCwqqfK2+oMcf1p5lb/x1fZTnj9HOpNLq3Mjisukn6TA3N1OwTPdLxGLajh9R8Dx4WySKIe/Th4vRth72i3bnIIi3QJnCt5jMKQ6Rls8ENUTZN5uMVliEdt+Cesjo9ZJ435bgJAr8qUK9NBleJ6Qep1Ufx2ptlaqNy+fTpeeusujiegfNzP14jLwh/s0+r5KYXqvIamBsVEsxwx+HReqvCm5uYocKgtgXUU1N/pDCMu7Kz/3TWtKj1HF/0gsUnR8YvQUMmg8p8kDZ/6sfL498q+pIUUoccZkZVQR9hiUPI9n0XXvVA3PDslhpOUMwmEEE05WRKgW1g5c9D9OveV7FExpqyHhFdogpT5QvQ0baY9pjB8EO/6Oqz80gUAw5RNB75KBf744T1gZMDMzIJjIMs6pQlMQXQvLGKGA/JCs910kfMPC1jPtFDJOXnLvQBpPzn4KsVDNmIBFN/ogDbpNVeiptDe9azKKtyBWkycJ3DPIOBoc1AXWaAM199UXr8EOd3ihAH7Rs0Gzsbp2/6FzDef40I0eKDaFI7Po361+pUJkRd8xsHlOEFsBGLw1z6LfPxAA+mKhMV/LI39uiFK/yHmpRlFege2TA/vQa9UNhKF7s9j0VTIJnt06a8HK0EwTS3LO4RLcGDF+8bw==
   template:
+    type: Opaque
     metadata:
-      creationTimestamp: null
-      name: oauth2-client
+      annotations:
+        sealedsecrets.bitnami.com/namespace-wide: "true"
+      name: "{{ .Release.Name }}-oauth2-client"
       namespace: graph
-
+  encryptedData:
+    secret: AgBm/HFZ+1zmTRLltG4bUk4/SCKb5YFlAswVrPChZzUF395p/wgkhpniLMoJAIpcpYNL6antxz/168S185TrVuu2NOZGXaf+4VH8Cn6JzDjaj3P86D9pYKyLePIWoAnIYP1bsyeh6RVg30yluXIGN/4dlhZPnpP5idr3iITYwnk04NwWsdLT9SItit+jxS7Uu7cfF77+WMbvYT5OKcMf1vNqHNcZXfL7gHG0NNPqBfiFqcbcf71I9zPxEK6JiRLIYHQNMVasYd4ml1ZayQxjjNOjOg262DFGcFKLC7NIPWOlpIhtMEQfCl7nH28pufdcIFTDrxvxpyj9EGJRqKnsgeIsI2H68UXXWCcjGcLZX09Hd80ejMwj093/TAnYngaLFIQclpym3Um8XKiLj0/4W+KkHj4CVjnJEou3ikbF3Kn7XewAE8xzyHrbPJEn6cWBC45tpZsO9B3Iy65LKB3RJC/qI6k9FUnZ1EwY/AZU65S1TzE2gzzAeMuXD8OlWyxxH+lsFWrLu1xfm2FtzQc4Zlbk214OHUIE1LSQ6odp/Pbd4T1OeizZU5ot7XvCylBbMECQ7JRT+prFwQIexpwbZ31VREYoFr/j8v5OngD1sT/pk6jCp9TqAGVl59QkPZpiXW31KPn4ojXOr+tvabVkod/pe21zgdtvj0dRyS9MIFexia0HIMPq0tnQPaE5yJY2UHezZA/1fVToC3PQytG0Zqj/JrfZyzhgOMAqDPMmUvF8bA==
diff --git a/charts/graph/values.yaml b/charts/graph/values.yaml
index b93d8d1..9dd8448 100644
--- a/charts/graph/values.yaml
+++ b/charts/graph/values.yaml
@@ -106,7 +106,7 @@ oauth2-proxy:
   extraVolumes:
     - name: client-secret
       secret:
-        secretName: oauth2-client
+        secretName: "{{ .Release.Name }}-oauth2-client"
         items:
           - key: secret
             path: client-secret