Commit c29af70f authored by MANISH KUMAR's avatar MANISH KUMAR
Browse files

Merge branch 'revert-2ac6026e' into 'master'

Revert "Merge branch 'revert-ad49ebab' into 'master'"

See merge request !367
parents 4d82bda2 4ccd8996
Pipeline #48281 passed with stages
in 1 minute and 20 seconds
......@@ -23,7 +23,7 @@ resource_tags = {
}
# Kubernetes Settings
kubernetes_version = "1.18.8"
kubernetes_version = "1.19.11"
aks_agent_vm_size = "Standard_E4s_v3"
aks_agent_vm_count = "5"
subnet_aks_prefix = "10.10.2.0/23"
......@@ -72,6 +72,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "internal" {
min_count = var.auto_scaling_default_node == true ? var.agent_vm_count : null
availability_zones = var.availability_zones
mode = "System"
orchestrator_version = var.kubernetes_version
}
resource "azurerm_kubernetes_cluster" "main" {
......@@ -93,15 +94,16 @@ resource "azurerm_kubernetes_cluster" "main" {
}
default_node_pool {
name = "default"
node_count = var.agent_vm_count
vm_size = var.agent_vm_size
os_disk_size_gb = var.agent_vm_disk
vnet_subnet_id = var.vnet_subnet_id
enable_auto_scaling = var.auto_scaling_default_node
max_pods = var.max_pods
max_count = var.auto_scaling_default_node == true ? var.max_node_count : null
min_count = var.auto_scaling_default_node == true ? var.agent_vm_count : null
name = "default"
node_count = var.agent_vm_count
vm_size = var.agent_vm_size
os_disk_size_gb = var.agent_vm_disk
vnet_subnet_id = var.vnet_subnet_id
enable_auto_scaling = var.auto_scaling_default_node
max_pods = var.max_pods
max_count = var.auto_scaling_default_node == true ? var.max_node_count : null
min_count = var.auto_scaling_default_node == true ? var.agent_vm_count : null
orchestrator_version = var.kubernetes_version
}
network_profile {
......
......@@ -42,7 +42,7 @@ func asMap(t *testing.T, jsonString string) map[string]interface{} {
func TestTemplate(t *testing.T) {
expectedResult := asMap(t, `{
"kubernetes_version": "1.17.9"
"kubernetes_version": "1.19.11"
}`)
testFixture := infratests.UnitTestFixture{
......
......@@ -59,7 +59,7 @@ variable "max_pods" {
variable "kubernetes_version" {
type = string
default = "1.17.9"
default = "1.19.11"
}
variable "admin_user" {
......
......@@ -27,6 +27,7 @@ resource "azurerm_redis_cache" "arc" {
minimum_tls_version = var.minimum_tls_version
tags = var.resource_tags
zones = var.zones
replicas_per_master = 1
redis_configuration {
maxmemory_reserved = var.memory_features.maxmemory_reserved
......
......@@ -34,7 +34,7 @@ resource_tags = {
}
# Kubernetes Settings
kubernetes_version = "1.18.17"
kubernetes_version = "1.19.11"
aks_agent_vm_size = "Standard_E4s_v3"
aks_agent_vm_count = "5"
subnet_aks_prefix = "10.10.2.0/23"
......
......@@ -39,7 +39,7 @@ resource_tags = {
}
# Kubernetes Settings
kubernetes_version = "1.18.17"
kubernetes_version = "1.19.11"
aks_agent_vm_size = "Standard_E4s_v3"
aks_agent_vm_count = "5"
aks_agent_vm_disk = 128
......
......@@ -248,7 +248,7 @@ variable "aks_agent_vm_disk" {
variable "kubernetes_version" {
type = string
default = "1.17.11"
default = "1.19.11"
}
variable "ssh_public_key_file" {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment