Skip to content

Commit 18e2678

Browse files
authored
Merge pull request #95 from cgascoig/fix_defaults_for_optional_vars
Fix defaults for optional variables
2 parents 7e27532 + b6aa28e commit 18e2678

File tree

11 files changed

+37
-0
lines changed

11 files changed

+37
-0
lines changed

modules/cluster/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,19 @@ variable "wait_for_completion" {
3333
type = bool
3434
default = false
3535
description = "Wait for cluster completion true/false"
36+
nullable = false
3637
}
3738
variable "runtime_policy_moid" {
3839
type = string
3940
description = "MOID for the Runtime Policy that is being consumed."
4041
default = ""
42+
nullable = false
4143
}
4244
variable "trusted_registry_policy_moid" {
4345
type = string
4446
description = "MOID for the Trusted Registry Policy that is being consumed."
4547
default = ""
48+
nullable = false
4649
}
4750

4851
variable "net_config_moid" {
@@ -60,6 +63,7 @@ variable "action" {
6063
type = string
6164
description = "Action for cluster. i.e 'Deploy' 'Unassign'"
6265
default = "Unassign"
66+
nullable = false
6367
}
6468

6569

modules/cluster_addon_profile/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ variable "cluster_moid" {
2222
type = string
2323
description = "MOID of the cluster to be associated with this cluster addon profile."
2424
default = ""
25+
nullable = false
2526
}
2627
variable "org_name" {
2728
type = string

modules/infra_provider/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,25 @@ variable "description" {
66
type = string
77
default = ""
88
description = "Description to be used to describe the infrastructure provider policy"
9+
nullable = false
910
}
1011
variable "instance_type_moid" {
1112
type = string
1213
description = "MOID of the Instance type mapped to this provider"
1314
default = ""
15+
nullable = false
1416
}
1517
variable "node_group_moid" {
1618
type = string
1719
description = "MOID of the Node Group mapped to this provider"
1820
default = ""
21+
nullable = false
1922
}
2023
variable "infra_config_policy_moid" {
2124
type = string
2225
description = "MOID of the Infra Config Policy mapped to this provider"
2326
default = ""
27+
nullable = false
2428
}
2529
variable "tags" {
2630
type = list(map(string))

modules/ip_pool/variables.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variable "description" {
66
type = string
77
default = ""
88
description = "Description to be used to describe the IP Pool Policy."
9+
nullable = false
910
}
1011
variable "name" {
1112
type = string
@@ -35,6 +36,7 @@ variable "secondary_dns" {
3536
type = string
3637
description = "Secondary DNS Server for this pool."
3738
default = ""
39+
nullable = false
3840
}
3941

4042
variable "tags" {

modules/k8s_network/variables.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ variable "pod_cidr" {
1515
type = string
1616
description = "Pod CIDR Block to be used to assign POD IP Addresses."
1717
default = "100.65.0.0/16"
18+
nullable = false
1819
}
1920
variable "service_cidr" {
2021
type = string
2122
description = "Service CIDR Block used to assign cluster service IP addresses."
2223
default = "100.64.0.0/24"
24+
nullable = false
2325
}
2426
variable "cni" {
2527
type = string
2628
description = "Supported CNI type. Currently we only support Calico.* Calico - Calico CNI plugin as described in https://github.com/projectcalico/cni-plugin."
2729
default = "Calico"
30+
nullable = false
2831
}
2932

3033
variable "tags" {

modules/k8s_sysconfig/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variable "description" {
66
type = string
77
default = ""
88
description = "Description to be used to describe the K8s sysconfig profile."
9+
nullable = false
910
}
1011
variable "policy_name" {
1112
type = string

modules/node_profile/variables.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ variable "description" {
66
type = string
77
description = "Descripton of the Node Profile."
88
default = ""
9+
nullable = false
910
}
1011
variable "action" {
1112
default = "No-op"
1213
description = "User Initiated action. Options are {{Delete|Deploy|Ready|No-op|Unassign}."
1314
type = string
15+
nullable = false
1416
}
1517
variable "profile_type" {
1618
type = string
1719
description = "Type of profile to be created. i.e Master or Worker"
1820
default = ""
21+
nullable = false
1922
}
2023
variable "min_size" {
2124
type = number

modules/runtime_policy/variables.tf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ variable "description" {
1010
type = string
1111
default = ""
1212
description = "Description to be used to describe the addon policy"
13+
nullable = false
1314
}
1415
variable "docker_bridge_cidr" {
1516
type = string
1617
default = ""
1718
description = "Docker Bridge CIDR network to be specified."
19+
nullable = false
1820
}
1921
variable "proxy_http_hostname" {
2022
type = string
@@ -24,21 +26,25 @@ variable "proxy_http_password" {
2426
type = string
2527
default = ""
2628
description = "The password for the HTTP Proxy."
29+
nullable = false
2730
}
2831
variable "proxy_http_username" {
2932
type = string
3033
default = ""
3134
description = "The username for the HTTP Proxy."
35+
nullable = false
3236
}
3337
variable "proxy_http_port" {
3438
type = number
3539
default = 8080
3640
description = "The HTTP Proxy port number.The port number of the HTTP proxy must be between 1 and 65535, inclusive."
41+
nullable = false
3742
}
3843
variable "proxy_http_protocol" {
3944
type = string
4045
default = "http"
4146
description = " Protocol to use for the HTTPS Proxy."
47+
nullable = false
4248
}
4349
variable "proxy_https_hostname" {
4450
type = string
@@ -48,26 +54,31 @@ variable "proxy_https_password" {
4854
type = string
4955
default = ""
5056
description = "The password for the HTTPS Proxy."
57+
nullable = false
5158
}
5259
variable "proxy_https_username" {
5360
type = string
5461
default = ""
5562
description = "The username for the HTTPS Proxy."
63+
nullable = false
5664
}
5765
variable "proxy_https_port" {
5866
type = number
5967
default = 8443
6068
description = "The HTTPS Proxy port number.The port number of the HTTPS proxy must be between 1 and 65535, inclusive."
69+
nullable = false
6170
}
6271
variable "proxy_https_protocol" {
6372
type = string
6473
default = "https"
6574
description = " Protocol to use for the HTTPS Proxy."
75+
nullable = false
6676
}
6777
variable "docker_no_proxy" {
6878
type = list(string)
6979
default = []
7080
description = "Networks excluded from the proxy."
81+
nullable = false
7182
}
7283
variable "tags" {
7384
type = list(map(string))

modules/trusted_registry/variables.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variable "description" {
66
type = string
77
default = ""
88
description = "Description to be used to describe the trusted registry profile."
9+
nullable = false
910
}
1011

1112
variable "policy_name" {
@@ -17,11 +18,13 @@ variable "root_ca_registries" {
1718
type = list(string)
1819
description = "List of root CA certificates."
1920
default = []
21+
nullable = false
2022
}
2123
variable "unsigned_registries" {
2224
type = list(string)
2325
description = "List of unsigned registries to be supported."
2426
default = []
27+
nullable = false
2528
}
2629
variable "tags" {
2730
type = list(map(string))

modules/version/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ variable "description" {
1414
type = string
1515
default = ""
1616
description = "Description to be used to describe the k8s version profile."
17+
nullable = false
1718
}
1819
variable "tags" {
1920
type = list(map(string))

0 commit comments

Comments
 (0)