From c3dee12ead256420a15253e82ad2ca3d8f20e653 Mon Sep 17 00:00:00 2001 From: MANISH KUMAR Date: Fri, 25 Jun 2021 08:42:38 +0000 Subject: [PATCH 1/2] Revert "Merge branch 'revert-ad49ebab' into 'master'" This reverts merge request !360 --- devops/custom_pipelines/infrastructure/service-resource.tfvars | 2 +- infra/modules/providers/azure/aks/testing/unit_test.go | 2 +- infra/modules/providers/azure/aks/variables.tf | 2 +- infra/templates/osdu-r3-mvp/service_resources/override.tfvars | 2 +- infra/templates/osdu-r3-mvp/service_resources/terraform.tfvars | 2 +- infra/templates/osdu-r3-mvp/service_resources/variables.tf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devops/custom_pipelines/infrastructure/service-resource.tfvars b/devops/custom_pipelines/infrastructure/service-resource.tfvars index 812c2f15..7e4fb0d7 100644 --- a/devops/custom_pipelines/infrastructure/service-resource.tfvars +++ b/devops/custom_pipelines/infrastructure/service-resource.tfvars @@ -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" diff --git a/infra/modules/providers/azure/aks/testing/unit_test.go b/infra/modules/providers/azure/aks/testing/unit_test.go index 59fc84c3..653c7258 100644 --- a/infra/modules/providers/azure/aks/testing/unit_test.go +++ b/infra/modules/providers/azure/aks/testing/unit_test.go @@ -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{ diff --git a/infra/modules/providers/azure/aks/variables.tf b/infra/modules/providers/azure/aks/variables.tf index 3dd2bcb8..dd4e64c6 100644 --- a/infra/modules/providers/azure/aks/variables.tf +++ b/infra/modules/providers/azure/aks/variables.tf @@ -59,7 +59,7 @@ variable "max_pods" { variable "kubernetes_version" { type = string - default = "1.17.9" + default = "1.19.11" } variable "admin_user" { diff --git a/infra/templates/osdu-r3-mvp/service_resources/override.tfvars b/infra/templates/osdu-r3-mvp/service_resources/override.tfvars index d76cf45a..20de2124 100644 --- a/infra/templates/osdu-r3-mvp/service_resources/override.tfvars +++ b/infra/templates/osdu-r3-mvp/service_resources/override.tfvars @@ -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" diff --git a/infra/templates/osdu-r3-mvp/service_resources/terraform.tfvars b/infra/templates/osdu-r3-mvp/service_resources/terraform.tfvars index 73d2947d..7af5a0d6 100644 --- a/infra/templates/osdu-r3-mvp/service_resources/terraform.tfvars +++ b/infra/templates/osdu-r3-mvp/service_resources/terraform.tfvars @@ -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 diff --git a/infra/templates/osdu-r3-mvp/service_resources/variables.tf b/infra/templates/osdu-r3-mvp/service_resources/variables.tf index 0259860f..6c5b06d5 100644 --- a/infra/templates/osdu-r3-mvp/service_resources/variables.tf +++ b/infra/templates/osdu-r3-mvp/service_resources/variables.tf @@ -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" { -- GitLab From 4ccd8996affce65c94e4a544cefc318416002c63 Mon Sep 17 00:00:00 2001 From: Vivek Ojha Date: Fri, 25 Jun 2021 15:21:02 +0530 Subject: [PATCH 2/2] redis master replica count set to 1 and nodepool kuberntes version set to var kubernetes version --- infra/modules/providers/azure/aks/main.tf | 20 ++++++++++--------- .../providers/azure/redis-cache/main.tf | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/infra/modules/providers/azure/aks/main.tf b/infra/modules/providers/azure/aks/main.tf index 1c55cd9f..d7e6c956 100644 --- a/infra/modules/providers/azure/aks/main.tf +++ b/infra/modules/providers/azure/aks/main.tf @@ -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 { diff --git a/infra/modules/providers/azure/redis-cache/main.tf b/infra/modules/providers/azure/redis-cache/main.tf index 3e900fba..dea96984 100644 --- a/infra/modules/providers/azure/redis-cache/main.tf +++ b/infra/modules/providers/azure/redis-cache/main.tf @@ -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 -- GitLab