Skip to content

Commit

Permalink
Update defaults and example
Browse files Browse the repository at this point in the history
  • Loading branch information
npalm committed Jun 19, 2018
1 parent 5323ec4 commit 24632b0
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
16 changes: 16 additions & 0 deletions CHNAGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.0.0] - 2018-06-19
### Changed
- Default Gitlab runner version set to 10.8.0
- Update default AMI's to The latest Amazon Linux AMI 2017.09.1 - released on 2018-01-17.
- Minor updates in the example

[Unreleased]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/1.0.0...HEAD
[1.0.0]: https://github.com/npalm/terraform-aws-gitlab-runner/compare/0.2.0...1.0.0
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,12 @@ runner_token = "RUNNER_TOKEN"

### Usage module.
```
module "runner" {
module "gitlab-runner" {
source = "npalm/gitlab-runner/aws"
source = "npalm/gitlab-runner/aws"
version = "1.0.0"
aws_region = "${var.aws_region}"
environment = "${var.environment}"
Expand All @@ -76,11 +80,11 @@ All variables and defaults:
| cache_expiration_days | Number of days before cache objects expires. | string | `1` | no |
| cache_user | User name of the user to create to write and read to the s3 cache. | string | `cache_user` | no |
| docker_machine_instance_type | Instance type used for the instances hosting docker-machine. | string | `m4.large` | no |
| docker_machine_spot_price_bid | Spot price bid. | string | `0.03` | no |
| docker_machine_spot_price_bid | Spot price bid. | string | `0.04` | no |
| docker_machine_user | User name for the user to create spot instances to host docker-machine. | string | `docker-machine` | no |
| enable_cloudwatch_logging | Enable or disable the CloudWatch logging. | string | `1` | no |
| environment | A name that identifies the environment, will used as prefix and for tagging. | string | - | yes |
| gitlab_runner_version | Version for the gitlab runner. | string | `10.2.0` | no |
| gitlab_runner_version | Version for the gitlab runner. | string | `10.8.0` | no |
| instance_type | Instance type used for the gitlab-runner. | string | `t2.micro` | no |
| runners_concurrent | Concurrent value for the runners, will be used in the runner config.toml | string | `10` | no |
| runners_gitlab_url | URL of the gitlab instance to connect to. | string | - | yes |
Expand Down
2 changes: 1 addition & 1 deletion example/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.0
0.11.7
2 changes: 1 addition & 1 deletion example/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
provider "aws" {
region = "${var.aws_region}"
version = "1.3.1"
version = "1.23"
}

provider "template" {
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ variable "docker_machine_instance_type" {

variable "docker_machine_spot_price_bid" {
description = "Spot price bid."
default = "0.03"
default = "0.04"
}

variable "runners_name" {
Expand Down Expand Up @@ -128,7 +128,7 @@ variable "cache_expiration_days" {
variable "gitlab_runner_version" {
description = "Version for the gitlab runner."
type = "string"
default = "10.2.0"
default = "10.8.0"
}

variable "enable_cloudwatch_logging" {
Expand Down

0 comments on commit 24632b0

Please sign in to comment.