Merge commit from fork

Signed-off-by: Kent Rancourt <kent.rancourt@gmail.com>

Author: krancour

pkg/server/create_or_update_resource_v1alpha1.go

@@ -46,7 +46,8 @@ func (s *server) CreateOrUpdateResource(
 		}
 		// If we just created a Project successfully, keep track of this Project
 		// being one that was created in the course of this API call.
-		if result.GetCreatedResourceManifest() != nil &&
+		if err == nil &&
+			result.GetCreatedResourceManifest() != nil &&
 			resource.GroupVersionKind() == projectGVK {
 			createdProjects[resource.GetName()] = struct{}{}
 		}

pkg/server/create_resource_v1alpha1.go

@@ -48,7 +48,7 @@ func (s *server) CreateResource(
 		}
 		// If we just created a Project successfully, keep track of this Project
 		// being one that was created in the course of this API call.
-		if resource.GroupVersionKind() == projectGVK {
+		if err == nil && resource.GroupVersionKind() == projectGVK {
 			createdProjects[resource.GetName()] = struct{}{}
 		}
 		results = append(results, result)