formatting ze code and piwigo enhancements

This commit is contained in:
2020-10-11 22:49:56 +02:00
parent 75db50891f
commit f4cb827a5b
3 changed files with 63 additions and 56 deletions

View File

@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
labels:
app: distcc
release: buster
name: distcc
@@ -12,7 +12,7 @@ spec:
matchLabels:
app: distcc
strategy:
type: RollingUpdate
type: RollingUpdate
template:
metadata:
labels:
@@ -23,9 +23,9 @@ spec:
- name: distcc
image: docker-registry.lan/distcc:armhf
imagePullPolicy: Always
#env:
#- name: OPTIONS
# value: "--verbose"
#env:
#- name: OPTIONS
# value: "--verbose"
ports:
- containerPort: 3632
name: distcc-data
@@ -38,7 +38,7 @@ spec:
cpu: 1
memory: 128Mi
requests:
cpu: 1
cpu: 1
memory: 64Mi
dnsPolicy: ClusterFirst
restartPolicy: Always
@@ -48,13 +48,13 @@ spec:
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app
operator: In
values:
- distcc
topologyKey: "kubernetes.io/hostname"
- labelSelector:
matchExpressions:
- key: app
operator: In
values:
- distcc
topologyKey: kubernetes.io/hostname
---
apiVersion: v1
kind: Service
@@ -77,7 +77,4 @@ spec:
protocol: TCP
selector:
app: distcc
type: LoadBalancer
type: LoadBalancer

View File

@@ -1,39 +1,39 @@
apiVersion: v1
kind: Service
metadata:
name: mariadb
name: mariadb
spec:
ports:
- name: mysql
- name: mysql
port: 3306
- name: metrics
- name: metrics
port: 9104
selector:
app: mariadb
app: mariadb
type: LoadBalancer
loadBalancerIP: 172.23.255.4
---
apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
kind: Deployment
metadata:
name: mariadb
name: mariadb
spec:
selector:
matchLabels:
app: mariadb
app: mariadb
strategy:
type: Recreate
template:
metadata:
labels:
app: mariadb
app: mariadb
spec:
containers:
- image: docker-registry.lan/mariadb:arm64
- image: docker-registry.lan/mariadb:arm64
name: mariadb
imagePullPolicy: Always
env:
# Use secret in real usage
# Use secret in real usage
- name: MYSQL_ROOT_PASSWORD
value: 54MzzfHHTA9qJX64Pvdn
ports:
@@ -58,11 +58,11 @@ kind: PersistentVolumeClaim
metadata:
name: mariadb-pv-claim
annotations:
volume.beta.kubernetes.io/storage-class: "nfs-ssd"
volume.beta.kubernetes.io/storage-class: nfs-ssd
spec:
storageClassName: nfs-ssd
storageClassName: nfs-ssd
accessModes:
- ReadWriteOnce
- ReadWriteOnce
resources:
requests:
storage: 20Gi
storage: 20Gi

View File

@@ -2,24 +2,24 @@
apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
kind: Deployment
metadata:
name: piwigo
name: piwigo
spec:
selector:
matchLabels:
app: piwigo
app: piwigo
strategy:
type: Recreate
template:
metadata:
labels:
app: piwigo
app: piwigo
spec:
containers:
- image: linuxserver/piwigo
- image: linuxserver/piwigo
name: piwigo
imagePullPolicy: IfNotPresent
env:
# Use secret in real usage
# Use secret in real usage
- name: TZ
value: Europe/Berlin
livenessProbe:
@@ -53,58 +53,69 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: piwigo
name: piwigo
spec:
ports:
- name: http
- name: http
port: 80
- name: https
port: 443
selector:
app: piwigo
app: piwigo
---
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: piwigo
name: piwigo
spec:
rules:
- host: foto.lan
http:
paths:
- backend:
serviceName: piwigo
servicePort: http
rules:
- host: foto.lan
http:
paths:
- backend:
serviceName: piwigo
servicePort: http
---
apiVersion: batch/v1beta1
kind: CronJob
metadata:
name: piwigo-quicksync
spec:
schedule: '* */2 * * *'
schedule: '*/2 * * * *'
concurrencyPolicy: Forbid
jobTemplate:
spec:
template:
spec:
restartPolicy: OnFailure
containers:
- name: piwigo-quicksync
image: docker-registry.lan/piwigo-sync:arm64
imagePullPolicy: Always
args:
- /remote_sync.pl
- /remote_sync.pl
- --base_url=http://piwigo.default.svc.cluster.local/
- --username=api
- --password='{D8G~y:<tPq::/(Yt.'
restartPolicy: OnFailure
- --password=D8Gt4P36q3457Yt
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app
operator: In
values:
- piwigo
topologyKey: kubernetes.io/hostname
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: piwigo-pv-claim
spec:
storageClassName: nfs-ssd
storageClassName: nfs-ssd
accessModes:
- ReadWriteOnce
- ReadWriteOnce
resources:
requests:
storage: 60Gi
@@ -114,10 +125,9 @@ kind: PersistentVolumeClaim
metadata:
name: piwigo-config
spec:
storageClassName: nfs-ssd
storageClassName: nfs-ssd
accessModes:
- ReadWriteOnce
- ReadWriteOnce
resources:
requests:
storage: 2Gi
storage: 2Gi