Update AWS sdk, improve log in machine actuator delete (#747)

Signed-off-by: Vince Prignano <[email protected]>

Makefile

@@ -216,6 +216,16 @@ binaries-dev: ## Builds and installs all development binaries using go get
 
 .PHONY: create-cluster
 create-cluster: binaries-dev ## Create a development Kubernetes cluster on AWS using examples
+	clusterctl create cluster -v 4 \
+	--provider aws \
+	--bootstrap-type kind \
+	-m ./cmd/clusterctl/examples/aws/out/machines.yaml \
+	-c ./cmd/clusterctl/examples/aws/out/cluster.yaml \
+	-p ./cmd/clusterctl/examples/aws/out/provider-components.yaml \
+	-a ./cmd/clusterctl/examples/aws/out/addons.yaml
+
+.PHONY: create-cluster-ha
+create-cluste-ha: binaries-dev ## Create a development Kubernetes cluster on AWS using HA examples
 	clusterctl create cluster -v 4 \
 	--provider aws \
 	--bootstrap-type kind \

pkg/cloud/aws/actuators/machine/actuator.go

@@ -277,15 +277,15 @@ func (a *Actuator) Delete(ctx context.Context, cluster *clusterv1.Cluster, machi
 	// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html
 	switch instance.State {
 	case v1alpha1.InstanceStateShuttingDown, v1alpha1.InstanceStateTerminated:
-		a.log.Info("Machine instance is shutting down or already terminated", "machine-name", machine.Name, "machine-namespace", machine.Namespace)
+		a.log.Info("Machine instance is shutting down or already terminated")
 		return nil
 	default:
+		a.log.Info("Terminating machine")
 		if err := ec2svc.TerminateInstance(instance.ID); err != nil {
 			return errors.Errorf("failed to terminate instance: %+v", err)
 		}
 	}
 
-	a.log.Info("Shutdown signal was sent. Shutting down machine.")
 	return nil
 }
 

pkg/cloud/aws/services/ec2/instances.go

@@ -41,7 +41,7 @@ import (
 
 // InstanceByTags returns the existing instance or nothing if it doesn't exist.
 func (s *Service) InstanceByTags(machine *actuators.MachineScope) (*v1alpha1.Instance, error) {
-	s.scope.V(2).Info("Looking for existing machine instance")
+	s.scope.V(2).Info("Looking for existing machine instance by tags")
 
 	input := &ec2.DescribeInstancesInput{
 		Filters: []*ec2.Filter{
@@ -79,7 +79,7 @@ func (s *Service) InstanceIfExists(id *string) (*v1alpha1.Instance, error) {
 		return nil, nil
 	}
 
-	s.scope.V(2).Info("Looking for instance", "instance-id", *id)
+	s.scope.V(2).Info("Looking for instance by id", "instance-id", *id)
 
 	input := &ec2.DescribeInstancesInput{
 		InstanceIds: []*string{id},