From 7577fb4aa51abe4482c02ea63b94c7a657708f60 Mon Sep 17 00:00:00 2001
From: Stavros Foteinopoulos <stafot@gmail.com>
Date: Fri, 6 Sep 2024 13:26:09 +0300
Subject: [PATCH] Remove unused mounts (#472)

Signed-off-by: Stavros Foteinopoulos <stafot@gmail.com>
---
 charts/mattermost-push-proxy/Chart.yaml       |  2 +-
 .../templates/deployment.yaml                 | 23 ++++---------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/charts/mattermost-push-proxy/Chart.yaml b/charts/mattermost-push-proxy/Chart.yaml
index fa674109..4a591022 100644
--- a/charts/mattermost-push-proxy/Chart.yaml
+++ b/charts/mattermost-push-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 description: Mattermost Push Proxy server
 name: mattermost-push-proxy
 type: application
-version: 0.12.5
+version: 0.12.6
 appVersion: 6.1.0
 keywords:
   - mattermost
diff --git a/charts/mattermost-push-proxy/templates/deployment.yaml b/charts/mattermost-push-proxy/templates/deployment.yaml
index 4bb87dc7..aa4b3398 100644
--- a/charts/mattermost-push-proxy/templates/deployment.yaml
+++ b/charts/mattermost-push-proxy/templates/deployment.yaml
@@ -78,21 +78,12 @@ spec:
             - mountPath: "{{ .Values.applePushSettings.authKeyFile }}"
               name: "common-secret"
               subPath: {{ .Values.applePushSettings.authKeyFileName }}
-            - mountPath: "/certs/apple-push-cert.pem"
-              name: "common-secret"
-              subPath: "apple-push-cert.pem"
-            - mountPath: "/certs/apple-rn-push-cert.pem"
-              name: "common-secret"
-              subPath: "apple-rn-push-cert.pem"
-            - mountPath: "/certs/apple-rnbeta-push-cert.pem"
-              name: "common-secret"
-              subPath: "apple-rnbeta-push-cert.pem"
             - mountPath: "{{ .Values.androidPushSettings.android.serviceFileLocation }}"
               name: "common-secret"
-              subPath: "android-service-file"
+              subPath: "{{ .Values.androidPushSettings.android.serviceFileName }}"
             - mountPath: "{{ .Values.androidPushSettings.android_rn.serviceFileLocation }}"
               name: "common-secret"
-              subPath: "android-rn-service-file"
+              subPath: "{{ .Values.androidPushSettings.android_rn.serviceFileName }}"
             {{- end }}
           resources:
             {{ toYaml .Values.resources | nindent 12 }}
@@ -171,14 +162,8 @@ spec:
             items:
               - key: "apple_auth_key"
                 path: {{ .Values.applePushSettings.authKeyFileName }}
-              - key: "apple_cert"
-                path: "apple-push-cert.pem"
-              - key: "apple_rn_cert"
-                path: "apple-rn-push-cert.pem"
-              - key: "apple_rnbeta_cert"
-                path: "apple-rnbeta-push-cert.pem"
               - key: "android_serviceFile"
-                path: "android-service-file"
+                path: {{ .Values.androidPushSettings.android.serviceFileName }}
               - key: "android_rn_serviceFile"
-                path: "android-rn-service-file"
+                path: {{ .Values.androidPushSettings.android_rn.serviceFileName }}
 {{- end }}