mirror of
https://gitlab.com/shouptech/flux.git
synced 2026-02-03 20:59:42 +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
|
app: nextcloud
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: nextcloud:18.0.1-apache
|
- image: nextcloud:18.0.3-apache
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
name: nextcloud
|
name: nextcloud
|
||||||
env:
|
env:
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
|
@ -14,33 +15,33 @@ spec:
|
||||||
app: redis
|
app: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: redis:5.0.7-alpine
|
- image: redis:5.0.8-alpine
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
name: redis
|
name: redis
|
||||||
command:
|
command:
|
||||||
- redis-server
|
- redis-server
|
||||||
args:
|
args:
|
||||||
- /usr/local/etc/redis/redis.conf
|
- /usr/local/etc/redis/redis.conf
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
tcpSocket:
|
tcpSocket:
|
||||||
port: 6379
|
port: 6379
|
||||||
initialDelaySeconds: 15
|
initialDelaySeconds: 15
|
||||||
periodSeconds: 30
|
periodSeconds: 30
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
failureThreshold: 2
|
failureThreshold: 2
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "32Mi"
|
memory: "32Mi"
|
||||||
cpu: "100m"
|
cpu: "100m"
|
||||||
limits:
|
limits:
|
||||||
memory: "256Mi"
|
memory: "256Mi"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 6379
|
- containerPort: 6379
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: redis-conf
|
|
||||||
mountPath: /usr/local/etc/redis/
|
|
||||||
volumes:
|
|
||||||
- name: redis-conf
|
- name: redis-conf
|
||||||
configMap:
|
mountPath: /usr/local/etc/redis/
|
||||||
name: redis
|
volumes:
|
||||||
|
- name: redis-conf
|
||||||
|
configMap:
|
||||||
|
name: redis
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue