Unverified Commit a36a5ea4 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

Merge branch '4.1.5' of...

Merge branch '4.1.5' of gitlab.switch.ch:memoriav/memobase-2020/services/cantaloupe-docker into 4.1.5
parents b1312f89 ffcbd205
Pipeline #17650 passed with stage
in 20 minutes and 2 seconds
......@@ -23,9 +23,16 @@ spec:
- containerPort: 8182
name: http
protocol: TCP
resources:
requests:
cpu: "0.5"
memory: "1Gi"
limits:
cpu: "2"
memory: "4Gi"
imagePullPolicy: Always
volumeMounts:
- name: image-volume
- name: media-volume
mountPath: /home/cantaloupe/images
env:
- name: CACHE_SERVER_DERIVATIVE_ENABLED
......@@ -33,9 +40,9 @@ spec:
- name: CACHE_SERVER_DERIVATIVE
value: 'RedisCache'
- name: REDISCACHE_HOST
value: 'redis'
value: 'redis-service'
restartPolicy: Always
volumes:
- name: image-volume
- name: media-volume
persistentVolumeClaim:
claimName: imageserver-volume-claim
claimName: media-volume-claim
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
namespace: memobase
name: imageserver-volume-claim
labels:
app: imageserver-app
spec:
accessModes:
- ReadWriteMany
resources:
requests:
storage: 10Gi
storageClassName: cephfs
volumeMode: Filesystem
......@@ -17,8 +17,15 @@ spec:
tier: web
spec:
containers:
- name: redis
- name: redis-container
image: redis:5-buster
resources:
requests:
cpu: "0.2"
memory: "2Gi"
limits:
cpu: "1.0"
memory: "8Gi"
imagePullPolicy: Always
ports:
- containerPort: 6379
......
......@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
namespace: memobase
name: redis
name: redis-service
labels:
app: redis-app
spec:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment