diff --git a/docker_autoscaler_policy.tf b/docker_autoscaler_policy.tf index eeb677cd5..07b5d9e8f 100644 --- a/docker_autoscaler_policy.tf +++ b/docker_autoscaler_policy.tf @@ -20,6 +20,7 @@ resource "aws_iam_policy" "instance_docker_autoscaler_policy" { partition = data.aws_partition.current.partition autoscaler_asg_arn = aws_autoscaling_group.autoscaler[0].arn autoscaler_asg_name = aws_autoscaling_group.autoscaler[0].name + runner_asg_arn = aws_autoscaling_group.gitlab_runner_instance.arn }) tags = local.tags diff --git a/policies/instance-docker-autoscaler-policy.json b/policies/instance-docker-autoscaler-policy.json index 51f32c484..7a5ddbe23 100644 --- a/policies/instance-docker-autoscaler-policy.json +++ b/policies/instance-docker-autoscaler-policy.json @@ -5,16 +5,22 @@ "Effect": "Allow", "Action": [ "autoscaling:SetDesiredCapacity", - "autoscaling:TerminateInstanceInAutoScalingGroup", - "autoscaling:CompleteLifecycleAction", - "autoscaling:DescribeLifecycleHooks" + "autoscaling:TerminateInstanceInAutoScalingGroup" ], "Resource": "${autoscaler_asg_arn}" }, + { + "Effect": "Allow", + "Action": [ + "autoscaling:CompleteLifecycleAction" + ], + "Resource": "${runner_asg_arn}" + }, { "Effect": "Allow", "Action": [ "autoscaling:DescribeAutoScalingGroups", + "autoscaling:DescribeLifecycleHooks", "ec2:DescribeInstances", "ec2:DescribeSpotInstanceRequests", "ec2:DescribeTags"