formatting ze code and piwigo enhancements
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: distcc
|
app: distcc
|
||||||
release: buster
|
release: buster
|
||||||
name: distcc
|
name: distcc
|
||||||
@@ -12,7 +12,7 @@ spec:
|
|||||||
matchLabels:
|
matchLabels:
|
||||||
app: distcc
|
app: distcc
|
||||||
strategy:
|
strategy:
|
||||||
type: RollingUpdate
|
type: RollingUpdate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -23,9 +23,9 @@ spec:
|
|||||||
- name: distcc
|
- name: distcc
|
||||||
image: docker-registry.lan/distcc:armhf
|
image: docker-registry.lan/distcc:armhf
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
#env:
|
#env:
|
||||||
#- name: OPTIONS
|
#- name: OPTIONS
|
||||||
# value: "--verbose"
|
# value: "--verbose"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 3632
|
- containerPort: 3632
|
||||||
name: distcc-data
|
name: distcc-data
|
||||||
@@ -38,7 +38,7 @@ spec:
|
|||||||
cpu: 1
|
cpu: 1
|
||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 1
|
cpu: 1
|
||||||
memory: 64Mi
|
memory: 64Mi
|
||||||
dnsPolicy: ClusterFirst
|
dnsPolicy: ClusterFirst
|
||||||
restartPolicy: Always
|
restartPolicy: Always
|
||||||
@@ -48,13 +48,13 @@ spec:
|
|||||||
affinity:
|
affinity:
|
||||||
podAntiAffinity:
|
podAntiAffinity:
|
||||||
requiredDuringSchedulingIgnoredDuringExecution:
|
requiredDuringSchedulingIgnoredDuringExecution:
|
||||||
- labelSelector:
|
- labelSelector:
|
||||||
matchExpressions:
|
matchExpressions:
|
||||||
- key: app
|
- key: app
|
||||||
operator: In
|
operator: In
|
||||||
values:
|
values:
|
||||||
- distcc
|
- distcc
|
||||||
topologyKey: "kubernetes.io/hostname"
|
topologyKey: kubernetes.io/hostname
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
@@ -77,7 +77,4 @@ spec:
|
|||||||
protocol: TCP
|
protocol: TCP
|
||||||
selector:
|
selector:
|
||||||
app: distcc
|
app: distcc
|
||||||
type: LoadBalancer
|
type: LoadBalancer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,39 +1,39 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: mariadb
|
name: mariadb
|
||||||
spec:
|
spec:
|
||||||
ports:
|
ports:
|
||||||
- name: mysql
|
- name: mysql
|
||||||
port: 3306
|
port: 3306
|
||||||
- name: metrics
|
- name: metrics
|
||||||
port: 9104
|
port: 9104
|
||||||
selector:
|
selector:
|
||||||
app: mariadb
|
app: mariadb
|
||||||
type: LoadBalancer
|
type: LoadBalancer
|
||||||
loadBalancerIP: 172.23.255.4
|
loadBalancerIP: 172.23.255.4
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
|
apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: mariadb
|
name: mariadb
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: mariadb
|
app: mariadb
|
||||||
strategy:
|
strategy:
|
||||||
type: Recreate
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: mariadb
|
app: mariadb
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: docker-registry.lan/mariadb:arm64
|
- image: docker-registry.lan/mariadb:arm64
|
||||||
name: mariadb
|
name: mariadb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
env:
|
env:
|
||||||
# Use secret in real usage
|
# Use secret in real usage
|
||||||
- name: MYSQL_ROOT_PASSWORD
|
- name: MYSQL_ROOT_PASSWORD
|
||||||
value: 54MzzfHHTA9qJX64Pvdn
|
value: 54MzzfHHTA9qJX64Pvdn
|
||||||
ports:
|
ports:
|
||||||
@@ -58,11 +58,11 @@ kind: PersistentVolumeClaim
|
|||||||
metadata:
|
metadata:
|
||||||
name: mariadb-pv-claim
|
name: mariadb-pv-claim
|
||||||
annotations:
|
annotations:
|
||||||
volume.beta.kubernetes.io/storage-class: "nfs-ssd"
|
volume.beta.kubernetes.io/storage-class: nfs-ssd
|
||||||
spec:
|
spec:
|
||||||
storageClassName: nfs-ssd
|
storageClassName: nfs-ssd
|
||||||
accessModes:
|
accessModes:
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 20Gi
|
storage: 20Gi
|
||||||
@@ -2,24 +2,24 @@
|
|||||||
apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
|
apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: piwigo
|
name: piwigo
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: piwigo
|
app: piwigo
|
||||||
strategy:
|
strategy:
|
||||||
type: Recreate
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: piwigo
|
app: piwigo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: linuxserver/piwigo
|
- image: linuxserver/piwigo
|
||||||
name: piwigo
|
name: piwigo
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
# Use secret in real usage
|
# Use secret in real usage
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: Europe/Berlin
|
value: Europe/Berlin
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
@@ -53,58 +53,69 @@ spec:
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: piwigo
|
name: piwigo
|
||||||
spec:
|
spec:
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
port: 80
|
port: 80
|
||||||
- name: https
|
- name: https
|
||||||
port: 443
|
port: 443
|
||||||
selector:
|
selector:
|
||||||
app: piwigo
|
app: piwigo
|
||||||
---
|
---
|
||||||
apiVersion: networking.k8s.io/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: piwigo
|
name: piwigo
|
||||||
spec:
|
spec:
|
||||||
rules:
|
rules:
|
||||||
- host: foto.lan
|
- host: foto.lan
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- backend:
|
- backend:
|
||||||
serviceName: piwigo
|
serviceName: piwigo
|
||||||
servicePort: http
|
servicePort: http
|
||||||
---
|
---
|
||||||
apiVersion: batch/v1beta1
|
apiVersion: batch/v1beta1
|
||||||
kind: CronJob
|
kind: CronJob
|
||||||
metadata:
|
metadata:
|
||||||
name: piwigo-quicksync
|
name: piwigo-quicksync
|
||||||
spec:
|
spec:
|
||||||
schedule: '* */2 * * *'
|
schedule: '*/2 * * * *'
|
||||||
|
concurrencyPolicy: Forbid
|
||||||
jobTemplate:
|
jobTemplate:
|
||||||
spec:
|
spec:
|
||||||
template:
|
template:
|
||||||
spec:
|
spec:
|
||||||
|
restartPolicy: OnFailure
|
||||||
containers:
|
containers:
|
||||||
- name: piwigo-quicksync
|
- name: piwigo-quicksync
|
||||||
image: docker-registry.lan/piwigo-sync:arm64
|
image: docker-registry.lan/piwigo-sync:arm64
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- /remote_sync.pl
|
- /remote_sync.pl
|
||||||
- --base_url=http://piwigo.default.svc.cluster.local/
|
- --base_url=http://piwigo.default.svc.cluster.local/
|
||||||
- --username=api
|
- --username=api
|
||||||
- --password='{D8G~y:<tPq::/(Yt.'
|
- --password=D8Gt4P36q3457Yt
|
||||||
restartPolicy: OnFailure
|
affinity:
|
||||||
|
podAntiAffinity:
|
||||||
|
requiredDuringSchedulingIgnoredDuringExecution:
|
||||||
|
- labelSelector:
|
||||||
|
matchExpressions:
|
||||||
|
- key: app
|
||||||
|
operator: In
|
||||||
|
values:
|
||||||
|
- piwigo
|
||||||
|
topologyKey: kubernetes.io/hostname
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
name: piwigo-pv-claim
|
name: piwigo-pv-claim
|
||||||
spec:
|
spec:
|
||||||
storageClassName: nfs-ssd
|
storageClassName: nfs-ssd
|
||||||
accessModes:
|
accessModes:
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 60Gi
|
storage: 60Gi
|
||||||
@@ -114,10 +125,9 @@ kind: PersistentVolumeClaim
|
|||||||
metadata:
|
metadata:
|
||||||
name: piwigo-config
|
name: piwigo-config
|
||||||
spec:
|
spec:
|
||||||
storageClassName: nfs-ssd
|
storageClassName: nfs-ssd
|
||||||
accessModes:
|
accessModes:
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 2Gi
|
storage: 2Gi
|
||||||
|
|
||||||
Reference in New Issue
Block a user