don't treat missing datasource as an error when deleting datasource (#1879)

Author: lexhuismans

controllers/datasource_controller.go

@@ -114,15 +114,15 @@ func (r *GrafanaDatasourceReconciler) syncDatasources(ctx context.Context) (ctrl
 			instanceDatasource, err := grafanaClient.Datasources.GetDataSourceByUID(uid)
 			if err != nil {
 				var notFound *datasources.GetDataSourceByUIDNotFound
-				if errors.As(err, &notFound) {
+				if !errors.As(err, &notFound) {
 					return ctrl.Result{}, err
 				}
 				log.Info("datasource no longer exists", "namespace", namespace, "name", name)
 			} else {
 				_, err = grafanaClient.Datasources.DeleteDataSourceByUID(instanceDatasource.Payload.UID) //nolint
 				if err != nil {
 					var notFound *datasources.DeleteDataSourceByUIDNotFound
-					if errors.As(err, &notFound) {
+					if !errors.As(err, &notFound) {
 						return ctrl.Result{}, err
 					}
 				}

controllers/grafanafolder_controller.go

@@ -101,7 +101,7 @@ func (r *GrafanaFolderReconciler) syncFolders(ctx context.Context) (ctrl.Result,
 		for _, folder := range existingFolders {
 			// avoid bombarding the grafana instance with a large number of requests at once, limit
 			// the sync to a certain number of folders per cycle. This means that it will take longer to sync
-			// a large number of deleted dashboard crs, but that should be an edge case.
+			// a large number of deleted folders crs, but that should be an edge case.
 			if foldersSynced >= syncBatchSize {
 				return ctrl.Result{Requeue: true}, nil
 			}