k8s: add storage links and add test scenario

Author: hunchback

statics/img/persistentvolume.png

@@ -629,8 +629,8 @@ var TopologyComponent = {
         self.addFilterK8sTypes(filter, "service", ["cluster", "container", "endpoints", "ingress", "namespace", "networkpolicy", "pod", "service"]);
         self.addFilterK8sTypes(highlight, "service", ["endpoints", "ingress", "service"]);
 
-        self.addFilterK8sTypes(filter, "storage", ["cluster", "namespace", "persistentvolume", "persistentvolumeclaim", "storageclass"]);
-        self.addFilterK8sTypes(highlight, "storage", ["persistentvolume", "persistentvolumeclaim", "storageclass"]);
+        self.addFilterK8sTypes(filter, "storage", ["cluster", "container", "namespace", "persistentvolume", "persistentvolumeclaim", "pod", "storageclass"]);
+        self.addFilterK8sTypes(highlight, "storage", ["container", "persistentvolume", "persistentvolumeclaim", "pod", "storageclass"]);
       }
 
       var default_filter = app.getConfigValue('topology.default_filter');

statics/img/persistentvolumeclaim.png

@@ -0,0 +1,11 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: task-pv-claim
+spec:
+  storageClassName: standard
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 3Gi

statics/img/storageclass.png

@@ -0,0 +1,20 @@
+kind: Pod
+apiVersion: v1
+metadata:
+  name: task-pv-pod
+spec:
+  volumes:
+    - name: task-pv-storage
+      persistentVolumeClaim:
+       claimName: task-pv-claim
+  containers:
+    - name: task-pv-container
+      image: nginx
+      ports:
+        - containerPort: 80
+          name: "http-server"
+      volumeMounts:
+        - mountPath: "/usr/share/nginx/html"
+          name: task-pv-storage
+
+

statics/js/components/topology.js

@@ -0,0 +1,14 @@
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+  name: task-pv-volume
+  labels:
+    type: local
+spec:
+  storageClassName: standard
+  capacity:
+    storage: 10Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/mnt/skydive-test-storage"

tests/k8s/pv-claim.yaml

@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# this is driver to running the scenario found here:
+# https://kubernetes.io/docs/tasks/configure-pod-container/configure-persistent-volume-storage/
+
+SRC=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+: ${NAMESPACE:=default}
+echo "export NAMESPACE=$NAMESPACE"
+
+DATA=/mnt/skydive-test-storage
+
+setup() {
+	sudo mkdir -p $DATA
+	sudo chmod 777 $DATA
+	echo 'Hello from kubernetes storage' > $DATA/index.html
+}
+
+cleanup() {
+	sudo rm -rf $DATA
+}
+
+create() {
+	for file in "$@"; do
+		kubectl apply -n $NAMESPACE -f $file
+		shift
+	done
+}
+
+delete() {
+	for file in "$@"; do
+		kubectl delete --grace-period=0 --force -n $NAMESPACE -f $file
+		shift
+	done
+}
+
+stop() {
+	delete $SRC/pv-pod.yaml
+	delete $SRC/pv-claim.yaml
+	delete $SRC/pv-volume.yaml
+	kubectl delete namespace $NAMESPACE
+	cleanup
+}
+
+start() {
+	setup
+	kubectl create namespace $NAMESPACE
+	create $SRC/pv-volume.yaml
+	create $SRC/pv-claim.yaml
+	create $SRC/pv-pod.yaml
+}
+
+case "$1" in
+	stop)
+		stop
+		;;
+	start)
+		start
+		;;
+	*)
+		echo "$0 [stop|start|help]"
+		exit 1
+		;;
+esac
+exit 0

tests/k8s/pv-pod.yaml

@@ -555,3 +555,61 @@ func TestK8sServicePodScenario(t *testing.T) {
 		},
 	)
 }
+
+func TestStorageScenario(t *testing.T) {
+	storage := "./k8s/storage.sh"
+	testRunner(
+		t,
+		[]Cmd{
+			{storage + " start", true},
+		},
+		[]Cmd{
+			{storage + " stop", false},
+		},
+		[]CheckFunction{
+			func(c *CheckContext) error {
+				// check nodes exist
+				sc, err := checkNodeCreation(t, c, k8s.Manager, "storageclass", "standard")
+				if err != nil {
+					return err
+				}
+
+				pv, err := checkNodeCreation(t, c, k8s.Manager, "persistentvolume", "task-pv-volume")
+				if err != nil {
+					return err
+				}
+
+				pvc, err := checkNodeCreation(t, c, k8s.Manager, "persistentvolumeclaim", "task-pv-claim")
+				if err != nil {
+					return err
+				}
+
+				pod, err := checkNodeCreation(t, c, k8s.Manager, "pod", "task-pv-pod")
+				if err != nil {
+					return err
+				}
+
+				// check edges exist
+				if err = checkEdge(t, c, sc, pv, "storageclass"); err != nil {
+					return err
+				}
+
+				// FIXME: works when stepping with debugger
+				// if err = checkEdge(t, c, sc, pvc, "storageclass"); err != nil {
+				// 	return err
+				// }
+
+				if err = checkEdge(t, c, pod, pvc, "pod"); err != nil {
+					return err
+				}
+
+				// FIXME: works when stepping with debugger
+				// if err = checkEdge(t, c, pvc, pv, "persistentvolumeclaim"); err != nil {
+				// 	return err
+				// }
+
+				return nil
+			},
+		},
+	)
+}

tests/k8s/pv-volume.yaml

@@ -96,6 +96,10 @@ func NewK8sProbe(g *graph.Graph) (*Probe, error) {
 		newServiceEndpointsLinker,
 		newServicePodLinker,
 		newStatefulSetPodLinker,
+		newPodPVCLinker,
+		newPVPVCLinker,
+		newStorageClassPVCLinker,
+		newStorageClassPVLinker,
 	}
 
 	linkers := InitLinkers(linkerHandlers, g)
@@ -106,7 +110,6 @@ func NewK8sProbe(g *graph.Graph) (*Probe, error) {
 		"namespace",
 		"node",
 		"persistentvolume",
-		"persistentvolumeclaim",
 		"storageclass",
 	)
 
@@ -119,6 +122,7 @@ func NewK8sProbe(g *graph.Graph) (*Probe, error) {
 		"job",
 		"networkpolicy",
 		"pod",
+		"persistentvolumeclaim",
 		"replicaset",
 		"replicationcontroller",
 		"service",