Skip to content

fix(aws): tag IAM role/instance-profile and spot ASG with mapt resource tags #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ppitonak wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −11
Open

fix(aws): tag IAM role/instance-profile and spot ASG with mapt resource tags #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/provider/aws/action/snc/snc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func (r *openshiftSNCRequest) deploy(ctx *pulumi.Context) error {
return err
}
// Instance profile required by logic within userdata
iProfile, err := iam.InstanceProfile(ctx, r.prefix, &apiSNC.OCPSNCID, requiredPolicies)
iProfile, err := iam.InstanceProfile(ctx, r.mCtx, r.prefix, &apiSNC.OCPSNCID, requiredPolicies)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/provider/aws/modules/bastion/bastion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ func instance(ctx *pulumi.Context, mCtx *mc.Context, args *instaceArgs) (*ec2.In
VpcSecurityGroupIds: args.securityGroups,
RootBlockDevice: ec2.InstanceRootBlockDeviceArgs{
VolumeSize: pulumi.Int(diskSize),
Tags: mCtx.ResourceTags(),
},
Tags: mCtx.ResourceTags(),
}
Expand Down
23 changes: 16 additions & 7 deletions pkg/provider/aws/modules/ec2/compute/compute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ func (r *ComputeRequest) onDemandInstance(ctx *pulumi.Context) (*ec2.Instance, e
VpcSecurityGroupIds: r.SecurityGroups,
RootBlockDevice: ec2.InstanceRootBlockDeviceArgs{
VolumeSize: pulumi.Int(volSize),
Tags: r.MCtx.ResourceTags(),
},
Tags: r.MCtx.ResourceTags(),
}
Expand Down Expand Up @@ -243,6 +244,20 @@ func (r ComputeRequest) spotInstance(ctx *pulumi.Context) (*autoscaling.Group, e
Overrides: overrides,
},
}
asgTags := autoscaling.GroupTagArray{
&autoscaling.GroupTagArgs{
Key: pulumi.String("Name"),
Value: pulumi.String(resourcesUtil.GetResourceName(r.Prefix, r.ID, "asg")),
PropagateAtLaunch: pulumi.Bool(true),
},
}
for key, value := range r.MCtx.ResourceTags() {
asgTags = append(asgTags, &autoscaling.GroupTagArgs{
Key: pulumi.String(key),
Value: value,
PropagateAtLaunch: pulumi.Bool(true),
})
}
return autoscaling.NewGroup(ctx,
resourcesUtil.GetResourceName(r.Prefix, r.ID, "asg"),
&autoscaling.GroupArgs{
Expand All @@ -262,13 +277,7 @@ func (r ComputeRequest) spotInstance(ctx *pulumi.Context) (*autoscaling.Group, e
// Skip waiting for instances to fully terminate on destroy;
// these are ephemeral machines so there is no need to drain.
ForceDelete: pulumi.Bool(true),
Tags: autoscaling.GroupTagArray{
&autoscaling.GroupTagArgs{
Key: pulumi.String("Name"),
Value: pulumi.String(resourcesUtil.GetResourceName(r.Prefix, r.ID, "asg")),
PropagateAtLaunch: pulumi.Bool(true),
},
},
Tags: asgTags,
},
pulumi.Timeouts(&pulumi.CustomTimeouts{
Delete: "30m"}),
Expand Down
10 changes: 7 additions & 3 deletions pkg/provider/aws/modules/iam/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import (
"github.com/pulumi/pulumi-aws/sdk/v7/go/aws/iam"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"

mc "github.com/redhat-developer/mapt/pkg/manager/context"
resourcesUtil "github.com/redhat-developer/mapt/pkg/util/resources"
)

// Create a instance profile based on a list of policies
func InstanceProfile(ctx *pulumi.Context, prefix, id *string, policiesARNs []string) (*iam.InstanceProfile, error) {
func InstanceProfile(ctx *pulumi.Context, mCtx *mc.Context, prefix, id *string, policiesARNs []string) (*iam.InstanceProfile, error) {
r, err := iam.NewRole(ctx,
resourcesUtil.GetResourceName(*prefix, *id, "ec2-role"),
&iam.RoleArgs{
Expand All @@ -24,6 +25,7 @@ func InstanceProfile(ctx *pulumi.Context, prefix, id *string, policiesARNs []str
}
]
}`),
Tags: mCtx.ResourceTags(),
})
if err != nil {
return nil, err
Expand All @@ -40,9 +42,11 @@ func InstanceProfile(ctx *pulumi.Context, prefix, id *string, policiesARNs []str
}
}
return iam.NewInstanceProfile(ctx,
resourcesUtil.GetResourceName(*prefix, *id, "instance-profie"),
resourcesUtil.GetResourceName(*prefix, *id, "instance-profile"),
&iam.InstanceProfileArgs{
Role: r})
Role: r,
Tags: mCtx.ResourceTags(),
})
}

func (r *iamRequestArgs) deploy(ctx *pulumi.Context) error {
Expand Down
1 change: 1 addition & 0 deletions pkg/provider/aws/modules/mac/machine/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ func (r *Request) instance(ctx *pulumi.Context,
VpcSecurityGroupIds: securityGroups,
RootBlockDevice: ec2.InstanceRootBlockDeviceArgs{
VolumeSize: pulumi.Int(diskSize),
Tags: r.MCtx.ResourceTags(),
},
Tags: r.MCtx.ResourceTags(),
}
Expand Down