Update version add dependabot (cattle-ops#250)

g-psantos · Aug 31, 2020 · bfad3dc · bfad3dc
1 parent 834d573
commit bfad3dc
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 18 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -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"
diff --git a/README.md b/README.md
@@ -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 |

diff --git a/ci/bin/terraform.sh b/ci/bin/terraform.sh
@@ -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"
 

diff --git a/examples/.terraform-version b/examples/.terraform-version
@@ -1 +1 @@
-0.12.26
+0.12.29
diff --git a/examples/runner-default/main.tf b/examples/runner-default/main.tf
@@ -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"

diff --git a/examples/runner-default/providers.tf b/examples/runner-default/providers.tf
@@ -1,6 +1,6 @@
 provider "aws" {
  region = var.aws_region
- version = "2.56"
+ version = "2.68"
 }
 
 provider "local" {
@@ -12,5 +12,5 @@ provider "null" {
 }
 
 provider "tls" {
- version = "2.1.1"
+ version = "2.2.0"
 }
diff --git a/examples/runner-docker/main.tf b/examples/runner-docker/main.tf
@@ -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"

diff --git a/examples/runner-docker/providers.tf b/examples/runner-docker/providers.tf
@@ -1,6 +1,6 @@
 provider "aws" {
  region = var.aws_region
- version = "2.56"
+ version = "2.68"
 }
 
 provider "local" {
@@ -12,5 +12,5 @@ provider "null" {
 }
 
 provider "tls" {
- version = "2.1.1"
+ version = "2.2.0"
 }
diff --git a/examples/runner-pre-registered/main.tf b/examples/runner-pre-registered/main.tf
@@ -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"

diff --git a/examples/runner-pre-registered/providers.tf b/examples/runner-pre-registered/providers.tf
@@ -1,6 +1,6 @@
 provider "aws" {
  region = var.aws_region
- version = "2.52"
+ version = "2.68"
 }
 
 provider "local" {
@@ -12,5 +12,5 @@ provider "null" {
 }
 
 provider "tls" {
- version = "2.1.1"
+ version = "2.2.0"
 }
diff --git a/examples/runner-public/main.tf b/examples/runner-public/main.tf
@@ -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"
@@ -21,7 +21,7 @@ module "vpc" {
 
 module "cache" {
  source = "../../modules/cache"
- environment = "${var.environment}"
+ environment = var.environment
 }
 
 module "key_pair" {

diff --git a/examples/runner-public/providers.tf b/examples/runner-public/providers.tf
@@ -1,6 +1,6 @@
 provider "aws" {
  region = var.aws_region
- version = "2.56"
+ version = "2.68"
 }
 
 provider "local" {
@@ -12,5 +12,5 @@ provider "null" {
 }
 
 provider "tls" {
- version = "2.1.1"
+ version = "2.2.0"
 }
diff --git a/modules/key-pair/main.tf b/modules/key-pair/main.tf
@@ -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
 }

diff --git a/variables.tf b/variables.tf
@@ -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" {