From d1742d82bc64e19e9960e61c0d14c165fbed456a Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 10 Oct 2020 18:01:05 +0200 Subject: [PATCH] bump and piwigo --- _sys/kube-router-all-service-daemonset.yaml | 20 +++++++------------- apps/apt-cacher-ng/Dockerfile | 4 ++-- apps/apt-cacher-ng/live-deployment.yaml | 19 +++++++++++++++---- apps/docker-registry/docker-registry-ui.yaml | 7 ++----- apps/mariadb/mariadb-deployment.yaml | 7 +++---- apps/mosquitto/deployment.yaml | 2 +- apps/pihole-deployment.yaml | 13 ++++++------- cluster-monitoring | 2 +- external-storage | 2 +- grafana-storage.yaml | 14 -------------- ingress-nginx | 2 +- prometheus/additional-scrape-configs.yaml | 1 - 12 files changed, 39 insertions(+), 54 deletions(-) delete mode 100644 grafana-storage.yaml diff --git a/_sys/kube-router-all-service-daemonset.yaml b/_sys/kube-router-all-service-daemonset.yaml index 61357e2..a986cca 100644 --- a/_sys/kube-router-all-service-daemonset.yaml +++ b/_sys/kube-router-all-service-daemonset.yaml @@ -22,13 +22,6 @@ data: "ipam":{ "type":"host-local" } - }, - { - "type":"portmap", - "capabilities":{ - "snat":true, - "portMappings":true - } } ] } @@ -52,18 +45,19 @@ spec: priorityClassName: system-node-critical containers: - name: kube-router - image: docker.io/cloudnativelabs/kube-router:v1.0.1 + image: docker.io/cloudnativelabs/kube-router args: - "--run-router=true" - "--run-firewall=true" - - "--run-service-proxy=false" + - "--run-service-proxy=true" - "--bgp-graceful-restart=true" - "--hairpin-mode=true" - "--enable-cni=true" - - "--advertise-cluster-ip" - - "--advertise-external-ip" - - "--advertise-loadbalancer-ip" + - "--advertise-cluster-ip=true" + - "--advertise-external-ip=true" + - "--advertise-loadbalancer-ip=true" - "--kubeconfig=/var/lib/kube-router/kubeconfig" + #- "--master=https://192.168.10.13:6443" securityContext: privileged: true imagePullPolicy: Always @@ -94,7 +88,7 @@ spec: readOnly: false initContainers: - name: install-cni - image: docker.io/cloudnativelabs/kube-router:v1.0.1 + image: docker.io/cloudnativelabs/kube-router imagePullPolicy: Always command: - /bin/sh diff --git a/apps/apt-cacher-ng/Dockerfile b/apps/apt-cacher-ng/Dockerfile index 2c01afe..875a138 100644 --- a/apps/apt-cacher-ng/Dockerfile +++ b/apps/apt-cacher-ng/Dockerfile @@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y \ 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 -#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 /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 diff --git a/apps/apt-cacher-ng/live-deployment.yaml b/apps/apt-cacher-ng/live-deployment.yaml index 9553dfd..42305b5 100644 --- a/apps/apt-cacher-ng/live-deployment.yaml +++ b/apps/apt-cacher-ng/live-deployment.yaml @@ -38,16 +38,27 @@ metadata: labels: app: apt-cacher-ng spec: - type: LoadBalancer - loadBalancerIP: 172.23.255.1 ports: - name: apt-cacher-ng - port: 3142 + port: 3142 targetPort: 3142 protocol: TCP selector: 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 kind: PersistentVolumeClaim metadata: @@ -55,7 +66,7 @@ metadata: #annotations: # volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" spec: - storageClassName: csi-s3-slow + storageClassName: nfs-ssd accessModes: - ReadWriteOnce resources: diff --git a/apps/docker-registry/docker-registry-ui.yaml b/apps/docker-registry/docker-registry-ui.yaml index 819685a..2928a0d 100644 --- a/apps/docker-registry/docker-registry-ui.yaml +++ b/apps/docker-registry/docker-registry-ui.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: docker-registry-ui - namespace: docker-registry labels: app: registry-ui release: docker-registry-ui @@ -28,9 +27,9 @@ spec: - name: URL value: "http://docker-registry.lan" - name: REGISTRY_TITLE - value: "Docker registry UI" + value: "dReg" - name: DELETE_IMAGES - value: "false" + value: "true" - name: REGISTRY_URL value: "http://docker-registry-ui.lan" - name: PULL_URL @@ -53,7 +52,6 @@ spec: apiVersion: v1 kind: Service metadata: - namespace: docker-registry name: docker-registry-ui labels: app: registry-ui @@ -73,7 +71,6 @@ apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: docker-registry-ui - namespace: docker-registry spec: rules: - host: docker-registry-ui.lan diff --git a/apps/mariadb/mariadb-deployment.yaml b/apps/mariadb/mariadb-deployment.yaml index e4c3aa5..fb91000 100644 --- a/apps/mariadb/mariadb-deployment.yaml +++ b/apps/mariadb/mariadb-deployment.yaml @@ -57,11 +57,10 @@ 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-class: "nfs-ssd" spec: - storageClassName: csi-s3-slow + storageClassName: nfs-ssd accessModes: - ReadWriteOnce resources: diff --git a/apps/mosquitto/deployment.yaml b/apps/mosquitto/deployment.yaml index a92af3e..13a1997 100644 --- a/apps/mosquitto/deployment.yaml +++ b/apps/mosquitto/deployment.yaml @@ -126,7 +126,7 @@ spec: resources: requests: storage: 2Gi - storageClassName: csi-s3-slow + storageClassName: nfs-ssd volumeMode: Filesystem --- apiVersion: v1 diff --git a/apps/pihole-deployment.yaml b/apps/pihole-deployment.yaml index 0d9e40a..ba83655 100644 --- a/apps/pihole-deployment.yaml +++ b/apps/pihole-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: pihole-webpassword + name: pihole-password namespace: default type: Opaque data: @@ -46,7 +46,7 @@ spec: value: 208.67.222.222 - name: DNS2 value: 208.67.220.220 - image: pihole/pihole:latest + image: pihole/pihole:v5.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 10 @@ -145,10 +145,10 @@ kind: PersistentVolumeClaim metadata: name: pihole-data annotations: - volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" + volume.beta.kubernetes.io/storage-class: "nfs-ssd" spec: #storageClassName: csi-s3-slow - storageClassName: managed-nfs-storage + storageClassName: nfs-ssd accessModes: - ReadWriteOnce resources: @@ -161,7 +161,6 @@ data: address=/chaos/192.168.10.1 kind: ConfigMap metadata: - creationTimestamp: null name: pihole-custom-dnsmasq --- apiVersion: v1 @@ -177,7 +176,7 @@ metadata: namespace: default spec: type: LoadBalancer - loadBalancerIP: 172.23.255.254 + loadBalancerIP: 172.23.255.253 externalTrafficPolicy: Cluster ports: - name: http @@ -209,7 +208,7 @@ metadata: namespace: default spec: type: LoadBalancer - loadBalancerIP: 172.23.255.254 + loadBalancerIP: 172.23.255.253 externalTrafficPolicy: Cluster ports: - name: dns-udp diff --git a/cluster-monitoring b/cluster-monitoring index ad1d165..a513229 160000 --- a/cluster-monitoring +++ b/cluster-monitoring @@ -1 +1 @@ -Subproject commit ad1d165158447faf8354eb5cba4433c3963fe995 +Subproject commit a513229095aef6c5ea09c625eaece1448fd1903f diff --git a/external-storage b/external-storage index 5c38d73..ea9eda7 160000 --- a/external-storage +++ b/external-storage @@ -1 +1 @@ -Subproject commit 5c38d738d49dd6c7b1f1ad9de2583f56693bd18d +Subproject commit ea9eda70196dd6e1f9a3abc02fde5ceba497225c diff --git a/grafana-storage.yaml b/grafana-storage.yaml deleted file mode 100644 index 34ea7c2..0000000 --- a/grafana-storage.yaml +++ /dev/null @@ -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 diff --git a/ingress-nginx b/ingress-nginx index 928ea08..f7f3815 160000 --- a/ingress-nginx +++ b/ingress-nginx @@ -1 +1 @@ -Subproject commit 928ea085708d6acd866b241d0e8f0140d8231926 +Subproject commit f7f3815bc78e5e8f8db5d537174caf2444e6b65f diff --git a/prometheus/additional-scrape-configs.yaml b/prometheus/additional-scrape-configs.yaml index 181a6c4..71b9c15 100644 --- a/prometheus/additional-scrape-configs.yaml +++ b/prometheus/additional-scrape-configs.yaml @@ -5,4 +5,3 @@ kind: Secret metadata: creationTimestamp: null name: additional-scrape-configs - namespace: monitoring