CRDs

replicatedhq · Jul 17, 2019 · 92862ff · 92862ff
1 parent 6fc6db0
commit 92862ff
Show file tree

Hide file tree

Showing 10 changed files with 183 additions and 13 deletions.
diff --git a/config/crds/troubleshoot.replicated.com_preflights.yaml b/config/crds/troubleshoot.replicated.com_preflights.yaml
@@ -433,6 +433,48 @@ spec:
                       required:
                       - outcomes
                       type: object
+                    customResourceDefinition:
+                      properties:
+                        checkName:
+                          type: string
+                        customResourceDefinitionName:
+                          type: string
+                        outcomes:
+                          items:
+                            properties:
+                              fail:
+                                properties:
+                                  message:
+                                    type: string
+                                  uri:
+                                    type: string
+                                  when:
+                                    type: string
+                                type: object
+                              pass:
+                                properties:
+                                  message:
+                                    type: string
+                                  uri:
+                                    type: string
+                                  when:
+                                    type: string
+                                type: object
+                              warn:
+                                properties:
+                                  message:
+                                    type: string
+                                  uri:
+                                    type: string
+                                  when:
+                                    type: string
+                                type: object
+                            type: object
+                          type: array
+                      required:
+                      - outcomes
+                      - customResourceDefinitionName
+                      type: object
                     storageClass:
                       properties:
                         checkName:

