Merge pull request kubernetes-sigs#862 from hidekazuna/refactor_instance

🏃 Add some events and refactor related to instance

Author: k8s-ci-robot

controllers/openstackmachine_controller.go

@@ -372,7 +372,7 @@ func (r *OpenStackMachineReconciler) getOrCreate(logger logr.Logger, cluster *cl
 
 	if instance == nil {
 		logger.Info("Machine not exist, Creating Machine", "Machine", openStackMachine.Name)
-		instance, err = computeService.InstanceCreate(openStackCluster, machine, openStackMachine, cluster.Name, userData)
+		instance, err = computeService.CreateInstance(openStackCluster, machine, openStackMachine, cluster.Name, userData)
 		if err != nil {
 			return nil, errors.Errorf("error creating Openstack instance: %v", err)
 		}

pkg/cloud/services/compute/bastion.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
-	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
 )
 
 func (s *Service) CreateBastion(openStackCluster *infrav1.OpenStackCluster, clusterName string) (*infrav1.Instance, error) {
@@ -60,12 +59,10 @@ func (s *Service) CreateBastion(openStackCluster *infrav1.OpenStackCluster, clus
 	}
 	input.Networks = &nets
 
-	out, err := createInstance(s, clusterName, input)
+	out, err := createInstance(s, openStackCluster, clusterName, input)
 	if err != nil {
-		record.Warnf(openStackCluster, "FailedCreateServer", "Failed to create server %s: %v", name, err)
 		return nil, err
 	}
 
-	record.Eventf(openStackCluster, "SuccessfulCreateServer", "Created server %s with id %s", name, out.ID)
 	return out, nil
 }