update schemas (#428)

* update schemas

* update controller-gen

Author: sgalsaleh

Makefile

@@ -89,14 +89,9 @@ schemas: fmt vet openapischema
 	go build ${LDFLAGS} -o bin/schemagen github.com/replicatedhq/troubleshoot/cmd/schemagen
 	./bin/schemagen --output-dir ./schemas
 
-.PHONY: contoller-gen
 controller-gen:
-ifeq (, $(shell which controller-gen))
-	go get sigs.k8s.io/controller-tools/cmd/[email protected]
-CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
-else
+	go get sigs.k8s.io/controller-tools/cmd/[email protected]
 CONTROLLER_GEN=$(shell which controller-gen)
-endif
 
 .PHONY: client-gen
 client-gen:

cmd/schemagen/cli/root.go

@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	extensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
 	"k8s.io/client-go/kubernetes/scheme"
 )
@@ -129,9 +129,18 @@ func generateSchemaFromCRD(crd []byte, outfile string) error {
 		return errors.Wrap(err, "failed to decode crd")
 	}
 
-	customResourceDefinition := obj.(*extensionsv1beta1.CustomResourceDefinition)
+	customResourceDefinition := obj.(*extensionsv1.CustomResourceDefinition)
 
-	b, err := json.MarshalIndent(customResourceDefinition.Spec.Validation.OpenAPIV3Schema, "", "  ")
+	if len(customResourceDefinition.Spec.Versions) == 0 {
+		return errors.New("no versions found for CRD")
+	}
+
+	crdSchema := customResourceDefinition.Spec.Versions[0].Schema
+	if crdSchema == nil {
+		return errors.New("CRD has a nil schema")
+	}
+
+	b, err := json.MarshalIndent(crdSchema.OpenAPIV3Schema, "", "  ")
 	if err != nil {
 		return errors.Wrap(err, "failed to marshal json")
 	}