dapr · artursouza · Feb 15, 2021 · Feb 15, 2021
diff --git a/cmd/init.go b/cmd/init.go
@@ -67,7 +67,7 @@ dapr init -s
 			err := kubernetes.Init(config)
 			if err != nil {
 				print.FailureStatusEvent(os.Stdout, err.Error())
-				return
+				os.Exit(1)
 			}
 			print.SuccessStatusEvent(os.Stdout, fmt.Sprintf("Success! Dapr has been installed to namespace %s. To verify, run `dapr status -k' in your terminal. To get started, go here: https://aka.ms/dapr-getting-started", config.Namespace))
 		} else {
@@ -78,7 +78,7 @@ dapr init -s
 			err := standalone.Init(runtimeVersion, dashboardVersion, dockerNetwork, slimMode)
 			if err != nil {
 				print.FailureStatusEvent(os.Stdout, err.Error())
-				return
+				os.Exit(1)
 			}
 			print.SuccessStatusEvent(os.Stdout, "Success! Dapr is up and running. To get started, go here: https://aka.ms/dapr-getting-started")
 		}

diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -31,7 +31,7 @@ dapr upgrade -k
 		})
 		if err != nil {
 			print.FailureStatusEvent(os.Stdout, "Failed to upgrade Dapr: %s", err)
-			return
+			os.Exit(1)
 		}
 		print.SuccessStatusEvent(os.Stdout, "Dapr control plane successfully upgraded to version %s. Make sure your deployments are restarted to pick up the latest sidecar version.", upgradeRuntimeVersion)
 	},

diff --git a/pkg/kubernetes/upgrade.go b/pkg/kubernetes/upgrade.go
@@ -133,6 +133,19 @@ func highAvailabilityEnabled(status []StatusOutput) bool {
 }
 
 func applyCRDs(version string) error {
+	l := []string{
+		"components.dapr.io",
+		"configurations.dapr.io",
+		"subscriptions.dapr.io",
+	}
+
+	for _, c := range l {
+		_, err := utils.RunCmdAndWait("kubectl", "delete", "crd", c)
+		if err != nil {
+			return err
+		}
+	}
+
 	for _, crd := range crds {
 		url := fmt.Sprintf("https://raw.githubusercontent.com/dapr/dapr/%s/charts/dapr/crds/%s.yaml", version, crd)
 		_, err := utils.RunCmdAndWait("kubectl", "apply", "-f", url)