From b1fc8dd547f6b9164e66824a661f0c2ff508ca9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?=
 =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= <me@bjw-s.dev>
Date: Thu, 6 Jan 2022 13:37:50 +0100
Subject: [PATCH] [ghost] Fix PVC creation (#1359)

* [ghost] Fix PVC creation
---
 .github/workflows/charts-validate.yaml    | 31 +++++------------------
 charts/stable/ghost/Chart.yaml            | 11 ++++----
 charts/stable/ghost/README.md             |  9 +++----
 charts/stable/ghost/templates/common.yaml |  5 ++--
 4 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/charts-validate.yaml b/.github/workflows/charts-validate.yaml
index d962ed1f..73da9ef7 100644
--- a/.github/workflows/charts-validate.yaml
+++ b/.github/workflows/charts-validate.yaml
@@ -215,11 +215,7 @@ jobs:
     if:
       always() &&
       needs.changes-lint.outputs.detected == 'true'
-    name: Lint charts
-    strategy:
-      matrix: ${{ fromJson(needs.changes-lint.outputs.matrix) }}
-      fail-fast: true
-      max-parallel: 15
+    name: Lint successful
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout
@@ -241,29 +237,14 @@ jobs:
 
     - name: Run chart-testing (lint)
       id: lint
-      run: ct lint --config .github/ct-lint.yaml --charts ${{ matrix.chart }}
-
-  # Summarize matrix https://github.community/t/status-check-for-a-matrix-jobs/127354/7
-  lint_success:
-    needs:
-    - changes-lint
-    - lint
-    if: |
-      always() &&
-      needs.lint.result != 'skipped'
-    name: Lint successful
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Check lint matrix status
-      if: ${{ needs.changes-lint.outputs.detected == 'true' && needs.lint.result != 'success' }}
-      run: exit 1
+      run: ct lint --config .github/ct-lint.yaml
 
   unittest:
     needs:
-    - lint_success
+    - lint
     if: |
       always() &&
-      needs.lint_success.result == 'success'
+      needs.lint.result == 'success'
     name: Run unit tests
     runs-on: ubuntu-20.04
     steps:
@@ -298,10 +279,10 @@ jobs:
   install:
     needs:
     - changes-install
-    - lint_success
+    - lint
     if:
       always() &&
-      needs.lint_success.result == 'success' &&
+      needs.lint.result == 'success' &&
       needs.changes-install.outputs.detected == 'true'
     name: Install charts
     strategy:
diff --git a/charts/stable/ghost/Chart.yaml b/charts/stable/ghost/Chart.yaml
index fd18ecbe..22c73d9a 100644
--- a/charts/stable/ghost/Chart.yaml
+++ b/charts/stable/ghost/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.27.2
 description: Ghost is a blogging and publishing software
 name: ghost
-version: 1.1.0
+version: 1.1.1
 kubeVersion: ">=1.19.0-0"
 keywords:
   - ghost
@@ -25,7 +25,8 @@ dependencies:
     condition: mariadb.enabled
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Upgraded `common` chart dependency to version `4.3.0`.
-    - kind: changed
-      description: Upgraded `mariadb` chart dependency to version `10.2.0`.
+    - kind: fixed
+      description: Fixed PVC creation.
+      links:
+        - name: GitHub Issue
+          url: https://github.com/k8s-at-home/charts/issues/1358
diff --git a/charts/stable/ghost/README.md b/charts/stable/ghost/README.md
index 8deedf49..0fc0f109 100644
--- a/charts/stable/ghost/README.md
+++ b/charts/stable/ghost/README.md
@@ -1,6 +1,6 @@
 # ghost
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: 4.27.2](https://img.shields.io/badge/AppVersion-4.27.2-informational?style=flat-square)
+![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![AppVersion: 4.27.2](https://img.shields.io/badge/AppVersion-4.27.2-informational?style=flat-square)
 
 Ghost is a blogging and publishing software
 
@@ -100,7 +100,7 @@ N/A
 
 ## Changelog
 
-### Version 1.1.0
+### Version 1.1.1
 
 #### Added
 
@@ -108,12 +108,11 @@ N/A
 
 #### Changed
 
-* Upgraded `common` chart dependency to version `4.3.0`.
-* Upgraded `mariadb` chart dependency to version `10.2.0`.
+N/A
 
 #### Fixed
 
-N/A
+* Fixed PVC creation.
 
 ### Older versions
 
diff --git a/charts/stable/ghost/templates/common.yaml b/charts/stable/ghost/templates/common.yaml
index 314a1995..7d5f53f8 100644
--- a/charts/stable/ghost/templates/common.yaml
+++ b/charts/stable/ghost/templates/common.yaml
@@ -3,11 +3,10 @@
 
 {{/* Append the hardcoded settings */}}
 {{- define "ghost.hardcodedValues" -}}
-
-persistence:
   {{- if not .Values.persistence.content.enabled }}
+persistence:
   content:
-    enabled: "true"
+    enabled: true
     type: "emptyDir"
   {{- end }}
 {{- end -}}