From bbe6aa2c463f6c0002e24bd178fae6e514539dbd Mon Sep 17 00:00:00 2001
From: Antonis Stamatiou <stamatiou.antonis@gmail.com>
Date: Thu, 29 Feb 2024 13:05:54 +0200
Subject: [PATCH] feat: Upgrade push proxy version and use default value from
 Chart.yaml (#446)

---
 charts/mattermost-push-proxy/Chart.yaml        | 18 +++++++++---------
 .../templates/deployment.yaml                  |  2 +-
 charts/mattermost-push-proxy/values.yaml       |  7 ++++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/charts/mattermost-push-proxy/Chart.yaml b/charts/mattermost-push-proxy/Chart.yaml
index deb2ae33..5f9acec7 100644
--- a/charts/mattermost-push-proxy/Chart.yaml
+++ b/charts/mattermost-push-proxy/Chart.yaml
@@ -2,14 +2,14 @@ apiVersion: v2
 description: Mattermost Push Proxy server
 name: mattermost-push-proxy
 type: application
-version: 0.10.7
-appVersion: 5.30.0
+version: 0.11.0
+appVersion: 6.0.0
 keywords:
-- mattermost
-- communication
-- notification
-- messaging
-- team colaboration
+  - mattermost
+  - communication
+  - notification
+  - messaging
+  - team colaboration
 home: https://mattermost.com
 icon: http://www.mattermost.org/wp-content/uploads/2016/04/icon.png
 maintainers:
@@ -20,8 +20,8 @@ maintainers:
   - name: delivery-team
     email: devops@mattermost.com
 sources:
-- https://github.com/mattermost/mattermost-helm
-- https://github.com/mattermost/mattermost-push-proxy
+  - https://github.com/mattermost/mattermost-helm
+  - https://github.com/mattermost/mattermost-push-proxy
 annotations:
   artifacthub.io/images: |
     - name: mattermost-push-proxy
diff --git a/charts/mattermost-push-proxy/templates/deployment.yaml b/charts/mattermost-push-proxy/templates/deployment.yaml
index 04af2bf7..20647d0c 100644
--- a/charts/mattermost-push-proxy/templates/deployment.yaml
+++ b/charts/mattermost-push-proxy/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: {{ include "mattermost-push-proxy.name" . }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args: ["--config", "/mattermost-push-proxy/config/config.json"]
           ports:
diff --git a/charts/mattermost-push-proxy/values.yaml b/charts/mattermost-push-proxy/values.yaml
index 69bd1fb5..f254d3bc 100644
--- a/charts/mattermost-push-proxy/values.yaml
+++ b/charts/mattermost-push-proxy/values.yaml
@@ -1,10 +1,10 @@
 replicaCount: 1
 image:
   repository: mattermost/mattermost-push-proxy
-  tag: 5.30.0
   pullPolicy: Always
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -38,7 +38,8 @@ service:
 ingress:
   enabled: false
   # ingressClassName: nginx
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts: