merged upstream

Author: gargipanatula

go.mod

@@ -51,7 +51,6 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.67
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect

pkg/controllers/tagging/tagging_controller.go

@@ -322,9 +322,9 @@ func (tc *Controller) tagEc2Instance(ctx context.Context, node *v1.Node) error {
 	var err error
 	instanceID, _ := awsv1.KubernetesInstanceID(node.Spec.ProviderID).MapToAWSInstanceID()
 	if tc.batchingEnabled {
-		err = tc.cloud.TagResourceBatch(context.TODO(), string(instanceID), tc.tags)
+		err = tc.cloud.TagResourceBatch(ctx, string(instanceID), tc.tags)
 	} else {
-		err = tc.cloud.TagResource(string(instanceID), tc.tags)
+		err = tc.cloud.TagResource(ctx, string(instanceID), tc.tags)
 	}
 
 	if err != nil {
@@ -381,16 +381,12 @@ func (tc *Controller) untagNodeResources(ctx context.Context, node *taggingContr
 func (tc *Controller) untagEc2Instance(ctx context.Context, node *taggingControllerNode) error {
 	instanceID, _ := awsv1.KubernetesInstanceID(node.providerID).MapToAWSInstanceID()
 
-<<<<<<< HEAD
-	err := tc.cloud.UntagResource(ctx, string(instanceID), tc.tags)
-=======
 	var err error
 	if tc.batchingEnabled {
 		err = tc.cloud.UntagResourceBatch(context.TODO(), string(instanceID), tc.tags)
 	} else {
-		err = tc.cloud.UntagResource(string(instanceID), tc.tags)
+		err = tc.cloud.UntagResource(ctx, string(instanceID), tc.tags)
 	}
->>>>>>> upstream/master
 
 	if err != nil {
 		klog.Errorf("Error in untagging EC2 instance %s for node %s, error: %v", instanceID, node.name, err)

pkg/controllers/tagging/tagging_controller_test.go

@@ -245,7 +245,7 @@ func Test_NodesJoiningAndLeaving(t *testing.T) {
 
 				cnt := 0
 				for tc.workqueue.Len() > 0 {
-					tc.process()
+					tc.process(context.TODO())
 					cnt++
 					// sleep briefly because of exponential backoff when requeueing failed workitem
 					// resulting in workqueue to be empty if checked immediately

pkg/providers/v1/tags.go

@@ -336,6 +336,26 @@ func (c *Cloud) TagResource(ctx context.Context, resourceID string, tags map[str
 	return nil
 }
 
+// TagResourceBatch calls EC2 and tag the resource associated to resourceID with the supplied tags
+// calls are batched based on batcher configuration.
+func (c *Cloud) TagResourceBatch(ctx context.Context, resourceID string, tags map[string]string) error {
+	request := &ec2.CreateTagsInput{
+		Resources: []string{resourceID},
+		Tags:      buildAwsTags(tags),
+	}
+
+	output, err := c.createTagsBatcher.createTags(ctx, request)
+
+	if err != nil {
+		klog.Errorf("Error occurred trying to tag resources, %v", err)
+		return err
+	}
+
+	klog.Infof("Done calling create-tags to EC2: %v", output)
+
+	return nil
+}
+
 // UntagResource calls EC2 and tag the resource associated to resourceID
 // with the supplied tags
 func (c *Cloud) UntagResource(ctx context.Context, resourceID string, tags map[string]string) error {
@@ -362,6 +382,32 @@ func (c *Cloud) UntagResource(ctx context.Context, resourceID string, tags map[s
 	return nil
 }
 
+// UntagResourceBatch calls EC2 and tag the resource associated to resourceID with the supplied tags
+// calls are batched based on batcher configuration.
+func (c *Cloud) UntagResourceBatch(ctx context.Context, resourceID string, tags map[string]string) error {
+	request := &ec2.DeleteTagsInput{
+		Resources: []string{resourceID},
+		Tags:      buildAwsTags(tags),
+	}
+
+	output, err := c.deleteTagsBatcher.deleteTags(ctx, request)
+
+	if err != nil {
+		// An instance not found should not fail the untagging workflow as it
+		// would for tagging, since the target state is already reached.
+		if IsAWSErrorInstanceNotFound(err) {
+			klog.Infof("Couldn't find resource when trying to untag it hence skipping it, %v", err)
+			return nil
+		}
+		klog.Errorf("Error occurred trying to untag resources, %v", err)
+		return err
+	}
+
+	klog.Infof("Done calling delete-tags to EC2: %v", output)
+
+	return nil
+}
+
 func buildAwsTags(tags map[string]string) []ec2types.Tag {
 	var awsTags []ec2types.Tag
 	for k, v := range tags {