Merge pull request #1627 from hunchback/k8s-configmap-secret

k8s: add configmap and secret objects

Author: safchain

etc/skydive.yml.default

@@ -128,6 +128,7 @@ analyzer:
       # if list is empty then will resolve to all existing (sub) probes.
       probes:
         - cluster
+        - configmap
         - container
         - cronjob
         - deployment
@@ -142,6 +143,7 @@ analyzer:
         - pod
         - replicaset
         - replicationcontroller
+        - secret
         - service
         - statefulset
         - storageclass

statics/img/configmap.png

@@ -29,6 +29,7 @@ var nodeImgMap = setupFixedImages({
   "default": "intf",
   // k8s
   "cluster": "cluster",
+  "configmap": "configmap",
   "container": "container",
   "cronjob": "cronjob",
   "daemonset": "daemonset",
@@ -44,6 +45,7 @@ var nodeImgMap = setupFixedImages({
   "namespace": "ns",
   "replicaset": "replicaset",
   "replicationcontroller": "replicationcontroller",
+  "secret": "secret",
   "service": "service",
   "statefulset": "statefulset",
   "storageclass": "storageclass",

statics/img/secret.png

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: skydive-test-configmap
+  namespace: default
+data:
+  log_level: INFO

statics/js/components/layout.js

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: skydive-test-secret
+  namespace: default
+type: Opaque
+data:
+  # echo -n 'admin' | base64
+  # YWRtaW4=
+  username: YWRtaW4=
+  password: YWRtaW4=

tests/k8s/configmap.yaml

@@ -186,6 +186,10 @@ func TestK8sClusterNode(t *testing.T) {
 	testNodeCreation(t, nil, nil, k8s.Manager, "cluster", k8s.ClusterName)
 }
 
+func TestK8sConfigMapNode(t *testing.T) {
+	testNodeCreationFromConfig(t, k8s.Manager, "configmap", objName+"-configmap")
+}
+
 func TestK8sContainerNode(t *testing.T) {
 	testNodeCreationFromConfig(t, k8s.Manager, "container", objName+"-container", "Image", "Pod")
 }
@@ -246,6 +250,10 @@ func TestK8sReplicationControllerNode(t *testing.T) {
 	testNodeCreationFromConfig(t, k8s.Manager, "replicationcontroller", objName+"-replicationcontroller")
 }
 
+func TestK8sSecretNode(t *testing.T) {
+	testNodeCreationFromConfig(t, k8s.Manager, "secret", objName+"-secret", "Type")
+}
+
 func TestK8sServiceNode(t *testing.T) {
 	testNodeCreationFromConfig(t, k8s.Manager, "service", objName+"-service", "Ports", "ClusterIP", "ServiceType", "SessionAffinity", "LoadBalancerIP", "ExternalName")
 }

tests/k8s/secret.yaml

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2018 IBM, Inc.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package k8s
+
+import (
+	"fmt"
+
+	"github.com/skydive-project/skydive/graffiti/graph"
+
+	"k8s.io/api/core/v1"
+	"k8s.io/client-go/kubernetes"
+)
+
+type configMapHandler struct {
+}
+
+func (h *configMapHandler) Dump(obj interface{}) string {
+	cm := obj.(*v1.ConfigMap)
+	return fmt.Sprintf("configmap{Namespace: %s, Name: %s}", cm.Namespace, cm.Name)
+}
+
+func (h *configMapHandler) Map(obj interface{}) (graph.Identifier, graph.Metadata) {
+	cm := obj.(*v1.ConfigMap)
+	m := NewMetadataFields(&cm.ObjectMeta)
+	return graph.Identifier(cm.GetUID()), NewMetadata(Manager, "configmap", m, cm, cm.Name)
+}
+
+func newConfigMapProbe(client interface{}, g *graph.Graph) Subprobe {
+	return NewResourceCache(client.(*kubernetes.Clientset).CoreV1().RESTClient(), &v1.ConfigMap{}, "configmaps", g, &configMapHandler{})
+}

tests/k8s_test.go

@@ -62,6 +62,7 @@ func NewK8sProbe(g *graph.Graph) (*Probe, error) {
 
 	subprobeHandlers := map[string]SubprobeHandler{
 		"cluster":               newClusterProbe,
+		"configmap":             newConfigMapProbe,
 		"container":             newContainerProbe,
 		"cronjob":               newCronJobProbe,
 		"daemonset":             newDaemonSetProbe,
@@ -77,6 +78,7 @@ func NewK8sProbe(g *graph.Graph) (*Probe, error) {
 		"pod":                   newPodProbe,
 		"replicaset":            newReplicaSetProbe,
 		"replicationcontroller": newReplicationControllerProbe,
+		"secret":                newSecretProbe,
 		"service":               newServiceProbe,
 		"statefulset":           newStatefulSetProbe,
 		"storageclass":          newStorageClassProbe,
@@ -111,6 +113,7 @@ func NewK8sProbe(g *graph.Graph) (*Probe, error) {
 	)
 
 	probe.AppendNamespaceLinkers(
+		"configmap",
 		"cronjob",
 		"deployment",
 		"daemonset",
@@ -121,6 +124,7 @@ func NewK8sProbe(g *graph.Graph) (*Probe, error) {
 		"pod",
 		"replicaset",
 		"replicationcontroller",
+		"secret",
 		"service",
 		"statefulset",
 	)

topology/probes/k8s/configmap.go

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 IBM, Inc.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package k8s
+
+import (
+	"fmt"
+
+	"github.com/skydive-project/skydive/graffiti/graph"
+
+	"k8s.io/api/core/v1"
+	"k8s.io/client-go/kubernetes"
+)
+
+type secretHandler struct {
+}
+
+func (h *secretHandler) Dump(obj interface{}) string {
+	secret := obj.(*v1.Secret)
+	return fmt.Sprintf("secret{Namespace: %s, Name: %s}", secret.Namespace, secret.Name)
+}
+
+func (h *secretHandler) Map(obj interface{}) (graph.Identifier, graph.Metadata) {
+	secret := obj.(*v1.Secret)
+	m := NewMetadataFields(&secret.ObjectMeta)
+	m.SetField("Type", secret.Type)
+	return graph.Identifier(secret.GetUID()), NewMetadata(Manager, "secret", m, secret, secret.Name)
+}
+
+func newSecretProbe(client interface{}, g *graph.Graph) Subprobe {
+	return NewResourceCache(client.(*kubernetes.Clientset).CoreV1().RESTClient(), &v1.Secret{}, "secrets", g, &secretHandler{})
+}