Skip to content
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.

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

Update version add dependabot #250

Merged
merged 1 commit into from
Aug 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
version: 2
updates:
- package-ecosystem: "terraform"
directory: "/examples/runner-default"
schedule:
interval: "daily"
commit_message:
prefix: "chore"
- package-ecosystem: "terraform"
directory: "/examples/runner-docker"
schedule:
interval: "daily"
commit_message:
prefix: "chore"
- package-ecosystem: "terraform"
directory: "/examples/runner-public"
schedule:
interval: "daily"
commit_message:
prefix: "chore"
- package-ecosystem: "terraform"
directory: "/examples/pre-registered"
schedule:
interval: "daily"
commit_message:
prefix: "chore"

# Enable version updates for Docker
- package-ecosystem: "actions"
directory: "/.github/workflows"
schedule:
interval: "weekly"
commit_message:
prefix: "chore"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ terraform destroy
| gitlab\_runner\_registration\_config | Configuration used to register the runner. See the README for an example, or reference the examples in the examples directory of this repo. | `map(string)` | <pre>{<br> "access_level": "",<br> "description": "",<br> "locked_to_project": "",<br> "maximum_timeout": "",<br> "registration_token": "",<br> "run_untagged": "",<br> "tag_list": ""<br>}</pre> | no |
| gitlab\_runner\_security\_group\_ids | A list of security group ids that are allowed to access the gitlab runner agent | `list(string)` | `[]` | no |
| gitlab\_runner\_ssh\_cidr\_blocks | List of CIDR blocks to allow SSH Access to the gitlab runner instance. | `list(string)` | `[]` | no |
| gitlab\_runner\_version | Version of the GitLab runner. | `string` | `"13.1.1"` | no |
| gitlab\_runner\_version | Version of the GitLab runner. | `string` | `"13.3.0"` | no |
| instance\_role\_json | Default runner instance override policy, expected to be in JSON format. | `string` | `""` | no |
| instance\_type | Instance type used for the GitLab runner. | `string` | `"t3.micro"` | no |
| kms\_deletion\_window\_in\_days | Key rotation window, set to 0 for no rotation. Only used when `enable_kms` is set to `true`. | `number` | `7` | no |
Expand Down
2 changes: 1 addition & 1 deletion ci/bin/terraform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
TARGET_DIR=/opt
PATH=${PATH}:${TARGET_DIR}

TERRAFORM_VERSION=${1:-"0.12.24"}
TERRAFORM_VERSION=${1:-"0.12.29"}
OS=${2:-"linux"}
TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${OS}_amd64.zip"

Expand Down
2 changes: 1 addition & 1 deletion examples/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.26
0.12.29
2 changes: 1 addition & 1 deletion examples/runner-default/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ data "aws_security_group" "default" {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "2.33"
version = "2.48"

name = "vpc-${var.environment}"
cidr = "10.0.0.0/16"
Expand Down
4 changes: 2 additions & 2 deletions examples/runner-default/providers.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
provider "aws" {
region = var.aws_region
version = "2.56"
version = "2.68"
}

provider "local" {
Expand All @@ -12,5 +12,5 @@ provider "null" {
}

provider "tls" {
version = "2.1.1"
version = "2.2.0"
}
2 changes: 1 addition & 1 deletion examples/runner-docker/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ data "aws_availability_zones" "available" {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "2.33"
version = "2.48"

name = "vpc-${var.environment}"
cidr = "10.1.0.0/16"
Expand Down
4 changes: 2 additions & 2 deletions examples/runner-docker/providers.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
provider "aws" {
region = var.aws_region
version = "2.56"
version = "2.68"
}

provider "local" {
Expand All @@ -12,5 +12,5 @@ provider "null" {
}

provider "tls" {
version = "2.1.1"
version = "2.2.0"
}
2 changes: 1 addition & 1 deletion examples/runner-pre-registered/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ data "aws_availability_zones" "available" {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "2.21"
version = "2.48"

name = "vpc-${var.environment}"
cidr = "10.0.0.0/16"
Expand Down
4 changes: 2 additions & 2 deletions examples/runner-pre-registered/providers.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
provider "aws" {
region = var.aws_region
version = "2.52"
version = "2.68"
}

provider "local" {
Expand All @@ -12,5 +12,5 @@ provider "null" {
}

provider "tls" {
version = "2.1.1"
version = "2.2.0"
}
4 changes: 2 additions & 2 deletions examples/runner-public/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ data "aws_availability_zones" "available" {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "2.33"
version = "2.48"

name = "vpc-${var.environment}"
cidr = "10.1.0.0/16"
Expand All @@ -21,7 +21,7 @@ module "vpc" {

module "cache" {
source = "../../modules/cache"
environment = "${var.environment}"
environment = var.environment
}

module "key_pair" {
Expand Down
4 changes: 2 additions & 2 deletions examples/runner-public/providers.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
provider "aws" {
region = var.aws_region
version = "2.56"
version = "2.68"
}

provider "local" {
Expand All @@ -12,5 +12,5 @@ provider "null" {
}

provider "tls" {
version = "2.1.1"
version = "2.2.0"
}
2 changes: 1 addition & 1 deletion modules/key-pair/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resource "null_resource" "file_permission" {
}

resource "aws_key_pair" "key" {
key_name = var.name != null ? "${var.environment}-${var.name}" : "${var.environment}"
key_name = var.name != null ? "${var.environment}-${var.name}" : var.environment
public_key = local_file.public_ssh_key.content
tags = local.tags
}
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ variable "cache_shared" {
variable "gitlab_runner_version" {
description = "Version of the GitLab runner."
type = string
default = "13.1.1"
default = "13.3.0"
}

variable "enable_ping" {
Expand Down