Skip to content

Commit e14f58b

Browse files
committed
temp
1 parent 9a75aec commit e14f58b

File tree

4 files changed

+13
-19
lines changed

4 files changed

+13
-19
lines changed

mocks/pkg/types/aws_resource_manager.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/runtime/reconciler.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ func (r *resourceReconciler) handleAdoption(
332332

333333
rlog.Enter("rm.ReadOne")
334334
latest, err := rm.ReadOne(ctx, resolved)
335-
rm.FilterAWSTags(latest)
336335
rlog.Exit("rm.ReadOne", err)
337336
if err != nil {
338337
return latest, err

pkg/tags/tags.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ func Merge(a Tags, b Tags) Tags {
5252
return result
5353
}
5454

55-
// IgnoreAWSTags ignores tags that have keys that start with "aws:"
56-
// is needed to ensure the controller does not attempt to remove
57-
// tags set by AWS
58-
// Eg. resources created with cloudformation have tags that cannot be
59-
// removed by an ACK controller
60-
func IgnoreAWSTags(tags Tags) {
61-
for k := range tags {
62-
if strings.HasPrefix(k, "aws:") {
63-
delete(tags, k)
64-
}
65-
}
66-
}
55+
// // IgnoreAWSTags ignores tags that have keys that start with "aws:"
56+
// // is needed to ensure the controller does not attempt to remove
57+
// // tags set by AWS
58+
// // Eg. resources created with cloudformation have tags that cannot be
59+
// // removed by an ACK controller
60+
// func IgnoreAWSTags(tags Tags) {
61+
// for k := range tags {
62+
// if strings.HasPrefix(k, "aws:") {
63+
// delete(tags, k)
64+
// }
65+
// }
66+
// }
6767

6868
// SyncAWSTags ensures that if the latest resource has AWS tags,
6969
// we want the desired tags to also have those same tags. This ensures we

pkg/types/aws_resource_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ type AWSResourceManager interface {
9090
// a resource that was created by AWS. The controller does not have
9191
// permission to remove these tags, so we will just ignore them, and not
9292
// patch them to the controller.
93-
FilterAWSTags(AWSResource)
93+
// FilterAWSTags(AWSResource)
9494
}
9595

9696
// AWSResourceManagerFactory returns an AWSResourceManager that can be used to

0 commit comments

Comments
 (0)