Skip to content

Commit 15c1e24

Browse files
committed
move deprecated variables into deprecated_variables.tf file
1 parent 31a557d commit 15c1e24

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

deprecated_variables.tf

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
variable "agents_taints" {
2+
type = list(string)
3+
default = null
4+
description = "DEPRECATED, (Optional) A list of the taints added to new nodes during node pool create and scale. Changing this forces a new resource to be created."
5+
}
6+
7+
variable "api_server_subnet_id" {
8+
type = string
9+
default = null
10+
description = "DEPRECATED, (Optional) The ID of the Subnet where the API server endpoint is delegated to."
11+
}
12+
13+
variable "rbac_aad_client_app_id" {
14+
type = string
15+
default = null
16+
description = "DEPRECATED, The Client ID of an Azure Active Directory Application."
17+
}
18+
19+
variable "rbac_aad_server_app_id" {
20+
type = string
21+
default = null
22+
description = "DEPRECATED, The Server ID of an Azure Active Directory Application."
23+
}
24+
25+
variable "rbac_aad_server_app_secret" {
26+
type = string
27+
default = null
28+
description = "DEPRECATED, The Server Secret of an Azure Active Directory Application."
29+
}

v4/main_override.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ resource "azurerm_kubernetes_cluster" "main" {
295295
kubernetes_version,
296296
# we might have a random suffix in cluster's name so we have to ignore it here, but we've traced user supplied cluster name by `null_resource.kubernetes_cluster_name_keeper` so when the name is changed we'll recreate this resource.
297297
name,
298-
api_server_access_profile, network_profile[0].load_balancer_profile[0].outbound_ip_address_ids, network_profile[0].load_balancer_profile[0].outbound_ip_prefix_ids]
298+
network_profile[0].load_balancer_profile[0].outbound_ip_address_ids,
299+
network_profile[0].load_balancer_profile[0].outbound_ip_prefix_ids,
300+
]
299301
}
300302
}

variables.tf

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,6 @@ variable "agents_tags" {
210210
description = "(Optional) A mapping of tags to assign to the Node Pool."
211211
}
212212

213-
variable "agents_taints" {
214-
type = list(string)
215-
default = null
216-
description = "(Optional) A list of the taints added to new nodes during node pool create and scale. Changing this forces a new resource to be created."
217-
}
218-
219213
variable "agents_type" {
220214
type = string
221215
default = "VirtualMachineScaleSets"
@@ -228,12 +222,6 @@ variable "api_server_authorized_ip_ranges" {
228222
description = "(Optional) The IP ranges to allow for incoming traffic to the server nodes."
229223
}
230224

231-
variable "api_server_subnet_id" {
232-
type = string
233-
default = null
234-
description = "(Optional) The ID of the Subnet where the API server endpoint is delegated to."
235-
}
236-
237225
variable "attached_acr_id_map" {
238226
type = map(string)
239227
default = {}
@@ -794,7 +782,7 @@ variable "maintenance_window" {
794782
allowed = optional(list(object({
795783
day = string
796784
hours = set(number)
797-
})), [
785+
})), [
798786
]),
799787
not_allowed = optional(list(object({
800788
end = string
@@ -1285,31 +1273,13 @@ variable "rbac_aad_azure_rbac_enabled" {
12851273
description = "(Optional) Is Role Based Access Control based on Azure AD enabled?"
12861274
}
12871275

1288-
variable "rbac_aad_client_app_id" {
1289-
type = string
1290-
default = null
1291-
description = "The Client ID of an Azure Active Directory Application."
1292-
}
1293-
12941276
variable "rbac_aad_managed" {
12951277
type = bool
12961278
default = false
12971279
description = "Is the Azure Active Directory integration Managed, meaning that Azure will create/manage the Service Principal used for integration."
12981280
nullable = false
12991281
}
13001282

1301-
variable "rbac_aad_server_app_id" {
1302-
type = string
1303-
default = null
1304-
description = "The Server ID of an Azure Active Directory Application."
1305-
}
1306-
1307-
variable "rbac_aad_server_app_secret" {
1308-
type = string
1309-
default = null
1310-
description = "The Server Secret of an Azure Active Directory Application."
1311-
}
1312-
13131283
variable "rbac_aad_tenant_id" {
13141284
type = string
13151285
default = null

0 commit comments

Comments
 (0)