diff --git a/probe/probe.go b/probe/probe.go index 6653525f..a89e049c 100644 --- a/probe/probe.go +++ b/probe/probe.go @@ -7,7 +7,6 @@ package probe import ( "bytes" "context" - "encoding/json" "fmt" "io" "log" @@ -84,43 +83,43 @@ func PrintProbeResult(c *k8s.Client, o Options) error { } return nil } - isRunning, daemonsetStatus := isKubeArmorRunning(c, o) - if isRunning { - deploymentData := getKubeArmorDeployments(c, o) - containerData := getKubeArmorContainers(c, o) - probeData, nodeData, err := ProbeRunningKubeArmorNodes(c, o) - if err != nil { - log.Println("error occured when probing kubearmor nodes", err) - } - postureData := getPostureData(probeData) - armoredPodData, podData, err := getAnnotatedPods(c, o, postureData) - if err != nil { - log.Println("error occured when getting annotated pods", err) - } - if o.Output == "json" { - ProbeData := map[string]interface{}{"Probe Data": map[string]interface{}{ - "DaemonsetStatus": daemonsetStatus, - "Deployments": deploymentData, - "Containers": containerData, - "Nodes": nodeData, - "ArmoredPods": armoredPodData, - }, - } - out, err := json.Marshal(ProbeData) - if err != nil { - return err - } - fmt.Println(string(out)) - } else { - printDaemonsetData(daemonsetStatus) - printKubearmorDeployments(deploymentData) - printKubeArmorContainers(containerData) - printKubeArmorprobe(probeData) - printAnnotatedPods(podData) - } - - return nil - } + // isRunning, daemonsetStatus := isKubeArmorRunning(c, o) + // if isRunning { + // deploymentData := getKubeArmorDeployments(c, o) + // containerData := getKubeArmorContainers(c, o) + // probeData, nodeData, err := ProbeRunningKubeArmorNodes(c, o) + // if err != nil { + // log.Println("error occured when probing kubearmor nodes", err) + // } + // postureData := getPostureData(probeData) + // armoredPodData, podData, err := getAnnotatedPods(c, o, postureData) + // if err != nil { + // log.Println("error occured when getting annotated pods", err) + // } + // if o.Output == "json" { + // ProbeData := map[string]interface{}{"Probe Data": map[string]interface{}{ + // "DaemonsetStatus": daemonsetStatus, + // "Deployments": deploymentData, + // "Containers": containerData, + // "Nodes": nodeData, + // "ArmoredPods": armoredPodData, + // }, + // } + // out, err := json.Marshal(ProbeData) + // if err != nil { + // return err + // } + // fmt.Println(string(out)) + // } else { + // printDaemonsetData(daemonsetStatus) + // printKubearmorDeployments(deploymentData) + // printKubeArmorContainers(containerData) + // printKubeArmorprobe(probeData) + // printAnnotatedPods(podData) + // } + + // return nil + // } /*** if kubearmor is not running: ***/ @@ -369,33 +368,33 @@ func probeNode(c *k8s.Client, o Options) { } } -func isKubeArmorRunning(c *k8s.Client, o Options) (bool, *Status) { - isRunning, DaemonsetStatus := getKubeArmorDaemonset(c, o) - return isRunning, DaemonsetStatus - -} - -func getKubeArmorDaemonset(c *k8s.Client, o Options) (bool, *Status) { - - // KubeArmor DaemonSet - w, err := c.K8sClientset.AppsV1().DaemonSets(o.Namespace).Get(context.Background(), "kubearmor", metav1.GetOptions{}) - if err != nil { - log.Println("error when getting kubearmor daemonset", err) - return false, nil - } - desired, ready, available := w.Status.DesiredNumberScheduled, w.Status.NumberReady, w.Status.NumberAvailable - if desired != ready && desired != available { - return false, nil - } - - DaemonSetStatus := Status{ - Desired: strconv.Itoa(int(desired)), - Ready: strconv.Itoa(int(ready)), - Available: strconv.Itoa(int(available)), - } - return true, &DaemonSetStatus - -} +// func isKubeArmorRunning(c *k8s.Client, o Options) (bool, *Status) { +// isRunning, DaemonsetStatus := getKubeArmorDaemonset(c, o) +// return isRunning, DaemonsetStatus + +// } + +// func getKubeArmorDaemonset(c *k8s.Client, o Options) (bool, *Status) { + +// // KubeArmor DaemonSet +// w, err := c.K8sClientset.AppsV1().DaemonSets(o.Namespace).Get(context.Background(), "kubearmor", metav1.GetOptions{}) +// if err != nil { +// log.Println("error when getting kubearmor daemonset", err) +// return false, nil +// } +// desired, ready, available := w.Status.DesiredNumberScheduled, w.Status.NumberReady, w.Status.NumberAvailable +// if desired != ready && desired != available { +// return false, nil +// } + +// DaemonSetStatus := Status{ +// Desired: strconv.Itoa(int(desired)), +// Ready: strconv.Itoa(int(ready)), +// Available: strconv.Itoa(int(available)), +// } +// return true, &DaemonSetStatus + +// } func getKubeArmorDeployments(c *k8s.Client, o Options) map[string]*Status { kubearmorDeployments, err := c.K8sClientset.AppsV1().Deployments(o.Namespace).List(context.Background(), metav1.ListOptions{