more freakin refactoring

This commit is contained in:
2020-09-28 18:21:13 +02:00
parent bc48386a3a
commit 5bff7af3e2
14 changed files with 215 additions and 32 deletions

View File

@@ -122,11 +122,11 @@ kind: Ingress
metadata:
name: docker-registry
namespace: docker-registry
annotations:
nginx.ingress.kubernetes.io/proxyconnecttimeout: 30
nginx.ingress.kubernetes.io/proxyreadtimeout: 1800
nginx.ingress.kubernetes.io/proxysendtimeout: 1800
nginx.ingress.kubernetes.io/proxy-body-size: 0
#annotations:
# nginx.ingress.kubernetes.io/proxyconnecttimeout: 30
# nginx.ingress.kubernetes.io/proxyreadtimeout: 1800
# nginx.ingress.kubernetes.io/proxysendtimeout: 1800
# nginx.ingress.kubernetes.io/proxy-body-size: '5g'
spec:
rules:
- host: docker-registry.lan

View File

@@ -57,11 +57,11 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mariadb-pv-claim
annotations:
volume.beta.kubernetes.io/storage-provisioner: "nfs-storage"
volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
#annotations:
# volume.beta.kubernetes.io/storage-provisioner: "nfs-storage"
# volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
spec:
storageClassName: "fast"
storageClassName: csi-s3-slow
accessModes:
- ReadWriteOnce
resources:

View File

@@ -113,8 +113,8 @@ spec:
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
annotations:
volume.beta.kubernetes.io/storage-provisioner: nfs-storage
#annotations:
# volume.beta.kubernetes.io/storage-provisioner: nfs-storage
labels:
app: mosquitto
release: mqtt
@@ -126,7 +126,7 @@ spec:
resources:
requests:
storage: 2Gi
storageClassName: managed-nfs-storage
storageClassName: csi-s3-slow
volumeMode: Filesystem
---
apiVersion: v1
@@ -140,7 +140,8 @@ metadata:
data:
mosquitto.conf: |-
log_dest none
user root
port 1883
persistence false
persistence true
persistence_location /mosquitto/data/

View File

@@ -46,7 +46,7 @@ spec:
value: 208.67.222.222
- name: DNS2
value: 208.67.220.220
image: pihole/pihole:v5.1.1
image: pihole/pihole:latest
imagePullPolicy: Always
livenessProbe:
failureThreshold: 10
@@ -107,8 +107,8 @@ spec:
subPath: addn-hosts
dnsConfig:
nameservers:
- 127.0.0.1
- 192.168.10.1
- 208.67.222.222
- 208.67.220.220
dnsPolicy: None
restartPolicy: Always
schedulerName: default-scheduler
@@ -144,10 +144,11 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: pihole-data
#annotations:
# volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
annotations:
volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
spec:
storageClassName: csi-s3-slow
#storageClassName: csi-s3-slow
storageClassName: managed-nfs-storage
accessModes:
- ReadWriteOnce
resources: