From 313f6b87c547807b7bb640edfbb627bfe33f2f2f Mon Sep 17 00:00:00 2001
From: Stavros Foteinopoulos <stafot@gmail.com>
Date: Wed, 4 Sep 2024 16:39:20 +0300
Subject: [PATCH] Lint fixes (#468)

Signed-off-by: Stavros Foteinopoulos <stafot@gmail.com>
---
 charts/mattermost-push-proxy/Chart.yaml             |  2 +-
 .../mattermost-push-proxy/templates/deployment.yaml | 13 +++++++------
 .../templates/external_secrets.yaml                 |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/charts/mattermost-push-proxy/Chart.yaml b/charts/mattermost-push-proxy/Chart.yaml
index 6d11a14e..dd7ad069 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.1
+version: 0.12.2
 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 454edcaf..4ffcba2a 100644
--- a/charts/mattermost-push-proxy/templates/deployment.yaml
+++ b/charts/mattermost-push-proxy/templates/deployment.yaml
@@ -148,21 +148,21 @@ spec:
                 - key: "apple_rnbeta_cert"
                   path: "apple-rnbeta-push-cert.pem"
           {{- end }}
-          {{- if .Values.androidPushSettings.android serviceFile }}
+          {{- if .Values.androidPushSettings.android_serviceFile }}
           - name: "android-service-file"
             secret:
               secretName: {{ include "mattermost-push-proxy.fullname" . }}-android-service-files
               items:
                 - key: "android_serviceFile"
-                  path: {{ .Values.androidPushSettings.android serviceFileName }}
+                  path: {{ .Values.androidPushSettings.android_serviceFileName }}
           {{- end }}
-          {{- if .Values.androidPushSettings.android_rn serviceFile }}
+          {{- if .Values.androidPushSettings.android_rn_serviceFile }}
               - name: "android-rn-service-file"
                 secret:
                   secretName: {{ include "mattermost-push-proxy.fullname" . }}-android-service-files
                   items:
-                    - key: "android_rn serviceFile"
-                      path: {{ .Values.androidPushSettings.android_rn serviceFileName }}
+                    - key: "android_rn_serviceFile"
+                      path: {{ .Values.androidPushSettings.android_rn_serviceFileName }}
           {{- end }}
         {{- else }}
         - name: "common-secret"
@@ -179,5 +179,6 @@ spec:
                 path: "apple-rnbeta-push-cert.pem"
               - key: "android_serviceFile"
                 path: "android-service-file"
-              - key: "android_rn serviceFile"
+              - key: "android_rn_serviceFile"
                 path: "android-rn-service-file"
+{{- end }}
diff --git a/charts/mattermost-push-proxy/templates/external_secrets.yaml b/charts/mattermost-push-proxy/templates/external_secrets.yaml
index 9a1598f2..c9da9521 100644
--- a/charts/mattermost-push-proxy/templates/external_secrets.yaml
+++ b/charts/mattermost-push-proxy/templates/external_secrets.yaml
@@ -20,3 +20,4 @@ spec:
   {{- with .Values.externalSecrets.data }}
     {{- toYaml $.Values.externalSecrets.data | nindent 2 }}
   {{- end }}
+{{- end }}