Merge pull request #1207 from mesosphere/hectorj2f/fix_enable_cmd_for_crds

fix: enable command for crd resources

Author: k8s-ci-robot

docs/userguide.md

@@ -111,11 +111,12 @@ See the [Cluster Registration documentation](./cluster-registration.md) for more
 You can enable federation of any Kubernetes API type (including CRDs) by using the
 `kubefedctl` command as follows.
 
-**NOTE:** Federation of a CRD requires that the CRD be installed on all member clusters.  If
-the CRD is not installed on a member cluster, propagation to that cluster will fail.
+**NOTE:** Federation of a CRD requires that the CRD Kubernetes type (`customresourcedefinitions`) to be enabled, to then 
+federate any custom CRD on the member clusters. If the CRD Kubernetes type is not enabled and its Federated equivalent CRD is not federated, the propagation to that cluster will fail.
 
 ```bash
-kubefedctl enable <target kubernetes API type>
+kubefedctl enable customresourcedefinitions
+kubefedctl federate crd <target kubernetes API type>  # <target kubernetes API type> = mytype.mygroup.mydomain.io
 ```
 
 The `<target kubernetes API type>` can be any of the following

pkg/kubefedctl/enable/schema.go

@@ -189,7 +189,8 @@ func (v *jsonSchemaVistor) VisitReference(r proto.Reference) {
 	// Short-circuit the recursive definition of JSONSchemaProps (used for CRD validation)
 	//
 	// TODO(marun) Implement proper support for recursive schema
-	if r.Reference() == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps" {
+	if r.Reference() == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps" ||
+		r.Reference() == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSONSchemaProps" {
 		v.collect(apiextv1b1.JSONSchemaProps{Type: "object"})
 		return
 	}