Merge pull request #533 from replicatedhq/divolgin/gvk

Add GVK to k8s objects in cluster-resources files

Author: divolgin

pkg/analyze/cluster_pod_statuses.go

@@ -31,11 +31,11 @@ func clusterPodStatuses(analyzer *troubleshootv1beta2.ClusterPodStatuses, getChi
 			}
 		}
 		if include {
-			var nsPods []corev1.Pod
+			var nsPods corev1.PodList
 			if err := json.Unmarshal(fileContent, &nsPods); err != nil {
 				return nil, errors.Wrapf(err, "failed to unmarshal pods list for namespace %s", podsNs)
 			}
-			pods = append(pods, nsPods...)
+			pods = append(pods, nsPods.Items...)
 		}
 	}
 

pkg/analyze/container_runtime.go

@@ -16,13 +16,13 @@ func analyzeContainerRuntime(analyzer *troubleshootv1beta2.ContainerRuntime, get
 		return nil, errors.Wrap(err, "failed to get contents of nodes.json")
 	}
 
-	var nodes []corev1.Node
+	var nodes corev1.NodeList
 	if err := json.Unmarshal(collected, &nodes); err != nil {
 		return nil, errors.Wrap(err, "failed to unmarshal node list")
 	}
 
 	foundRuntimes := []string{}
-	for _, node := range nodes {
+	for _, node := range nodes.Items {
 		foundRuntimes = append(foundRuntimes, node.Status.NodeInfo.ContainerRuntimeVersion)
 	}
 

pkg/analyze/crd.go

@@ -14,7 +14,7 @@ func analyzeCustomResourceDefinition(analyzer *troubleshootv1beta2.CustomResourc
 		return nil, err
 	}
 
-	var crds []apiextensionsv1beta1.CustomResourceDefinition
+	var crds apiextensionsv1beta1.CustomResourceDefinitionList
 	if err := json.Unmarshal(crdData, &crds); err != nil {
 		return nil, err
 	}
@@ -30,7 +30,7 @@ func analyzeCustomResourceDefinition(analyzer *troubleshootv1beta2.CustomResourc
 		IconURI: "https://troubleshoot.sh/images/analyzer-icons/custom-resource-definition.svg?w=13&h=16",
 	}
 
-	for _, crd := range crds {
+	for _, crd := range crds.Items {
 		if crd.Name == analyzer.CustomResourceDefinitionName {
 			result.IsPass = true
 			for _, outcome := range analyzer.Outcomes {

pkg/analyze/deployment_status.go

@@ -26,13 +26,13 @@ func analyzeOneDeploymentStatus(analyzer *troubleshootv1beta2.DeploymentStatus,
 
 	var result *AnalyzeResult
 	for _, collected := range files { // only 1 file here
-		var deployments []appsv1.Deployment
+		var deployments appsv1.DeploymentList
 		if err := json.Unmarshal(collected, &deployments); err != nil {
 			return nil, errors.Wrap(err, "failed to unmarshal deployment list")
 		}
 
 		var status *appsv1.DeploymentStatus
-		for _, deployment := range deployments {
+		for _, deployment := range deployments.Items {
 			if deployment.Name == analyzer.Name {
 				status = deployment.Status.DeepCopy()
 			}
@@ -80,12 +80,12 @@ func analyzeAllDeploymentStatuses(analyzer *troubleshootv1beta2.DeploymentStatus
 		}
 
 		for _, collected := range files {
-			var deployments []appsv1.Deployment
+			var deployments appsv1.DeploymentList
 			if err := json.Unmarshal(collected, &deployments); err != nil {
 				return nil, errors.Wrap(err, "failed to unmarshal deployment list")
 			}
 
-			for _, deployment := range deployments {
+			for _, deployment := range deployments.Items {
 				if deployment.Status.Replicas == deployment.Status.AvailableReplicas {
 					continue
 				}

pkg/analyze/distribution.go

@@ -139,12 +139,12 @@ func analyzeDistribution(analyzer *troubleshootv1beta2.Distribution, getCollecte
 		return nil, errors.Wrap(err, "failed to get contents of nodes.json")
 	}
 
-	var nodes []corev1.Node
+	var nodes corev1.NodeList
 	if err := json.Unmarshal(collected, &nodes); err != nil {
 		return nil, errors.Wrap(err, "failed to unmarshal node list")
 	}
 
-	foundProviders, _ := ParseNodesForProviders(nodes)
+	foundProviders, _ := ParseNodesForProviders(nodes.Items)
 
 	apiResourcesBytes, err := getCollectedFileContents("cluster-resources/resources.json")
 	// if the file is not found, that is not a fatal error

pkg/analyze/files/deployments/default.json

@@ -1,4 +1,10 @@
-[
+{
+  "kind": "DeploymentList",
+  "apiVersion": "apps/v1",
+  "metadata": {
+    "resourceVersion": "27195652"
+  },
+  "items": [
     {
       "metadata": {
         "name": "coredns",
@@ -658,4 +664,4 @@
       }
     }
   ]
-  
+}

pkg/analyze/files/deployments/kube-system.json

@@ -1,4 +1,10 @@
-[
+{
+  "kind": "DeploymentList",
+  "apiVersion": "apps/v1",
+  "metadata": {
+    "resourceVersion": "27195653"
+  },
+  "items": [
     {
       "metadata": {
         "name": "grafana",
@@ -1640,5 +1646,5 @@
         ]
       }
     }
-  ]
-  
+  ] 
+}

pkg/analyze/files/deployments/monitoring.json

@@ -1,4 +1,10 @@
-[
+{
+  "kind": "JobList",
+  "apiVersion": "batch/v1",
+  "metadata": {
+    "resourceVersion": "27195661"
+  },
+  "items": [
     {
       "metadata": {
         "name": "contour-certgen-v1.19.1",
@@ -195,4 +201,4 @@
       }
     }
   ]
-  
+}