Fixes for cluster-api interface changes.

openshift · May 30, 2018 · aef359b · aef359b
1 parent 7ea0d1b
commit aef359b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrib/cmd/aws-actuator-test/main.go b/contrib/cmd/aws-actuator-test/main.go
@@ -78,12 +78,12 @@ func deleteClusterMachine(instanceId string) error {
 }
 
 func clusterMachineExists(instanceId string) error {
-	_, machine := testClusterAPIResources("any")
+	cluster, machine := testClusterAPIResources("any")
 	machine.Annotations = map[string]string{
 		instanceIDAnnotation: instanceId,
 	}
 	actuator := aws.NewActuator(nil, nil, log.WithField("example", "delete-machine"), "us-east-1c")
-	exists, err := actuator.Exists(machine)
+	exists, err := actuator.Exists(cluster, machine)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/clusterapi/aws/actuator.go b/pkg/clusterapi/aws/actuator.go
@@ -332,7 +332,7 @@ func (a *Actuator) CreateMachine(cluster *clusterv1.Cluster, machine *clusterv1.
 }
 
 // Delete deletes a machine and updates its finalizer
-func (a *Actuator) Delete(machine *clusterv1.Machine) error {
+func (a *Actuator) Delete(cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
 	mLog := clustoplog.WithMachine(a.logger, machine)
 	mLog.Debugf("Delete %s/%s", machine.Namespace, machine.Name)
 	if err := a.DeleteMachine(machine); err != nil {
@@ -396,7 +396,7 @@ func (a *Actuator) Update(c *clusterv1.Cluster, machine *clusterv1.Machine) erro
 }
 
 // Exists determines if the given machine currently exists.
-func (a *Actuator) Exists(machine *clusterv1.Machine) (bool, error) {
+func (a *Actuator) Exists(cluster *clusterv1.Cluster, machine *clusterv1.Machine) (bool, error) {
 	mLog := clustoplog.WithMachine(a.logger, machine)
 	mLog.Debugf("checking if machine exists")