mirror of
https://gitlab.com/shouptech/flux.git
synced 2026-02-03 19:39:43 +00:00
Merge branch 'master' of gitlab.com:shouptech/flux
This commit is contained in:
commit
5214f1e3cc
2 changed files with 31 additions and 30 deletions
|
|
@ -17,7 +17,7 @@ spec:
|
|||
app: nextcloud
|
||||
spec:
|
||||
containers:
|
||||
- image: nextcloud:18.0.1-apache
|
||||
- image: nextcloud:18.0.3-apache
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: nextcloud
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
|
|
@ -14,33 +15,33 @@ spec:
|
|||
app: redis
|
||||
spec:
|
||||
containers:
|
||||
- image: redis:5.0.7-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: redis
|
||||
command:
|
||||
- redis-server
|
||||
args:
|
||||
- /usr/local/etc/redis/redis.conf
|
||||
livenessProbe:
|
||||
tcpSocket:
|
||||
port: 6379
|
||||
initialDelaySeconds: 15
|
||||
periodSeconds: 30
|
||||
timeoutSeconds: 5
|
||||
successThreshold: 1
|
||||
failureThreshold: 2
|
||||
resources:
|
||||
requests:
|
||||
memory: "32Mi"
|
||||
cpu: "100m"
|
||||
limits:
|
||||
memory: "256Mi"
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
volumeMounts:
|
||||
- name: redis-conf
|
||||
mountPath: /usr/local/etc/redis/
|
||||
volumes:
|
||||
- image: redis:5.0.8-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: redis
|
||||
command:
|
||||
- redis-server
|
||||
args:
|
||||
- /usr/local/etc/redis/redis.conf
|
||||
livenessProbe:
|
||||
tcpSocket:
|
||||
port: 6379
|
||||
initialDelaySeconds: 15
|
||||
periodSeconds: 30
|
||||
timeoutSeconds: 5
|
||||
successThreshold: 1
|
||||
failureThreshold: 2
|
||||
resources:
|
||||
requests:
|
||||
memory: "32Mi"
|
||||
cpu: "100m"
|
||||
limits:
|
||||
memory: "256Mi"
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
volumeMounts:
|
||||
- name: redis-conf
|
||||
configMap:
|
||||
name: redis
|
||||
mountPath: /usr/local/etc/redis/
|
||||
volumes:
|
||||
- name: redis-conf
|
||||
configMap:
|
||||
name: redis
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue