allowing annotations on the storage api and formio definitions

bcgov · Jan 22, 2020 · 2e88a57 · 2e88a57
1 parent 874c54c
commit 2e88a57
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/microservices/formio/helm/formio/templates/dbPVC.yaml b/microservices/formio/helm/formio/templates/dbPVC.yaml
@@ -28,6 +28,9 @@ metadata:
       chart: {{ template "formio.chart" . }}
       release: {{ .Release.Name }}
       heritage: {{ .Release.Service }}
+  {{- with .Values.storageAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
 spec:
   accessModes:
     - ReadWriteOnce

diff --git a/microservices/formio/helm/formio/values.yaml b/microservices/formio/helm/formio/values.yaml
@@ -33,6 +33,8 @@ nodeConfig: '{\"mongo\": \"mongodb://forumApi:password@ocwa-formio-mongo.ocwa:27
 
 createDatabase: true
 storageClassName: default
+storageAnnotations:
+  - volume.beta.kubernetes.io/storage-provisioner: netapp.io/trident
 dbPod:
   persistence: /data/db
   adminEnv: MONGO_INITDB_ROOT_USERNAME

diff --git a/microservices/storageApi/helm/storage-api/templates/pvc.yaml b/microservices/storageApi/helm/storage-api/templates/pvc.yaml
@@ -2,6 +2,9 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ template "ocwaStorageApi.fullname" . }}-minio-pvc
+  {{- with .Values.storageAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
   labels:
       app: {{ template "ocwaStorageApi.name" . }}-minio
       chart: {{ template "ocwaStorageApi.chart" . }}

diff --git a/microservices/storageApi/helm/storage-api/values.yaml b/microservices/storageApi/helm/storage-api/values.yaml
@@ -51,6 +51,8 @@ ingress:
   tls: []
 
 storageClassName: default
+storageAnnotations:
+  - volume.beta.kubernetes.io/storage-provisioner: netapp.io/trident
 storageSize: 1Gi