diff --git a/config/crds/zz_generated.deepcopy.go b/config/crds/zz_generated.deepcopy.go
@@ -21,6 +21,11 @@ func (in *Analyze) DeepCopyInto(out *Analyze) {
 		*out = new(StorageClass)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.CustomResourceDefinition != nil {
+		in, out := &in.CustomResourceDefinition, &out.CustomResourceDefinition
+		*out = new(CustomResourceDefinition)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Analyze.
@@ -512,6 +517,33 @@ func (in *CollectorStatus) DeepCopy() *CollectorStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CustomResourceDefinition) DeepCopyInto(out *CustomResourceDefinition) {
+	*out = *in
+	out.AnalyzeMeta = in.AnalyzeMeta
+	if in.Outcomes != nil {
+		in, out := &in.Outcomes, &out.Outcomes
+		*out = make([]*Outcome, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(Outcome)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CustomResourceDefinition.
+func (in *CustomResourceDefinition) DeepCopy() *CustomResourceDefinition {
+	if in == nil {
+		return nil
+	}
+	out := new(CustomResourceDefinition)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Outcome) DeepCopyInto(out *Outcome) {
 	*out = *in
@@ -807,8 +839,8 @@ func (in *SingleOutcome) DeepCopy() *SingleOutcome {
 func (in *StorageClass) DeepCopyInto(out *StorageClass) {
 	*out = *in
 	out.AnalyzeMeta = in.AnalyzeMeta
-	if in.Outcome != nil {
-		in, out := &in.Outcome, &out.Outcome
+	if in.Outcomes != nil {
+		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
 		for i := range *in {
 			if (*in)[i] != nil {

diff --git a/config/samples/troubleshoot_v1beta1_preflight.yaml b/config/samples/troubleshoot_v1beta1_preflight.yaml
@@ -47,9 +47,10 @@ spec:
     #       message: Can't pull the images
     #     pass:
     #       message: Connected to docker registry
-    # - customResourceDefinitions:
-    #     name: rook
-    #     fail:
-    #       message: You don't have rook installed
-    #     pass:
-    #       message: Found rook!
+    - customResourceDefinition:
+        customResourceDefinitionName: rook
+        outcomes:
+          - fail:
+              message: You don't have rook installed
+          - pass:
+              message: Found rook!
diff --git a/go.mod b/go.mod
@@ -23,6 +23,7 @@ require (
 	golang.org/x/net v0.0.0-20190522155817-f3200d17e092
 	gopkg.in/yaml.v2 v2.2.2
 	k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
+	k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
 	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
 	sigs.k8s.io/controller-runtime v0.2.0-beta.2

diff --git a/pkg/analyze/analyzer.go b/pkg/analyze/analyzer.go
@@ -23,6 +23,9 @@ func Analyze(analyzer *troubleshootv1beta1.Analyze, getCollectedFileContents fun
 	if analyzer.StorageClass != nil {
 		return analyzeStorageClass(analyzer.StorageClass, getCollectedFileContents)
 	}
+	if analyzer.CustomResourceDefinition != nil {
+		return analyzeCustomResourceDefinition(analyzer.CustomResourceDefinition, getCollectedFileContents)
+	}
 
 	return nil, errors.New("invalid analyzer")
 }
diff --git a/pkg/analyze/crd.go b/pkg/analyze/crd.go
@@ -0,0 +1,54 @@
+package analyzer
+
+import (
+	"encoding/json"
+	"fmt"
+
+	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+)
+
+func analyzeCustomResourceDefinition(analyzer *troubleshootv1beta1.CustomResourceDefinition, getCollectedFileContents func(string) ([]byte, error)) (*AnalyzeResult, error) {
+	crdData, err := getCollectedFileContents("cluster-resources/custom-resource-definitions.json")
+	if err != nil {
+		return nil, err
+	}
+
+	var crds []apiextensionsv1beta1.CustomResourceDefinition
+	if err := json.Unmarshal(crdData, &crds); err != nil {
+		return nil, err
+	}
+
+	title := analyzer.CheckName
+	if title == "" {
+		title = fmt.Sprintf("Custom resource definition %s", analyzer.CustomResourceDefinitionName)
+	}
+
+	result := AnalyzeResult{
+		Title: title,
+	}
+
+	for _, storageClass := range crds {
+		if storageClass.Name == analyzer.CustomResourceDefinitionName {
+			result.IsPass = true
+			for _, outcome := range analyzer.Outcomes {
+				if outcome.Pass != nil {
+					result.Message = outcome.Pass.Message
+					result.URI = outcome.Pass.URI
+				}
+			}
+
+			return &result, nil
+		}
+	}
+
+	result.IsFail = true
+	for _, outcome := range analyzer.Outcomes {
+		if outcome.Fail != nil {
+			result.Message = outcome.Fail.Message
+			result.URI = outcome.Fail.URI
+		}
+	}
+
+	return &result, nil
+}
diff --git a/pkg/analyze/storage_class.go b/pkg/analyze/storage_class.go
@@ -6,7 +6,6 @@ import (
 
 	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
 	storagev1beta1 "k8s.io/api/storage/v1beta1"
-	// "github.com/replicatedhq/troubleshoot/pkg/collect"
 )
 
 func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollectedFileContents func(string) ([]byte, error)) (*AnalyzeResult, error) {

diff --git a/pkg/apis/troubleshoot/v1beta1/analyzer_shared.go b/pkg/apis/troubleshoot/v1beta1/analyzer_shared.go
@@ -23,11 +23,18 @@ type StorageClass struct {
 	StorageClassName string     `json:"storageClassName" yaml:"storageClassName"`
 }
 
+type CustomResourceDefinition struct {
+	AnalyzeMeta                  `json:",inline" yaml:",inline"`
+	Outcomes                     []*Outcome `json:"outcomes" yaml:"outcomes"`
+	CustomResourceDefinitionName string     `json:"customResourceDefinitionName" yaml:"customResourceDefinitionName"`
+}
+
 type AnalyzeMeta struct {
 	CheckName string `json:"checkName,omitempty" yaml:"checkName,omitempty"`
 }
 
 type Analyze struct {
-	ClusterVersion *ClusterVersion `json:"clusterVersion,omitempty" yaml:"clusterVersion,omitempty"`
-	StorageClass   *StorageClass   `json:"storageClass,omitempty" yaml:"storageClass,omitempty"`
+	ClusterVersion           *ClusterVersion           `json:"clusterVersion,omitempty" yaml:"clusterVersion,omitempty"`
+	StorageClass             *StorageClass             `json:"storageClass,omitempty" yaml:"storageClass,omitempty"`
+	CustomResourceDefinition *CustomResourceDefinition `json:"customResourceDefinition,omitempty" yaml:"customResourceDefinition,omitempty"`
 }
diff --git a/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go
@@ -37,6 +37,11 @@ func (in *Analyze) DeepCopyInto(out *Analyze) {
 		*out = new(StorageClass)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.CustomResourceDefinition != nil {
+		in, out := &in.CustomResourceDefinition, &out.CustomResourceDefinition
+		*out = new(CustomResourceDefinition)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Analyze.
@@ -528,6 +533,33 @@ func (in *CollectorStatus) DeepCopy() *CollectorStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CustomResourceDefinition) DeepCopyInto(out *CustomResourceDefinition) {
+	*out = *in
+	out.AnalyzeMeta = in.AnalyzeMeta
+	if in.Outcomes != nil {
+		in, out := &in.Outcomes, &out.Outcomes
+		*out = make([]*Outcome, len(*in))
+		for i := range *in {
+			if (*in)[i] != nil {
+				in, out := &(*in)[i], &(*out)[i]
+				*out = new(Outcome)
+				(*in).DeepCopyInto(*out)
+			}
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CustomResourceDefinition.
+func (in *CustomResourceDefinition) DeepCopy() *CustomResourceDefinition {
+	if in == nil {
+		return nil
+	}
+	out := new(CustomResourceDefinition)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Outcome) DeepCopyInto(out *Outcome) {
 	*out = *in

diff --git a/pkg/collect/cluster_resources.go b/pkg/collect/cluster_resources.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apiextensionsv1beta1clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -82,7 +81,7 @@ func ClusterResources() error {
 	clusterResourcesOutput.StorageClasses = storageClasses
 
 	// crds
-	crdClient, err := apiextensionsv1beta1.NewForConfig(cfg)
+	crdClient, err := apiextensionsv1beta1clientset.NewForConfig(cfg)
 	if err != nil {
 		return err
 	}