Skip to content

Commit ada6a4d

Browse files
committed
Merge branch 'release/1.2.1'
2 parents b853082 + 2a31e8a commit ada6a4d

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

CHNAGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
88

9+
## [1.2.1] - 2018-08-02
10+
### Changed
11+
- Add work around to README for missing service linked roles, see #15
12+
913
## [1.2.0] - 2018-07-30
1014
### Added
1115
- Add a map for for a more flexible mechanism to tag.
@@ -48,7 +52,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
4852
- Update default AMI's to The latest Amazon Linux AMI 2017.09.1 - released on 2018-01-17.
4953
- Minor updates in the example
5054

51-
[Unreleased]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.1.0...HEAD
55+
[Unreleased]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.2.1...HEAD
56+
[1.2.2]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.2.0...1.2.1
57+
[1.2.2]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.1.0...1.2.0
5258
[1.1.0]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.0.3...1.1.0
5359
[1.0.3]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.0.2...1.0.3
5460
[1.0.2]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.0.1...1.0.2

README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,22 @@ export AWS_ACCESS_KEY_ID=...
2929
export AWS_SECRET_ACCESS_KEY=...
3030
```
3131

32+
### Service linked roles
33+
Currently the ec2 instance role does not allow creation of service linked roles. The runner instances is depended on the following two service linked roles:
34+
- AWSServiceRoleForAutoScaling
35+
- AWSServiceRoleForEC2Spot
36+
37+
You can create them manually or via terraform.
38+
39+
```
40+
resource "aws_iam_service_linked_role" "spot" {
41+
aws_service_name = "spot.amazonaws.com"
42+
}
43+
44+
resource "aws_iam_service_linked_role" "autoscaling" {
45+
aws_service_name = "autoscaling.amazonaws.com"
46+
}
47+
```
3248

3349
### Configuration GitLab runner token
3450
Currently register a new runner is a manual process. See the GitLab Runner [documentation](https://docs.gitlab.com/runner/register/index.html#docker) for more details.

0 commit comments

Comments
 (0)