From e12a75958aca2cf130d13e8e7ca2d9cacc4826a9 Mon Sep 17 00:00:00 2001
From: James Rawlings <rawlingsj80@gmail.com>
Date: Wed, 6 Dec 2017 00:37:01 +0000
Subject: [PATCH] =?UTF-8?q?add=20optional=20persistence=20to=20chartmuseum?=
 =?UTF-8?q?=20and=20upgrade=20image=20to=20latest=20r=E2=80=A6=20(#2746)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add optional persistence to chartmuseum and upgrade image to latest release

- upgrade chartmuseum image to v0.2.4
- add a PVC to persist the storage folder so charts published charts surive pod restarts
- add option to disable persistance

* disable chartmuseum pv by default and allow folks to opt-in

* add NOTES.txt to see if that helps CI helm lint
---
 incubator/chartmuseum/Chart.yaml              |  4 ++--
 incubator/chartmuseum/requirements.lock       | 11 +++-------
 incubator/chartmuseum/templates/NOTES.txt     |  3 +++
 .../chartmuseum/templates/deployment.yaml     | 11 ++++++++++
 incubator/chartmuseum/templates/pvc.yaml      | 22 +++++++++++++++++++
 incubator/chartmuseum/values.yaml             | 19 +++++++++++++++-
 6 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 incubator/chartmuseum/templates/NOTES.txt
 create mode 100644 incubator/chartmuseum/templates/pvc.yaml

diff --git a/incubator/chartmuseum/Chart.yaml b/incubator/chartmuseum/Chart.yaml
index e07f733bc5..4adf70c39e 100644
--- a/incubator/chartmuseum/Chart.yaml
+++ b/incubator/chartmuseum/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: Helm Chart Repository with support for Amazon S3 and Google Cloud Storage
 name: chartmuseum
-version: 0.1.0
-appVersion: 0.1.0
+version: 0.1.1
+appVersion: 0.2.6
 home: https://github.com/chartmuseum/chartmuseum
 icon: https://raw.githubusercontent.com/chartmuseum/chartmuseum/master/logo.png
 maintainers:
diff --git a/incubator/chartmuseum/requirements.lock b/incubator/chartmuseum/requirements.lock
index 89c7c23cae..ef059b5d98 100644
--- a/incubator/chartmuseum/requirements.lock
+++ b/incubator/chartmuseum/requirements.lock
@@ -1,11 +1,6 @@
 dependencies:
-- alias: ""
-  condition: ""
-  enabled: false
-  import-values: null
-  name: common
+- name: common
   repository: https://kubernetes-charts-incubator.storage.googleapis.com/
-  tags: null
   version: 0.0.1
-digest: sha256:321cd050dce9ef5f3665adff9323163820ac4c7d18b91876a520e6f0e8b49d46
-generated: 2017-09-20T00:29:42.620906219-05:00
+digest: sha256:306378be27e855f6823d057c0d90ba3be227d44dc75b2c70c484a03c2515511e
+generated: 2017-11-14T11:12:37.260876101Z
diff --git a/incubator/chartmuseum/templates/NOTES.txt b/incubator/chartmuseum/templates/NOTES.txt
new file mode 100644
index 0000000000..44448bda98
--- /dev/null
+++ b/incubator/chartmuseum/templates/NOTES.txt
@@ -0,0 +1,3 @@
+Thank you for installing {{ .Chart.Name }}.
+
+Your release is named {{ .Release.Name }}.
diff --git a/incubator/chartmuseum/templates/deployment.yaml b/incubator/chartmuseum/templates/deployment.yaml
index d0feb6ea80..877e95fdcd 100644
--- a/incubator/chartmuseum/templates/deployment.yaml
+++ b/incubator/chartmuseum/templates/deployment.yaml
@@ -40,3 +40,14 @@ spec:
           name: storage-volume
         resources:
 {{ toYaml .Values.resources | indent 10 }}
+      volumes:
+{{- if .Values.persistence.volumes }}
+{{ toYaml .Values.persistence.volumes | indent 6 }}
+{{- end }}
+      - name: storage-volume
+      {{- if .Values.persistence.Enabled }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.persistence.ExistingClaim | default (include "common.fullname" .) }}
+      {{- else }}
+        emptyDir: {}
+      {{- end -}}
\ No newline at end of file
diff --git a/incubator/chartmuseum/templates/pvc.yaml b/incubator/chartmuseum/templates/pvc.yaml
new file mode 100644
index 0000000000..2bde06f13e
--- /dev/null
+++ b/incubator/chartmuseum/templates/pvc.yaml
@@ -0,0 +1,22 @@
+{{- if and .Values.persistence.Enabled (not .Values.persistence.ExistingClaim) -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ include "common.fullname" . }}
+  labels:
+    app: {{ include "common.fullname" . }}
+    release: {{ .Release.Name | quote }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.AccessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.Size | quote }}
+{{- if .Values.persistence.StorageClass }}
+{{- if (eq "-" .Values.persistence.StorageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.StorageClass }}"
+{{- end }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/chartmuseum/values.yaml b/incubator/chartmuseum/values.yaml
index dc883e81c9..4b97dc2558 100644
--- a/incubator/chartmuseum/values.yaml
+++ b/incubator/chartmuseum/values.yaml
@@ -1,7 +1,7 @@
 replicaCount: 1
 image:
   repository: chartmuseum/chartmuseum
-  tag: v0.1.0
+  tag: v0.2.6
   pullPolicy: IfNotPresent
 service:
   type: ClusterIP
@@ -14,3 +14,20 @@ resources:
   requests:
     cpu: 80m
     memory: 64Mi
+persistence:
+  Enabled: false
+  AccessMode: ReadWriteOnce
+  Size: 8Gi
+  ## A manually managed Persistent Volume and Claim
+  ## Requires Persistence.Enabled: true
+  ## If defined, PVC must be created manually before volume will be bound
+  # ExistingClaim:
+
+  ## jenkins data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  # StorageClass: "-"