Merge pull request #138 from aaronlevy/log-asset-error

Log on asset creation error - do not exit

Author: aaronlevy

pkg/bootkube/create.go

@@ -31,9 +31,17 @@ func CreateAssets(manifestDir string, timeout time.Duration) error {
 	createFn := func() (bool, error) {
 		err := createAssets(manifestDir)
 		if err != nil {
-			glog.Warningf("Error creating assets: %v", err)
-			// order matters, evaluate "shouldRetry" first
-			return (shouldRetry(err) || shouldQuit(err)), err
+			glog.Errorf("Error creating assets: %v", err)
+			// If error is "system namespace not found" we should retry
+			if apierrors.IsNotFound(err) {
+				details := err.(*apierrors.StatusError).Status().Details
+				if details.Name == api.NamespaceSystem && details.Kind == "namespaces" {
+					return false, nil // retry
+				}
+			}
+			UserOutput("\nError creating assets: %v\n", err)
+			UserOutput("\nNOTE: Bootkube failed to create some cluster assets. It is important that manifest errors are resolved and resubmitted to the apiserver.\n")
+			UserOutput("For example, after resolving issues: kubectl create -f <failed-manifest>\n\n")
 		}
 		return true, nil
 	}
@@ -53,23 +61,6 @@ func CreateAssets(manifestDir string, timeout time.Duration) error {
 	return nil
 }
 
-func shouldRetry(err error) bool {
-	// Retry if error is system namespace not found
-	if apierrors.IsNotFound(err) {
-		details := err.(*apierrors.StatusError).Status().Details
-		return !(details.Name == api.NamespaceSystem && details.Kind == "namespaces")
-	}
-	return false
-}
-
-func shouldQuit(err error) bool {
-	// Fail on anything but "already exists"
-	if !apierrors.IsAlreadyExists(err) {
-		return true
-	}
-	return false
-}
-
 func createAssets(manifestDir string) error {
 	config := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
 		&clientcmd.ClientConfigLoadingRules{},