Don't swallow errors when uninstalling FluxCD
Signed-off-by: Knut Götz <knutgoetz@gmail.com>
This commit is contained in:
@@ -90,16 +90,24 @@ func uninstallCmdRun(cmd *cobra.Command, args []string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.Actionf("deleting components in %s namespace", *kubeconfigArgs.Namespace)
|
logger.Actionf("deleting components in %s namespace", *kubeconfigArgs.Namespace)
|
||||||
uninstall.Components(ctx, logger, kubeClient, *kubeconfigArgs.Namespace, uninstallArgs.dryRun)
|
if err := uninstall.Components(ctx, logger, kubeClient, *kubeconfigArgs.Namespace, uninstallArgs.dryRun); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
logger.Actionf("deleting toolkit.fluxcd.io finalizers in all namespaces")
|
logger.Actionf("deleting toolkit.fluxcd.io finalizers in all namespaces")
|
||||||
uninstall.Finalizers(ctx, logger, kubeClient, uninstallArgs.dryRun)
|
if err := uninstall.Finalizers(ctx, logger, kubeClient, uninstallArgs.dryRun); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
logger.Actionf("deleting toolkit.fluxcd.io custom resource definitions")
|
logger.Actionf("deleting toolkit.fluxcd.io custom resource definitions")
|
||||||
uninstall.CustomResourceDefinitions(ctx, logger, kubeClient, uninstallArgs.dryRun)
|
if err := uninstall.CustomResourceDefinitions(ctx, logger, kubeClient, uninstallArgs.dryRun); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if !uninstallArgs.keepNamespace {
|
if !uninstallArgs.keepNamespace {
|
||||||
uninstall.Namespace(ctx, logger, kubeClient, *kubeconfigArgs.Namespace, uninstallArgs.dryRun)
|
if err := uninstall.Namespace(ctx, logger, kubeClient, *kubeconfigArgs.Namespace, uninstallArgs.dryRun); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Successf("uninstall finished")
|
logger.Successf("uninstall finished")
|
||||||
|
|||||||
Reference in New Issue
Block a user