Change Istio AppGW

charts/helm-config.yaml

@@ -37,6 +37,8 @@ global:
   # based64 encoded username and password
   #
   istio:
+    minReplicaCount: 10
+    maxReplicaCount: 30
     username: #{istio-username}#
     password: #{istio-password}#
     loadBalancerIP: #{istio-int-load-balancer-ip}#

charts/osdu-istio/templates/profile.yaml

@@ -42,4 +42,13 @@ spec:
     ingressGateways:
     - name: istio-ingressgateway
       enabled: true
-{{- end }} 
\ No newline at end of file
+      k8s:
+        hpaSpec:
+          minReplicas: {{ .Values.global.istio.minReplicaCount }}
+          maxReplicas: {{ .Values.global.istio.maxReplicaCount }}
+          metrics:
+            - type: Resource
+              resource:
+                name: cpu
+                targetAverageUtilization: 40
+{{- end }} 

infra/modules/providers/azure/appgw/main.tf

@@ -144,7 +144,7 @@ resource "azurerm_application_gateway" "main" {
       cookie_based_affinity = "Disabled"
       port                  = 80
       protocol              = "Http"
-      request_timeout       = 1
+      request_timeout       = var.request_timeout
     }
   }
 
@@ -192,7 +192,7 @@ resource "azurerm_application_gateway" "main" {
     cookie_based_affinity = "Disabled"
     port                  = 443
     protocol              = "Https"
-    request_timeout       = 1
+    request_timeout       = var.request_timeout
     host_name             = length(var.host_name) == 0 ? null : var.host_name
   }
 

infra/modules/providers/azure/appgw/variables.tf

@@ -127,6 +127,12 @@ variable "gateway_zones" {
   default     = null
 }
 
+variable "request_timeout" {
+  description = "The request timeout in seconds"
+  type        = number
+  default     = 1
+}
+
 variable "http_enabled" {
   description = "A toggle for enabling or not of http listener"
   type        = bool

infra/templates/osdu-r3-mvp/service_resources/main.tf

@@ -359,11 +359,11 @@ module "istio_appgateway" {
 
   gateway_zones = local.gateway_zones
 
-  resource_tags = var.resource_tags
-  min_capacity  = var.appgw_min_capacity
-  max_capacity  = var.appgw_max_capacity
-  http_enabled  = false
-  host_name     = var.aks_dns_host
+  resource_tags   = var.resource_tags
+  min_capacity    = var.istio_appgw_min_capacity
+  max_capacity    = var.istio_appgw_max_capacity
+  host_name       = var.aks_dns_host
+  request_timeout = 300
 }
 
 // Give AGIC Identity Access rights to Change the Application Gateway

infra/templates/osdu-r3-mvp/service_resources/variables.tf

@@ -365,6 +365,18 @@ variable "appgw_max_capacity" {
   default     = 10
 }
 
+variable "istio_appgw_min_capacity" {
+  description = "Minimum number of instances to run in the Istio App Gateway"
+  type        = number
+  default     = 2
+}
+
+variable "istio_appgw_max_capacity" {
+  description = "Maximum number of instances to run in the Istio App Gateway"
+  type        = number
+  default     = 10
+}
+
 variable "cosmosdb_replica_location" {
   description = "The name of the Azure region to host replicated data. i.e. 'East US' 'East US 2'. More locations can be found at https://azure.microsoft.com/en-us/global-infrastructure/locations/"
   type        = string