From a232476f3bc3ad1034498602a5668c82cc93f990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20P=C3=B6hner?= <10630407+groundhog2k@users.noreply.github.com> Date: Mon, 7 Feb 2022 15:26:59 +0100 Subject: [PATCH] Remove workaround in ghost chart (#860) --- charts/ghost/Chart.yaml | 2 +- charts/ghost/README.md | 2 +- charts/ghost/RELEASENOTES.md | 1 + charts/ghost/templates/deployment.yaml | 16 ---------------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml index cf1b714c..61ab3e00 100644 --- a/charts/ghost/Chart.yaml +++ b/charts/ghost/Chart.yaml @@ -7,7 +7,7 @@ type: application maintainers: - name: groundhog2k -version: 0.35.1 +version: 0.35.2 appVersion: "4.34.3" diff --git a/charts/ghost/README.md b/charts/ghost/README.md index 4de70056..88779b06 100644 --- a/charts/ghost/README.md +++ b/charts/ghost/README.md @@ -1,6 +1,6 @@ # Ghost -   +   ## Changelog diff --git a/charts/ghost/RELEASENOTES.md b/charts/ghost/RELEASENOTES.md index 1e579565..536b0e84 100644 --- a/charts/ghost/RELEASENOTES.md +++ b/charts/ghost/RELEASENOTES.md @@ -9,4 +9,5 @@ | 0.34.0 | 4.33.1 | Upgraded to Ghost 4.33.1 | | 0.35.0 | 4.34.0 | Upgraded to Ghost 4.34.0 | | 0.35.1 | 4.34.3 | Upgraded to Ghost 4.34.3 | +| 0.35.2 | 4.34.3 | Removed chart workaround introduced with #686 | | | | | diff --git a/charts/ghost/templates/deployment.yaml b/charts/ghost/templates/deployment.yaml index 9cf6f694..997f6828 100644 --- a/charts/ghost/templates/deployment.yaml +++ b/charts/ghost/templates/deployment.yaml @@ -35,18 +35,6 @@ spec: securityContext: {{- toYaml . | nindent 8 }} {{- end }} - initContainers: - - name: {{ .Chart.Name }}-init - {{- with .Values.securityContext }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - volumeMounts: - - name: versions - mountPath: /versions - command: [ "/bin/bash", "-c", "cp -R /var/lib/ghost/versions/* /versions" ] containers: - name: {{ .Chart.Name }} {{- with .Values.securityContext }} @@ -172,8 +160,6 @@ spec: volumeMounts: - mountPath: /tmp name: tmp - - mountPath: /var/lib/ghost/versions - name: versions - mountPath: /var/lib/ghost/content name: ghost-vol {{- with .Values.nodeSelector }} @@ -191,8 +177,6 @@ spec: volumes: - name: tmp emptyDir: {} - - name: versions - emptyDir: {} - name: ghost-vol {{- if .Values.storage.persistentVolumeClaimName }} persistentVolumeClaim: -- GitLab