From fb666c44b3b78ab085a4cbd823bd5aa252f743b1 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Wed, 5 Aug 2020 10:32:28 +0200
Subject: [PATCH] Quoted type constraints are deprecated (#6497)
---
.../openstack/modules/compute/variables.tf | 20 +++++++++----------
.../openstack/modules/network/variables.tf | 2 +-
contrib/terraform/openstack/variables.tf | 16 +++++++--------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/contrib/terraform/openstack/modules/compute/variables.tf b/contrib/terraform/openstack/modules/compute/variables.tf
index b85f56250..608cafe4a 100644
--- a/contrib/terraform/openstack/modules/compute/variables.tf
+++ b/contrib/terraform/openstack/modules/compute/variables.tf
@@ -65,39 +65,39 @@ variable "network_id" {
}
variable "k8s_master_fips" {
- type = "list"
+ type = list
}
variable "k8s_master_no_etcd_fips" {
- type = "list"
+ type = list
}
variable "k8s_node_fips" {
- type = "list"
+ type = list
}
variable "k8s_nodes_fips" {
- type = "map"
+ type = map
}
variable "bastion_fips" {
- type = "list"
+ type = list
}
variable "bastion_allowed_remote_ips" {
- type = "list"
+ type = list
}
variable "master_allowed_remote_ips" {
- type = "list"
+ type = list
}
variable "k8s_allowed_remote_ips" {
- type = "list"
+ type = list
}
variable "k8s_allowed_egress_ips" {
- type = "list"
+ type = list
}
variable "k8s_nodes" {}
@@ -113,7 +113,7 @@ variable "supplementary_node_groups" {
}
variable "worker_allowed_ports" {
- type = "list"
+ type = list
}
variable "use_access_ip" {}
diff --git a/contrib/terraform/openstack/modules/network/variables.tf b/contrib/terraform/openstack/modules/network/variables.tf
index 1b2660f37..f8eb64884 100644
--- a/contrib/terraform/openstack/modules/network/variables.tf
+++ b/contrib/terraform/openstack/modules/network/variables.tf
@@ -7,7 +7,7 @@ variable "network_dns_domain" {}
variable "cluster_name" {}
variable "dns_nameservers" {
- type = "list"
+ type = list
}
variable "subnet_cidr" {}
diff --git a/contrib/terraform/openstack/variables.tf b/contrib/terraform/openstack/variables.tf
index 334e6c678..6976929c4 100644
--- a/contrib/terraform/openstack/variables.tf
+++ b/contrib/terraform/openstack/variables.tf
@@ -131,7 +131,7 @@ variable "network_name" {
variable "network_dns_domain" {
description = "dns_domain for the internal network"
- type = "string"
+ type = string
default = null
}
@@ -142,13 +142,13 @@ variable "use_neutron" {
variable "subnet_cidr" {
description = "Subnet CIDR block."
- type = "string"
+ type = string
default = "10.0.0.0/24"
}
variable "dns_nameservers" {
description = "An array of DNS name server names used by hosts in this subnet."
- type = "list"
+ type = list
default = []
}
@@ -178,30 +178,30 @@ variable "supplementary_node_groups" {
variable "bastion_allowed_remote_ips" {
description = "An array of CIDRs allowed to SSH to hosts"
- type = "list"
+ type = list(string)
default = ["0.0.0.0/0"]
}
variable "master_allowed_remote_ips" {
description = "An array of CIDRs allowed to access API of masters"
- type = "list"
+ type = list(string)
default = ["0.0.0.0/0"]
}
variable "k8s_allowed_remote_ips" {
description = "An array of CIDRs allowed to SSH to hosts"
- type = "list"
+ type = list(string)
default = []
}
variable "k8s_allowed_egress_ips" {
description = "An array of CIDRs allowed for egress traffic"
- type = "list"
+ type = list(string)
default = ["0.0.0.0/0"]
}
variable "worker_allowed_ports" {
- type = "list"
+ type = list
default = [
{
--
GitLab