From 66ceb67ca285a2cca895e799df1bf2168caf09c4 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Thu, 15 Oct 2020 18:50:42 +0200
Subject: [PATCH] 2020-10-15

---
 apps/argo-install.yaml       |  5 +++
 apps/nodered-deployment.yaml |  6 +--
 apps/ntopng.yaml             | 81 ++++++++++++++++++++++++++++++++++++
 apps/piwigo/deployment.yaml  | 12 ++++++
 cluster-monitoring           |  2 +-
 5 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 apps/ntopng.yaml

diff --git a/apps/argo-install.yaml b/apps/argo-install.yaml
index a88b87c..f462a73 100644
--- a/apps/argo-install.yaml
+++ b/apps/argo-install.yaml
@@ -1,3 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: argo
+---
 # This is an auto-generated file. DO NOT EDIT
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
diff --git a/apps/nodered-deployment.yaml b/apps/nodered-deployment.yaml
index 1e39580..bfda3c9 100644
--- a/apps/nodered-deployment.yaml
+++ b/apps/nodered-deployment.yaml
@@ -35,7 +35,7 @@ kind: Service
 metadata:
   name: node-red
   labels:
-    app: node-red
+    app: node-redk8s
 spec:
   type: ClusterIP
   ports:
@@ -67,10 +67,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: node-red 
-  #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/ntopng.yaml b/apps/ntopng.yaml
new file mode 100644
index 0000000..95f36be
--- /dev/null
+++ b/apps/ntopng.yaml
@@ -0,0 +1,81 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ntopng
+  labels:
+    app: registry-ui
+    release: ntopng
+    app/version: "1.2.1"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: registry-ui
+      release: ntopng
+  template:
+    metadata:
+      labels:
+        app: registry-ui
+        release: ntopng
+    spec:
+      containers:
+        - name: registry-ui
+          image: "docker-registry.lan/ntopng:arm64"
+          imagePullPolicy: Always
+          env:
+            - name: URL
+              value: "http://docker-registry.lan"
+            - name: REGISTRY_TITLE
+              value: "dReg"
+            - name: DELETE_IMAGES
+              value: "true"
+            - name: REGISTRY_URL
+              value: "http://ntopng.lan"
+            - name: PULL_URL
+              value: "http://docker-registry.lan"
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ntopng
+  labels:
+    app: registry-ui
+    release: ntopng
+    app/version: "1.2.1"
+spec:
+  ports:
+    - port: 80
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+      app: registry-ui
+      release: ntopng
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+    name: ntopng
+spec:
+    rules:
+    - host: ntopng.lan
+      http:
+          paths:
+          - backend:
+              serviceName: ntopng
+              servicePort: http
+            path: / 
diff --git a/apps/piwigo/deployment.yaml b/apps/piwigo/deployment.yaml
index 57145b8..76031e2 100644
--- a/apps/piwigo/deployment.yaml
+++ b/apps/piwigo/deployment.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
 kind: Deployment
 metadata:
   name: piwigo
+  labels:
+    app: piwigo
 spec:
   selector:
     matchLabels:
@@ -54,6 +56,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: piwigo
+  labels:
+    app: piwigo
 spec:
   ports:
   - name: http
@@ -67,6 +71,8 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: piwigo
+  labels:
+    app: piwigo
 spec:
   rules:
   - host: foto.lan
@@ -80,6 +86,8 @@ apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: piwigo-quicksync
+  labels:
+    app: piwigo
 spec:
   schedule: '23 */1 * * *'
   concurrencyPolicy: Forbid
@@ -102,6 +110,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: piwigo-pv-claim
+  labels:
+    app: piwigo
 spec:
   storageClassName: nfs-ssd
   accessModes:
@@ -114,6 +124,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: piwigo-config
+  labels:
+    app: piwigo
 spec:
   storageClassName: nfs-ssd
   accessModes:
diff --git a/cluster-monitoring b/cluster-monitoring
index a513229..94678da 160000
--- a/cluster-monitoring
+++ b/cluster-monitoring
@@ -1 +1 @@
-Subproject commit a513229095aef6c5ea09c625eaece1448fd1903f
+Subproject commit 94678da245bcbbae489eb29ca020a20036a84faa