When starting a Minikube cluster, the keepstores should be able to reuse

[arvados-k8s.git] / charts / arvados / templates / keep-store-deployment.yaml

diff --git a/charts/arvados/templates/keep-store-deployment.yaml b/charts/arvados/templates/keep-store-deployment.yaml
index c1224e4bfd2b5f564eef687c37ede85a688be9ca..b028bb81286834f88fa201fedce55310cdfa8b2f 100644 (file)
--- a/charts/arvados/templates/keep-store-deployment.yaml
+++ b/charts/arvados/templates/keep-store-deployment.yaml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: "arvados-keep-store"
@@ -13,6 +13,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: 2
+  podManagementPolicy: Parallel
   serviceName: arvados-keep-store
   selector:
     matchLabels:
@@ -24,6 +25,7 @@ spec:
         app: arvados-keep-store
         release: {{ .Release.Name }}
     spec:
+      terminationGracePeriodSeconds: 1
       containers:
         - name: arvados-keep-store
           image: "cure/arvados-runtime"
@@ -31,12 +33,28 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "mkdir /keepdata && /usr/local/bin/bootstrap.sh keepstore={{ .Values.arvados.versions.distribution.keepStore }} && GOGC=10 keepstore -enforce-permissions=true -blob-signing-key-file=/etc/keepstore/blob-signing.key -max-buffers=100 -serialize=true -never-delete=false -volume=/keepdata"
+            - "mkdir /keepdata; ls /keepdata && /usr/local/bin/bootstrap.sh keepstore={{ .Values.arvados.versions.distribution.keepStore }} && GOGC=10 keepstore"
           volumeMounts:
-            - name: keep-store-configmap
-              mountPath: /etc/keepstore/blob-signing.key
-              subPath: blob-signing.key
+            - name: etc-configmap
+              mountPath: /etc/arvados/config.yml
+              subPath: config.yml
+            {{- if .Values.keep.persistence.enabled }}
+            - name: keep-store-storage
+              mountPath: /keepdata
+            {{- end }}
       volumes:
-        - name: keep-store-configmap
+        - name: etc-configmap
           configMap:
-            name: arvados-keep-store-configmap
+            name: etc-configmap
+  {{- if .Values.keep.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: keep-store-storage
+      spec:
+        storageClassName: {{ .Values.keep.persistence.storageClass }}
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: {{ .Values.keep.persistence.size }}
+  {{- end }}