diff --git a/aws/fedora-coreos/kubernetes/variables.tf b/aws/fedora-coreos/kubernetes/variables.tf index ec53aeb6..53e3f59b 100644 --- a/aws/fedora-coreos/kubernetes/variables.tf +++ b/aws/fedora-coreos/kubernetes/variables.tf @@ -47,7 +47,7 @@ variable "os_stream" { default = "stable" validation { - condition = contains(["stable", "testing", "next"], var.os_stream) + condition = contains(["stable", "testing", "next"], var.os_stream) error_message = "The os_stream must be stable, testing, or next." } } @@ -166,7 +166,7 @@ variable "arch" { default = "amd64" validation { - condition = var.arch == "amd64" || var.arch == "arm64" + condition = var.arch == "amd64" || var.arch == "arm64" error_message = "The arch must be amd64 or arm64." } } diff --git a/aws/fedora-coreos/kubernetes/workers/variables.tf b/aws/fedora-coreos/kubernetes/workers/variables.tf index 76790ea8..aadb4ade 100644 --- a/aws/fedora-coreos/kubernetes/workers/variables.tf +++ b/aws/fedora-coreos/kubernetes/workers/variables.tf @@ -40,7 +40,7 @@ variable "os_stream" { default = "stable" validation { - condition = contains(["stable", "testing", "next"], var.os_stream) + condition = contains(["stable", "testing", "next"], var.os_stream) error_message = "The os_stream must be stable, testing, or next." } } @@ -128,7 +128,7 @@ variable "arch" { default = "amd64" validation { - condition = var.arch == "amd64" || var.arch == "arm64" + condition = var.arch == "amd64" || var.arch == "arm64" error_message = "The arch must be amd64 or arm64." } } diff --git a/aws/flatcar-linux/kubernetes/ami.tf b/aws/flatcar-linux/kubernetes/ami.tf index be0cc387..6e28a661 100644 --- a/aws/flatcar-linux/kubernetes/ami.tf +++ b/aws/flatcar-linux/kubernetes/ami.tf @@ -1,7 +1,7 @@ locals { # Pick a Flatcar Linux AMI # flatcar-stable -> Flatcar Linux AMI - ami_id = data.aws_ami.flatcar.image_id + ami_id = data.aws_ami.flatcar.image_id channel = split("-", var.os_image)[1] } diff --git a/aws/flatcar-linux/kubernetes/variables.tf b/aws/flatcar-linux/kubernetes/variables.tf index 2136aad5..9444bff1 100644 --- a/aws/flatcar-linux/kubernetes/variables.tf +++ b/aws/flatcar-linux/kubernetes/variables.tf @@ -47,7 +47,7 @@ variable "os_image" { default = "flatcar-stable" validation { - condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image) + 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." } } diff --git a/aws/flatcar-linux/kubernetes/workers/ami.tf b/aws/flatcar-linux/kubernetes/workers/ami.tf index be0cc387..6e28a661 100644 --- a/aws/flatcar-linux/kubernetes/workers/ami.tf +++ b/aws/flatcar-linux/kubernetes/workers/ami.tf @@ -1,7 +1,7 @@ locals { # Pick a Flatcar Linux AMI # flatcar-stable -> Flatcar Linux AMI - ami_id = data.aws_ami.flatcar.image_id + ami_id = data.aws_ami.flatcar.image_id channel = split("-", var.os_image)[1] } diff --git a/aws/flatcar-linux/kubernetes/workers/variables.tf b/aws/flatcar-linux/kubernetes/workers/variables.tf index 507a0da2..3b6b45ea 100644 --- a/aws/flatcar-linux/kubernetes/workers/variables.tf +++ b/aws/flatcar-linux/kubernetes/workers/variables.tf @@ -40,7 +40,7 @@ variable "os_image" { default = "flatcar-stable" validation { - condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image) + 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." } } diff --git a/azure/flatcar-linux/kubernetes/variables.tf b/azure/flatcar-linux/kubernetes/variables.tf index 473c40b4..4c80460c 100644 --- a/azure/flatcar-linux/kubernetes/variables.tf +++ b/azure/flatcar-linux/kubernetes/variables.tf @@ -52,7 +52,7 @@ variable "os_image" { default = "flatcar-stable" validation { - condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image) + 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." } } diff --git a/azure/flatcar-linux/kubernetes/workers/variables.tf b/azure/flatcar-linux/kubernetes/workers/variables.tf index f0675aa8..bcdc45a9 100644 --- a/azure/flatcar-linux/kubernetes/workers/variables.tf +++ b/azure/flatcar-linux/kubernetes/workers/variables.tf @@ -50,7 +50,7 @@ variable "os_image" { default = "flatcar-stable" validation { - condition = contains(["flatcar-stable", "flatcar-beta", "flatcar-alpha", "flatcar-edge"], var.os_image) + 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." } } diff --git a/bare-metal/fedora-coreos/kubernetes/variables.tf b/bare-metal/fedora-coreos/kubernetes/variables.tf index 6a339c50..d01dc683 100644 --- a/bare-metal/fedora-coreos/kubernetes/variables.tf +++ b/bare-metal/fedora-coreos/kubernetes/variables.tf @@ -16,7 +16,7 @@ variable "os_stream" { default = "stable" validation { - condition = contains(["stable", "testing", "next"], var.os_stream) + condition = contains(["stable", "testing", "next"], var.os_stream) error_message = "The os_stream must be stable, testing, or next." } } diff --git a/bare-metal/flatcar-linux/kubernetes/variables.tf b/bare-metal/flatcar-linux/kubernetes/variables.tf index 26eb4ea0..ad8d3876 100644 --- a/bare-metal/flatcar-linux/kubernetes/variables.tf +++ b/bare-metal/flatcar-linux/kubernetes/variables.tf @@ -15,7 +15,7 @@ variable "os_channel" { 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) + 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." } } diff --git a/google-cloud/fedora-coreos/kubernetes/variables.tf b/google-cloud/fedora-coreos/kubernetes/variables.tf index f483cda0..dce03d6c 100644 --- a/google-cloud/fedora-coreos/kubernetes/variables.tf +++ b/google-cloud/fedora-coreos/kubernetes/variables.tf @@ -52,7 +52,7 @@ variable "os_stream" { default = "stable" validation { - condition = contains(["stable", "testing", "next"], var.os_stream) + condition = contains(["stable", "testing", "next"], var.os_stream) error_message = "The os_stream must be stable, testing, or next." } } diff --git a/google-cloud/fedora-coreos/kubernetes/workers/variables.tf b/google-cloud/fedora-coreos/kubernetes/workers/variables.tf index 2985fb4d..576886dc 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/variables.tf +++ b/google-cloud/fedora-coreos/kubernetes/workers/variables.tf @@ -40,7 +40,7 @@ variable "os_stream" { default = "stable" validation { - condition = contains(["stable", "testing", "next"], var.os_stream) + condition = contains(["stable", "testing", "next"], var.os_stream) error_message = "The os_stream must be stable, testing, or next." } }