Merge branch 'update_cert_variable' into 'master'

Change variable for istio appgw cert

See merge request !433

charts/helm-config.yaml

@@ -40,7 +40,8 @@ global:
     username: #{istio-username}#
     password: #{istio-password}#
     loadBalancerIP: #{istio-int-load-balancer-ip}#
-    dns_host: #{DNS_HOST}#    
+    dns_host: #{ISTIO_DNS_HOST}# 
+    enableIstioKeyvaultCert: #{ENABLE_ISTIO_KEYVAULT_CERT}#     
   ################################################################################
   # Specify the resource limits
   #

charts/osdu-istio/templates/cert-checker-cronjob.yaml

@@ -111,7 +111,7 @@ spec:
               # Log In in Azure
               az login --service-principal -u ${client_id} -p ${client_secret} --tenant ${tenant_id}
 
-{{- if .Values.global.ingress.enableKeyvaultCert }}
+{{- if .Values.global.istio.enableIstioKeyvaultCert  }}
 
               K8S_CERT_SECRET=appgw-ssl-cert
               K8S_NAMESPACE_NAME=istio-system

charts/osdu-istio/templates/cert-init-job.yaml

@@ -82,7 +82,7 @@ spec:
           az login --service-principal -u ${client_id} -p ${client_secret} --tenant ${tenant_id}
           az aks get-credentials --resource-group ${ENV_SR_GROUP_NAME} --name ${ENV_CLUSTER_NAME}
 
-{{- if .Values.global.ingress.enableKeyvaultCert }}
+{{- if .Values.global.istio.enableIstioKeyvaultCert  }}
 
           K8S_CERT_SECRET=appgw-ssl-cert
           K8S_NAMESPACE_NAME=istio-system

charts/osdu-istio/templates/istio-gateway.yaml

@@ -16,7 +16,7 @@ spec:
         - "{{ .Values.global.istio.dns_host }}"
       tls:
         mode: SIMPLE
-        {{- if .Values.global.ingress.enableKeyvaultCert }}
+        {{- if .Values.istio.ingress.enableIstioKeyvaultCert  }}
         credentialName: appgw-ssl-cert
         {{ else }}
         credentialName: osdu-certificate

docs/autoscaling.md

@@ -64,7 +64,7 @@ In this approach, we use certificate uploaded by customer to Keyvault.
 ###  Use uploaded certificate
 
 1. Once upload is complete, Go to Azure Devops Project that you have set up for code mirroring.
-2. Setup library variable `ENABLE_KEYVAULT_CERT` in Variable group **Azure - OSDU**
+2. Setup library variable `ENABLE_ISTIO_KEYVAULT_CERT` in Variable group **Azure - OSDU**
    to `true`.
 3. Run the pipeline following pipeline manually for master branch:
    - `osdu-istio`