Memberships: Use external volume, remove one from the Helm chart.
Change-Id: Ie2afcd9ab28a12e7d6bea6375a96e00a0f63b525
diff --git a/charts/memberships/templates/install.yaml b/charts/memberships/templates/install.yaml
index 1d0034b..dee0f59 100644
--- a/charts/memberships/templates/install.yaml
+++ b/charts/memberships/templates/install.yaml
@@ -64,4 +64,4 @@
volumes:
- name: memberships
persistentVolumeClaim:
- claimName: memberships
+ claimName: {{ .Values.volumeClaimName }}
diff --git a/charts/memberships/templates/volume.yaml b/charts/memberships/templates/volume.yaml
deleted file mode 100644
index 48bbcb8..0000000
--- a/charts/memberships/templates/volume.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: memberships
- namespace: {{ .Release.Namespace }}
-spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: {{ .Values.storage.size }}
diff --git a/charts/memberships/values.yaml b/charts/memberships/values.yaml
index c4be0f8..7dab384 100644
--- a/charts/memberships/values.yaml
+++ b/charts/memberships/values.yaml
@@ -2,6 +2,5 @@
repository: giolekva/memberships
tag: latest
pullPolicy: Always
-storage:
- size: 1Gi
+volumeClaimName: "data"
portName: http
diff --git a/core/installer/values-tmpl/memberships.cue b/core/installer/values-tmpl/memberships.cue
index 5fc55d1..95a2b60 100644
--- a/core/installer/values-tmpl/memberships.cue
+++ b/core/installer/values-tmpl/memberships.cue
@@ -49,19 +49,19 @@
}
}
+ volumes: data: size: "1Gi"
+
helm: {
memberships: {
chart: charts.memberships
values: {
- storage: {
- size: "1Gi"
- }
image: {
repository: images.memberships.fullName
tag: images.memberships.tag
pullPolicy: images.memberships.pullPolicy
}
portName: _httpPortName
+ volumeClaimName: volumes.data.name
}
}
}