From eb00628f874413c8d14d76890053ee5fdc79f03f Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 25 May 2017 21:25:15 +0200
Subject: [PATCH] [stable/magento] Release 0.4.7 (#929)

* magento: update to `bitnami/magento:2.16-r0`
* magento: bump chart version to `0.4.7`
* magento: fixes command to get application password from secret
* magento: fix probes to properly query pod health
---
 stable/magento/Chart.yaml                |  2 +-
 stable/magento/templates/NOTES.txt       |  8 +++---
 stable/magento/templates/deployment.yaml | 32 +++++++++++++-----------
 stable/magento/values.yaml               |  2 +-
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/stable/magento/Chart.yaml b/stable/magento/Chart.yaml
index b446020e88..8f67ad7503 100644
--- a/stable/magento/Chart.yaml
+++ b/stable/magento/Chart.yaml
@@ -1,5 +1,5 @@
 name: magento
-version: 0.4.6
+version: 0.4.7
 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more.
 keywords:
 - magento
diff --git a/stable/magento/templates/NOTES.txt b/stable/magento/templates/NOTES.txt
index 374d0f2d92..dc1e202b92 100644
--- a/stable/magento/templates/NOTES.txt
+++ b/stable/magento/templates/NOTES.txt
@@ -19,14 +19,16 @@ host. To configure Magento with the URL of your service:
         Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  export APP_PASSWORD=$(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.magento-password[*]}"`))
-  export APP_DATABASE_PASSWORD=$(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password[*]}"`))
+  export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.magento-password}" | base64 --decode)
+  {{- if .Values.mariadb.mariadbRootPassword }}
+  export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
+  {{- end }}
   {{- end }}
 
 2. Complete your Magento deployment by running:
 
   helm upgrade {{ .Release.Name }} \
-    --set magentoHost=$APP_HOST,magentoPassword=$APP_PASSWORD,mariadb.mariadbRootPassword=$APP_DATABASE_PASSWORD stable/magento
+    --set magentoHost=$APP_HOST,magentoPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$APP_DATABASE_PASSWORD{{ end }} stable/magento
 
 {{- else -}}
 1. Get the Magento URL by running:
diff --git a/stable/magento/templates/deployment.yaml b/stable/magento/templates/deployment.yaml
index f0ec444756..ead1a571e6 100644
--- a/stable/magento/templates/deployment.yaml
+++ b/stable/magento/templates/deployment.yaml
@@ -53,23 +53,25 @@ spec:
         - name: https
           containerPort: 443
         livenessProbe:
-          exec:
-            command:
-            - nc
-            - -z
-            - localhost
-            - "80"
-          initialDelaySeconds: 120
+          httpGet:
+            path: /index.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: {{ include "host" . | quote }}
+          initialDelaySeconds: 180
           timeoutSeconds: 5
+          failureThreshold: 6
         readinessProbe:
-          exec:
-            command:
-            - nc
-            - -z
-            - localhost
-            - "80"
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
+          httpGet:
+            path: /index.php
+            port: http
+            httpHeaders:
+            - name: Host
+              value: {{ include "host" . | quote }}
+          initialDelaySeconds: 30
+          timeoutSeconds: 3
+          periodSeconds: 5
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         volumeMounts:
diff --git a/stable/magento/values.yaml b/stable/magento/values.yaml
index 30a63b15e4..4ef35b1750 100644
--- a/stable/magento/values.yaml
+++ b/stable/magento/values.yaml
@@ -1,7 +1,7 @@
 ## Bitnami Magento image version
 ## ref: https://hub.docker.com/r/bitnami/magento/tags/
 ##
-image: bitnami/magento:2.1.5-r2
+image: bitnami/magento:2.1.6-r0
 
 ## Specify a imagePullPolicy
 ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'