bump and piwigo

This commit is contained in:
2020-10-10 18:01:05 +02:00
parent 57063b0ec1
commit d1742d82bc
12 changed files with 39 additions and 54 deletions

View File

@@ -22,13 +22,6 @@ data:
"ipam":{ "ipam":{
"type":"host-local" "type":"host-local"
} }
},
{
"type":"portmap",
"capabilities":{
"snat":true,
"portMappings":true
}
} }
] ]
} }
@@ -52,18 +45,19 @@ spec:
priorityClassName: system-node-critical priorityClassName: system-node-critical
containers: containers:
- name: kube-router - name: kube-router
image: docker.io/cloudnativelabs/kube-router:v1.0.1 image: docker.io/cloudnativelabs/kube-router
args: args:
- "--run-router=true" - "--run-router=true"
- "--run-firewall=true" - "--run-firewall=true"
- "--run-service-proxy=false" - "--run-service-proxy=true"
- "--bgp-graceful-restart=true" - "--bgp-graceful-restart=true"
- "--hairpin-mode=true" - "--hairpin-mode=true"
- "--enable-cni=true" - "--enable-cni=true"
- "--advertise-cluster-ip" - "--advertise-cluster-ip=true"
- "--advertise-external-ip" - "--advertise-external-ip=true"
- "--advertise-loadbalancer-ip" - "--advertise-loadbalancer-ip=true"
- "--kubeconfig=/var/lib/kube-router/kubeconfig" - "--kubeconfig=/var/lib/kube-router/kubeconfig"
#- "--master=https://192.168.10.13:6443"
securityContext: securityContext:
privileged: true privileged: true
imagePullPolicy: Always imagePullPolicy: Always
@@ -94,7 +88,7 @@ spec:
readOnly: false readOnly: false
initContainers: initContainers:
- name: install-cni - name: install-cni
image: docker.io/cloudnativelabs/kube-router:v1.0.1 image: docker.io/cloudnativelabs/kube-router
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- /bin/sh - /bin/sh

View File

@@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y \
RUN echo 'PassThroughPattern: .*' >> /etc/apt-cacher-ng/acng.conf RUN echo 'PassThroughPattern: .*' >> /etc/apt-cacher-ng/acng.conf
#CMD chown apt-cacher-ng:apt-cacher-ng /var/cache/apt-cacher-ng CMD chown apt-cacher-ng:apt-cacher-ng /var/cache/apt-cacher-ng
EXPOSE 3142 EXPOSE 3142
#USER apt-cacher-ng USER apt-cacher-ng
#CMD chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/* #CMD chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*
CMD /usr/sbin/apt-cacher-ng -c /etc/apt-cacher-ng pidfile=/var/run/apt-cacher-ng/pid SocketPath=/var/run/apt-cacher-ng/socket foreground=1 CMD /usr/sbin/apt-cacher-ng -c /etc/apt-cacher-ng pidfile=/var/run/apt-cacher-ng/pid SocketPath=/var/run/apt-cacher-ng/socket foreground=1

View File

@@ -38,16 +38,27 @@ metadata:
labels: labels:
app: apt-cacher-ng app: apt-cacher-ng
spec: spec:
type: LoadBalancer
loadBalancerIP: 172.23.255.1
ports: ports:
- name: apt-cacher-ng - name: apt-cacher-ng
port: 3142 port: 3142
targetPort: 3142 targetPort: 3142
protocol: TCP protocol: TCP
selector: selector:
app: apt-cacher-ng app: apt-cacher-ng
--- ---
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: apt-cacher-ng
spec:
rules:
- host: apt-cache.lan
http:
paths:
- backend:
serviceName: apt-cacher-ng
servicePort: 3142
---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
@@ -55,7 +66,7 @@ metadata:
#annotations: #annotations:
# volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" # volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
spec: spec:
storageClassName: csi-s3-slow storageClassName: nfs-ssd
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources:

View File

@@ -3,7 +3,6 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: docker-registry-ui name: docker-registry-ui
namespace: docker-registry
labels: labels:
app: registry-ui app: registry-ui
release: docker-registry-ui release: docker-registry-ui
@@ -28,9 +27,9 @@ spec:
- name: URL - name: URL
value: "http://docker-registry.lan" value: "http://docker-registry.lan"
- name: REGISTRY_TITLE - name: REGISTRY_TITLE
value: "Docker registry UI" value: "dReg"
- name: DELETE_IMAGES - name: DELETE_IMAGES
value: "false" value: "true"
- name: REGISTRY_URL - name: REGISTRY_URL
value: "http://docker-registry-ui.lan" value: "http://docker-registry-ui.lan"
- name: PULL_URL - name: PULL_URL
@@ -53,7 +52,6 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
namespace: docker-registry
name: docker-registry-ui name: docker-registry-ui
labels: labels:
app: registry-ui app: registry-ui
@@ -73,7 +71,6 @@ apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: docker-registry-ui name: docker-registry-ui
namespace: docker-registry
spec: spec:
rules: rules:
- host: docker-registry-ui.lan - host: docker-registry-ui.lan

View File

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

View File

@@ -126,7 +126,7 @@ spec:
resources: resources:
requests: requests:
storage: 2Gi storage: 2Gi
storageClassName: csi-s3-slow storageClassName: nfs-ssd
volumeMode: Filesystem volumeMode: Filesystem
--- ---
apiVersion: v1 apiVersion: v1

View File

@@ -2,7 +2,7 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: pihole-webpassword name: pihole-password
namespace: default namespace: default
type: Opaque type: Opaque
data: data:
@@ -46,7 +46,7 @@ spec:
value: 208.67.222.222 value: 208.67.222.222
- name: DNS2 - name: DNS2
value: 208.67.220.220 value: 208.67.220.220
image: pihole/pihole:latest image: pihole/pihole:v5.1.2
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
failureThreshold: 10 failureThreshold: 10
@@ -145,10 +145,10 @@ kind: PersistentVolumeClaim
metadata: metadata:
name: pihole-data name: pihole-data
annotations: annotations:
volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" volume.beta.kubernetes.io/storage-class: "nfs-ssd"
spec: spec:
#storageClassName: csi-s3-slow #storageClassName: csi-s3-slow
storageClassName: managed-nfs-storage storageClassName: nfs-ssd
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
@@ -161,7 +161,6 @@ data:
address=/chaos/192.168.10.1 address=/chaos/192.168.10.1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: null
name: pihole-custom-dnsmasq name: pihole-custom-dnsmasq
--- ---
apiVersion: v1 apiVersion: v1
@@ -177,7 +176,7 @@ metadata:
namespace: default namespace: default
spec: spec:
type: LoadBalancer type: LoadBalancer
loadBalancerIP: 172.23.255.254 loadBalancerIP: 172.23.255.253
externalTrafficPolicy: Cluster externalTrafficPolicy: Cluster
ports: ports:
- name: http - name: http
@@ -209,7 +208,7 @@ metadata:
namespace: default namespace: default
spec: spec:
type: LoadBalancer type: LoadBalancer
loadBalancerIP: 172.23.255.254 loadBalancerIP: 172.23.255.253
externalTrafficPolicy: Cluster externalTrafficPolicy: Cluster
ports: ports:
- name: dns-udp - name: dns-udp

View File

@@ -1,14 +0,0 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: grafana-storage
namespace: monitoring
annotations:
volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
spec:
storageClassName: fast
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 2Gi

View File

@@ -5,4 +5,3 @@ kind: Secret
metadata: metadata:
creationTimestamp: null creationTimestamp: null
name: additional-scrape-configs name: additional-scrape-configs
namespace: monitoring