Fix config, use correct key reference

Author: janboll

cluster-service/config.tmpl.mk

@@ -21,6 +21,6 @@ DB_SECRET_TARGET = {{ ternary "deploy-azure-db-secret" "deploy-local-db-secret"
 DEVOPS_MSI_ID ?= {{ .aroDevopsMsiId }}
 
 # MGMT CLUSTER KVs
-MGMT_RESOURCEGROUP ?= {{ .managementClusterRG }}
-CX_SECRETS_KV_NAME ?= {{ .cxKeyVaultName }}
-CX_MI_KV_NAME ?= {{ .msiKeyVaultName }}
+MGMT_RESOURCEGROUP ?= {{ .mgmt.rg }}
+CX_SECRETS_KV_NAME ?= {{ .cxKeyVault.name }}
+CX_MI_KV_NAME ?= {{ .msiKeyVault.name }}

hypershiftoperator/config.tmpl.mk

@@ -12,8 +12,8 @@ RESOURCEGROUP ?= {{ .mgmt.rg }}
 REGIONAL_RESOURCEGROUP ?= {{ .regionRG }}
 ZONE_NAME ?= {{ .regionalDNSSubdomain }}.{{ .baseDnsZoneName }}
 AKS_NAME ?= {{ .aksName }}
-HYPERSHIFT_NAMESPACE ?= {{ .hypershiftNamespace}}
-EXTERNAL_DNS_MI_NAME ?= {{ .externalDNSManagedIdentityName }}
+HYPERSHIFT_NAMESPACE ?= {{ .hypershift.namespace}}
+EXTERNAL_DNS_MI_NAME ?= {{ .hypershift.externalDNSManagedIdentityName }}
 
 HO_CHART_DIR ?= deploy/helm/charts/hypershift-operator
-HO_ADDITIONAL_INSTALL_ARG ?= {{ .hypershiftAdditionalInstallArg }}
+HO_ADDITIONAL_INSTALL_ARG ?= {{ .hypershift.additionalInstallArg }}