Skip to content

Commit 8bdc74e

Browse files
committed
Add some events and refactor related to instance
Add events: - Delete attachinterface, trunk, and port - Create port and trunk - Replace all attributestags
1 parent d520355 commit 8bdc74e

File tree

3 files changed

+317
-213
lines changed

3 files changed

+317
-213
lines changed

controllers/openstackmachine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ func (r *OpenStackMachineReconciler) getOrCreate(logger logr.Logger, cluster *cl
370370

371371
if instance == nil {
372372
logger.Info("Machine not exist, Creating Machine", "Machine", openStackMachine.Name)
373-
instance, err = computeService.InstanceCreate(openStackCluster, machine, openStackMachine, cluster.Name, userData)
373+
instance, err = computeService.CreateInstance(openStackCluster, machine, openStackMachine, cluster.Name, userData)
374374
if err != nil {
375375
return nil, errors.Errorf("error creating Openstack instance: %v", err)
376376
}

pkg/cloud/services/compute/bastion.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"fmt"
2121

2222
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
23-
"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
2423
)
2524

2625
func (s *Service) CreateBastion(openStackCluster *infrav1.OpenStackCluster, clusterName string) (*infrav1.Instance, error) {
@@ -60,12 +59,10 @@ func (s *Service) CreateBastion(openStackCluster *infrav1.OpenStackCluster, clus
6059
}
6160
input.Networks = &nets
6261

63-
out, err := createInstance(s, clusterName, input)
62+
out, err := createInstance(s, openStackCluster, clusterName, input)
6463
if err != nil {
65-
record.Warnf(openStackCluster, "FailedCreateServer", "Failed to create server %s: %v", name, err)
6664
return nil, err
6765
}
6866

69-
record.Eventf(openStackCluster, "SuccessfulCreateServer", "Created server %s with id %s", name, out.ID)
7067
return out, nil
7168
}

0 commit comments

Comments
 (0)