UPSTREAM: <carry>: SQUASH: print CRD on missing apis.kcp.dev/identity

sttts · stevekuznetsov · commit 1f64936876de · 2022-07-11T14:57:44.000-06:00
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/kcp_rest_options_getter.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/kcp_rest_options_getter.go
@@ -51,7 +51,7 @@ func (t apiBindingAwareCRDRESTOptionsGetter) GetRESTOptions(resource schema.Grou
 	// Bound CRDs must have the associated identity annotation
 	apiIdentity := t.crd.Annotations["apis.kcp.dev/identity"]
 	if apiIdentity == "" {
-		return generic.RESTOptions{}, fmt.Errorf("missing 'apis.kcp.dev/identity' annotation")
+		return generic.RESTOptions{}, fmt.Errorf("missing 'apis.kcp.dev/identity' annotation on CRD %s|%s for %s.%s", logicalcluster.From(t.crd), t.crd.Name, t.crd.Spec.Names.Plural, t.crd.Spec.Group)
 	}
 
 	// Modify the ResourcePrefix so it results in e.g. /registry/mygroup.io/widgets/identity4567/...

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (t apiBindingAwareCRDRESTOptionsGetter) GetRESTOptions(resource schema.Grou`
`51`	`51`	`// Bound CRDs must have the associated identity annotation`
`52`	`52`	`apiIdentity := t.crd.Annotations["apis.kcp.dev/identity"]`
`53`	`53`	`if apiIdentity == "" {`
`54`		`- return generic.RESTOptions{}, fmt.Errorf("missing 'apis.kcp.dev/identity' annotation")`
	`54`	`+ return generic.RESTOptions{}, fmt.Errorf("missing 'apis.kcp.dev/identity' annotation on CRD %s\|%s for %s.%s", logicalcluster.From(t.crd), t.crd.Name, t.crd.Spec.Names.Plural, t.crd.Spec.Group)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// Modify the ResourcePrefix so it results in e.g. /registry/mygroup.io/widgets/identity4567/...`