CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2024-12-24 19:29:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Terraform v0.13 input variable validations

Browse Source 
* Support for migrating from Terraform v0.12.x to v0.13.x
was added in v1.18.8
* Require Terraform v0.13+. Drop support for Terraform v0.12
This commit is contained in:
Dalton Hubble 2020-11-17 11:30:01 -08:00
parent 5c3b5a20de
commit cc00afa4e1
27 changed files with 82 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -4,6 +4,9 @@ Notable changes between versions.
## Latest
* Add input variable validations ([#880](https://github.com/poseidon/typhoon/pull/880))
* Require Terraform v0.13+ ([migration guide](https://typhoon.psdn.io/topics/maintenance/#terraform-versions))
## v1.19.4
* Kubernetes [v1.19.4](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.19.md#v1194)

12
aws/fedora-coreos/kubernetes/variables.tf
View File

@ -43,8 +43,13 @@ variable "worker_type" {
variable "os_stream" {
type = string
description = "Fedora CoreOs image stream for instances (e.g. stable, testing, next)"
description = "Fedora CoreOS image stream for instances (e.g. stable, testing, next)"
default = "stable"
validation {
condition = contains(["stable", "testing", "next"], var.os_stream)
error_message = "The os_stream must be stable, testing, or next."
}
}
variable "disk_size" {
@ -159,6 +164,11 @@ variable "arch" {
type = string
description = "Container architecture (amd64 or arm64)"
default = "amd64"
validation {
condition = var.arch == "amd64" || var.arch == "arm64"
error_message = "The arch must be amd64 or arm64."
}
}
variable "daemonset_tolerations" {

2
aws/fedora-coreos/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
aws = ">= 2.23, <= 4.0"
template = "~> 2.1"

12
aws/fedora-coreos/kubernetes/workers/variables.tf
View File

@ -36,8 +36,13 @@ variable "instance_type" {
variable "os_stream" {
type = string
description = "Fedora CoreOs image stream for instances (e.g. stable, testing, next)"
description = "Fedora CoreOS image stream for instances (e.g. stable, testing, next)"
default = "stable"
validation {
condition = contains(["stable", "testing", "next"], var.os_stream)
error_message = "The os_stream must be stable, testing, or next."
}
}
variable "disk_size" {
@ -121,4 +126,9 @@ variable "arch" {
type = string
description = "Container architecture (amd64 or arm64)"
default = "amd64"
validation {
condition = var.arch == "amd64" || var.arch == "arm64"
error_message = "The arch must be amd64 or arm64."
}
}

2
aws/fedora-coreos/kubernetes/workers/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
aws = ">= 2.23, <= 4.0"
template = "~> 2.1"

5
aws/flatcar-linux/kubernetes/variables.tf
View File

@ -45,6 +45,11 @@ variable "os_image" {
type = string
description = "AMI channel for a Container Linux derivative (flatcar-stable, flatcar-beta, flatcar-alpha, flatcar-edge)"
default = "flatcar-stable"
validation {
condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image)
error_message = "The os_image must be flatcar-stable, flatcar-beta, flatcar-alpha, or flatcar-edge."
}
}
variable "disk_size" {

2
aws/flatcar-linux/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
aws = ">= 2.23, <= 4.0"
template = "~> 2.1"

5
aws/flatcar-linux/kubernetes/workers/variables.tf
View File

@ -38,6 +38,11 @@ variable "os_image" {
type = string
description = "AMI channel for a Container Linux derivative (flatcar-stable, flatcar-beta, flatcar-alpha, flatcar-edge)"
default = "flatcar-stable"
validation {
condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image)
error_message = "The os_image must be flatcar-stable, flatcar-beta, flatcar-alpha, or flatcar-edge."
}
}
variable "disk_size" {

2
aws/flatcar-linux/kubernetes/workers/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
aws = ">= 2.23, <= 4.0"
template = "~> 2.1"

2
azure/fedora-coreos/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
azurerm = "~> 2.8"
template = "~> 2.1"

2
azure/fedora-coreos/kubernetes/workers/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
azurerm = "~> 2.8"
template = "~> 2.1"

5
azure/flatcar-linux/kubernetes/variables.tf
View File

@ -50,6 +50,11 @@ variable "os_image" {
type = string
description = "Channel for a Container Linux derivative (flatcar-stable, flatcar-beta, flatcar-alpha, flatcar-edge)"
default = "flatcar-stable"
validation {
condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image)
error_message = "The os_image must be flatcar-stable, flatcar-beta, flatcar-alpha, or flatcar-edge."
}
}
variable "disk_size" {

2
azure/flatcar-linux/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
azurerm = "~> 2.8"
template = "~> 2.1"

5
azure/flatcar-linux/kubernetes/workers/variables.tf
View File

@ -48,6 +48,11 @@ variable "os_image" {
type = string
description = "Channel for a Container Linux derivative (flatcar-stable, flatcar-beta, flatcar-alpha, flatcar-edge)"
default = "flatcar-stable"
validation {
condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image)
error_message = "The os_image must be flatcar-stable, flatcar-beta, flatcar-alpha, or flatcar-edge."
}
}
variable "priority" {

2
azure/flatcar-linux/kubernetes/workers/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
azurerm = "~> 2.8"
template = "~> 2.1"

7
bare-metal/fedora-coreos/kubernetes/variables.tf
View File

@ -12,8 +12,13 @@ variable "matchbox_http_endpoint" {
variable "os_stream" {
type = string
description = "Fedora CoreOS release stream (e.g. testing, stable)"
description = "Fedora CoreOS release stream (e.g. stable, testing, next)"
default = "stable"
validation {
condition = contains(["stable", "testing", "next"], var.os_stream)
error_message = "The os_stream must be stable, testing, or next."
}
}
variable "os_version" {

2
bare-metal/fedora-coreos/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
template = "~> 2.1"
null = "~> 2.1"

5
bare-metal/flatcar-linux/kubernetes/variables.tf
View File

@ -13,6 +13,11 @@ variable "matchbox_http_endpoint" {
variable "os_channel" {
type = string
description = "Channel for a Flatcar Linux (flatcar-stable, flatcar-beta, flatcar-alpha, flatcar-edge)"
validation {
condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_channel)
error_message = "The os_channel must be flatcar-stable, flatcar-beta, flatcar-alpha, or flatcar-edge."
}
}
variable "os_version" {

2
bare-metal/flatcar-linux/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
template = "~> 2.1"
null = "~> 2.1"

2
digital-ocean/fedora-coreos/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
template = "~> 2.1"
null = "~> 2.1"

2
digital-ocean/flatcar-linux/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
template = "~> 2.1"
null = "~> 2.1"

5
google-cloud/fedora-coreos/kubernetes/variables.tf
View File

@ -50,6 +50,11 @@ variable "os_stream" {
type = string
description = "Fedora CoreOS stream for compute instances (e.g. stable, testing, next)"
default = "stable"
validation {
condition = contains(["stable", "testing", "next"], var.os_stream)
error_message = "The os_stream must be stable, testing, or next."
}
}
variable "disk_size" {

2
google-cloud/fedora-coreos/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
google = ">= 2.19, < 4.0"
template = "~> 2.1"

5
google-cloud/fedora-coreos/kubernetes/workers/variables.tf
View File

@ -38,6 +38,11 @@ variable "os_stream" {
type = string
description = "Fedora CoreOS stream for compute instances (e.g. stable, testing, next)"
default = "stable"
validation {
condition = contains(["stable", "testing", "next"], var.os_stream)
error_message = "The os_stream must be stable, testing, or next."
}
}
variable "disk_size" {

2
google-cloud/fedora-coreos/kubernetes/workers/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
google = ">= 2.19, < 4.0"
template = "~> 2.1"

2
google-cloud/flatcar-linux/kubernetes/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
google = ">= 2.19, < 4.0"
template = "~> 2.1"

2
google-cloud/flatcar-linux/kubernetes/workers/versions.tf
View File

@ -1,7 +1,7 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.12.26, < 0.14.0"
required_version = "~> 0.13.0"
required_providers {
google = ">= 2.19, < 4.0"
template = "~> 2.1"