infra/capi: handle bootstrap destroy

Implements basic logic for handling bootstrap destroy through
the CAPI infra provider. Further bootstrap destroy logic, including
platform-specific implementations, may be needed to ensure proper
destruction of all bootstrap resources.

Author: patrickdillon

pkg/destroy/bootstrap/bootstrap.go

@@ -9,19 +9,13 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/installer/pkg/asset/cluster/metadata"
 	openstackasset "github.com/openshift/installer/pkg/asset/cluster/openstack"
-	"github.com/openshift/installer/pkg/asset/manifests/capiutils"
-	"github.com/openshift/installer/pkg/clusterapi"
 	osp "github.com/openshift/installer/pkg/destroy/openstack"
 	infra "github.com/openshift/installer/pkg/infrastructure/platform"
 	ibmcloudtfvars "github.com/openshift/installer/pkg/tfvars/ibmcloud"
-	"github.com/openshift/installer/pkg/types"
 	typesazure "github.com/openshift/installer/pkg/types/azure"
 	"github.com/openshift/installer/pkg/types/featuregates"
 	ibmcloudtypes "github.com/openshift/installer/pkg/types/ibmcloud"
@@ -35,10 +29,6 @@ func Destroy(ctx context.Context, dir string) (err error) {
 		return err
 	}
 
-	if sys := clusterapi.System(); sys.State() == clusterapi.SystemStateRunning {
-		return destroyBoostrapMachine(ctx, sys.Client(), metadata)
-	}
-
 	platform := metadata.Platform()
 	if platform == "" {
 		return errors.New("no platform configured in metadata")
@@ -92,15 +82,3 @@ func Destroy(ctx context.Context, dir string) (err error) {
 
 	return nil
 }
-
-func destroyBoostrapMachine(ctx context.Context, c client.Client, metadata *types.ClusterMetadata) error {
-	if err := c.Delete(ctx, &clusterv1.Machine{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      capiutils.GenerateBoostrapMachineName(metadata.InfraID),
-			Namespace: capiutils.Namespace,
-		},
-	}); client.IgnoreNotFound(err) != nil {
-		return fmt.Errorf("failed to delete bootstrap machine: %w", err)
-	}
-	return nil
-}

pkg/infrastructure/clusterapi/clusterapi.go

@@ -88,7 +88,6 @@ func (i *InfraProvider) Provision(dir string, parents asset.Parents) ([]*asset.F
 	// TODO(vincepri): The context should be passed down from the caller,
 	// although today the Asset interface doesn't allow it, refactor once it does.
 	ctx, cancel := context.WithCancel(signals.SetupSignalHandler())
-	defer cancel()
 	go func() {
 		<-ctx.Done()
 		cancel()
@@ -323,6 +322,9 @@ func (i *InfraProvider) DestroyBootstrap(dir string) error {
 			return fmt.Errorf("failed to delete bootstrap machine: %w", err)
 		}
 	}
+	logrus.Infof("Finished destroying bootstrap resources")
+	clusterapi.System().Teardown()
+
 	return nil
 }