Merge pull request #200 from kbst/aksk8sversion

pst · web-flow · commit 23957595639e · 2021-06-04T22:52:03.000+02:00
Add kubernetes_version attribute to AKS module fix #198
diff --git a/azurerm/_modules/aks/main.tf b/azurerm/_modules/aks/main.tf
@@ -8,6 +8,7 @@ resource "azurerm_kubernetes_cluster" "current" {
   resource_group_name = data.azurerm_resource_group.current.name
   dns_prefix          = var.dns_prefix
   sku_tier            = var.sku_tier
+  kubernetes_version  = var.kubernetes_version
 
   role_based_access_control {
     enabled = true
diff --git a/azurerm/_modules/aks/variables.tf b/azurerm/_modules/aks/variables.tf
@@ -155,3 +155,8 @@ variable "sku_tier" {
   description = "The SKU tier to use for the cluster. Possible values are 'Free' and 'Paid'. Defaults to 'Free'."
   default     = "Free"
 }
+
+variable "kubernetes_version" {
+  type        = string
+  description = "Version of Kubernetes to use when creating the cluster. If not specified, latest version will be used."
+}
diff --git a/azurerm/cluster/configuration.tf b/azurerm/cluster/configuration.tf
@@ -51,4 +51,6 @@ locals {
 
   disable_managed_identities = lookup(local.cfg, "disable_managed_identities", false)
   user_assigned_identity_id  = lookup(local.cfg, "user_assigned_identity_id", null)
+
+  kubernetes_version = lookup(local.cfg, "kubernetes_version", null)
 }
diff --git a/azurerm/cluster/main.tf b/azurerm/cluster/main.tf
@@ -58,4 +58,6 @@ module "cluster" {
 
   disable_managed_identities = local.disable_managed_identities
   user_assigned_identity_id  = local.user_assigned_identity_id
+
+  kubernetes_version = local.kubernetes_version
 }

Original file line number	Diff line number	Diff line change
`@@ -155,3 +155,8 @@ variable "sku_tier" {`
`155`	`155`	`description = "The SKU tier to use for the cluster. Possible values are 'Free' and 'Paid'. Defaults to 'Free'."`
`156`	`156`	`default = "Free"`
`157`	`157`	`}`
	`158`	`+`
	`159`	`+variable "kubernetes_version" {`
	`160`	`+ type = string`
	`161`	`+ description = "Version of Kubernetes to use when creating the cluster. If not specified, latest version will be used."`
	`162`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,6 @@ locals {`
`51`	`51`
`52`	`52`	`disable_managed_identities = lookup(local.cfg, "disable_managed_identities", false)`
`53`	`53`	`user_assigned_identity_id = lookup(local.cfg, "user_assigned_identity_id", null)`
	`54`	`+`
	`55`	`+ kubernetes_version = lookup(local.cfg, "kubernetes_version", null)`
`54`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,6 @@ module "cluster" {`
`58`	`58`
`59`	`59`	`disable_managed_identities = local.disable_managed_identities`
`60`	`60`	`user_assigned_identity_id = local.user_assigned_identity_id`
	`61`	`+`
	`62`	`+ kubernetes_version = local.kubernetes_version`
`61`	`63`	`}`