[ghost] Fix PVC creation (#1359)

* [ghost] Fix PVC creation

.github/workflows/charts-validate.yaml

@@ -63,26 +63,17 @@ jobs:
       commitHash: ${{ steps.create-commit.outputs.commit_hash }}
     needs:
       - pr-metadata
+    if: |
+      needs.pr-metadata.outputs.isFork == 'false'
     steps:
-      - name: Checkout
-        if: |
-          needs.pr-metadata.outputs.isFork == 'true'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
       - name: Get app-token
         uses: getsentry/action-github-app-token@v1
         id: get-app-token
-        if: |
-          needs.pr-metadata.outputs.isFork == 'false'
         with:
           app_id: ${{ secrets.K8S_AT_HOME_APP_ID }}
           private_key: ${{ secrets.K8S_AT_HOME_APP_PRIVATE_KEY }}
 
       - name: Checkout with app-token
-        if: |
-          needs.pr-metadata.outputs.isFork == 'false'
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -159,6 +150,7 @@ jobs:
       - pr-metadata
       - generate-readme
     if: |
+      always() &&
       needs.generate-readme.outputs.commitHash == ''
     steps:
     - name: Checkout
@@ -194,6 +186,7 @@ jobs:
       - pr-metadata
       - generate-readme
     if: |
+      always() &&
       needs.generate-readme.outputs.commitHash == ''
     steps:
     - name: Checkout
@@ -220,12 +213,9 @@ jobs:
     needs:
     - changes-lint
     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
@@ -247,23 +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:
-    - lint
-    if: ${{ always() }}
-    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.result == 'success'
     name: Run unit tests
     runs-on: ubuntu-20.04
     steps:
@@ -298,8 +279,10 @@ jobs:
   install:
     needs:
     - changes-install
-    - lint_success
+    - lint
     if:
+      always() &&
+      needs.lint.result == 'success' &&
       needs.changes-install.outputs.detected == 'true'
     name: Install charts
     strategy:
@@ -342,7 +325,9 @@ jobs:
     needs:
     - changes-install
     - install
-    if: ${{ always() }}
+    if: |
+      always() &&
+      needs.install.result != 'skipped'
     name: Install successful
     runs-on: ubuntu-20.04
     steps:

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

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
 

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 -}}

hack/check-releasenotes.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-set -eu
+set -e
 
 # Check if release notes have been changed
 # Usage ./check-releasenotes.sh path
 
 # require yq
 command -v yq >/dev/null 2>&1 || {
-    echo >&2 "yq (https://github.com/mikefarah/yq) is not installed. Aborting."
+    printf >&2 "%s\n" "yq (https://github.com/mikefarah/yq) is not installed. Aborting."
     exit 1
 }
 
@@ -19,17 +19,21 @@ if [ $# -ge 1 ] && [ -n "$1" ]; then
     root="$1"
     chart_file="${1}/Chart.yaml"
     if [ ! -f "$chart_file" ]; then
-        echo "File ${chart_file} does not exist."
+        printf >&2 "File %s\n does not exist.\n" "${chart_file}"
         exit 1
     fi
 
-    echo "Validating release notes for $root"
-
     cd $root
+
+    if [ -z "$DEFAULT_BRANCH" ]; then
+      DEFAULT_BRANCH=$(git remote show origin | awk '/HEAD branch/ {print $NF}')
+    fi
+
+    printf "Checking changelog annotation for chart %s\n" "$root"
     CURRENT=$(cat Chart.yaml | yq e '.annotations."artifacthub.io/changes"' -P -)
 
     if [ "$CURRENT" == "" ] || [ "$CURRENT" == "null" ]; then
-      echo >&2 "Release notes have not been set for this chart!"
+      printf >&2 "%s\n" "Changelog annotation has not been set for this chart!"
       exit 1
     fi
 
@@ -37,10 +41,16 @@ if [ $# -ge 1 ] && [ -n "$1" ]; then
     ORIGINAL=$(git show origin/$DEFAULT_BRANCH:./Chart.yaml | yq e '.annotations."artifacthub.io/changes"' -P -)
 
     if [ "$CURRENT" == "$ORIGINAL" ]; then
-      echo >&2 "Release notes have not been updated!"
+      printf >&2 "%s\n" "Changelog annotation has not been updated!"
+      # exit 1
+    fi
+
+    printf "Checking README.md for chart %s\n" "$root"
+    if diff README.md <(git show origin/$DEFAULT_BRANCH:./README.md) >/dev/null; then
+      printf >&2 "%s\n" "README.md has not been updated!"
       exit 1
     fi
 else
-    echo >&2 "No chart folder has been specified."
+    printf >&2 "%s\n" "No chart folder has been specified."
     exit 1
 fi