Better error handling for CRs

pulumi · Apr 17, 2019 · 0f66cc2 · 0f66cc2
1 parent f6083b0
commit 0f66cc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/clients/clients.go b/pkg/clients/clients.go
@@ -140,7 +140,7 @@ func (dcs *DynamicClientSet) NamespacedKind(gvk schema.GroupVersionKind) (bool,
 
 	resourceList, err := dcs.DiscoveryClientCached.ServerResourcesForGroupVersion(gv)
 	if err != nil {
-		return false, err
+		return false, &NoNamespaceInfoErr{gvk}
 	}
 
 	for _, resource := range resourceList.APIResources {

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -303,7 +303,8 @@ func (k *kubeProvider) Check(ctx context.Context, req *pulumirpc.CheckRequest) (
 		// Validate the object according to the OpenAPI schema.
 		if err != nil {
 			resourceNotFound := errors.IsNotFound(err) ||
-				strings.Contains(err.Error(), "is not supported by the server")
+				strings.Contains(err.Error(), "is not supported by the server") ||
+				strings.Contains(err.Error(), "does not support resource type")
 			k8sAPIUnreachable := strings.Contains(err.Error(), "connection refused")
 			if resourceNotFound && gvkExists(gvk) {
 				failures = append(failures, &pulumirpc.CheckFailure{