fixes #1030 (unused variables) and #1094 - update flexvol (#1097)

* fixes #1030 (unused variables) and #1094 - update flexvol

cluster/azure/keyvault_flexvol/variables.tf

@@ -35,7 +35,7 @@ variable "flexvol_keyvault_certificate_permissions" {
 variable "flexvol_deployment_url" {
   description = "The url to the yaml file for deploying the KeyVault flex volume."
   type        = string
-  default     = "https://raw.githubusercontent.com/Azure/kubernetes-keyvault-flexvol/31f593250045e8dc861e13a8e943284787b7f17e/deployment/kv-flexvol-installer.yaml"
+  default     = "https://raw.githubusercontent.com/Azure/kubernetes-keyvault-flexvol/master/deployment/kv-flexvol-installer.yaml"
 }
 
 variable "output_directory" {

cluster/environments/azure-single-keyvault/README.md

@@ -40,13 +40,9 @@ keyvault_name = "myVault"
 
 keyvault_resource_group = "myResourceGroup"
 
-address_space = "10.39.0.0/16"
-
-subnet_prefixes = "10.39.0.0/24"
-
 vnet_name = "myVnet"
 
-vnet_subnet_id = "/subscriptions/<subscriptionId>/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+subnet_name = "mySubnet"
 
 #--------------------------------------------------------------
 

cluster/environments/azure-single-keyvault/terraform.tfvars

@@ -5,9 +5,6 @@
 keyvault_name = "my-keyvault"
 keyvault_resource_group = "my-global-rg"
 
-address_space = "<cidr for cluster address space>"
-subnet_prefixes = "10.39.0.0/16"
-
 subnet_name = "<subnet name>"
 vnet_name = "<vnet name>"
 

cluster/environments/azure-single-keyvault/variables.tf

@@ -3,10 +3,6 @@ variable "acr_enabled" {
   default = "true"
 }
 
-variable "address_space" {
-  type = string
-}
-
 variable "agent_vm_count" {
   type = string
 }
@@ -91,10 +87,6 @@ variable "service_principal_secret" {
   type = string
 }
 
-variable "subnet_prefixes" {
-  type = string
-}
-
 variable "vnet_name" {
   type = string
 }

test/bedrock_Azure_common_kv_test.go

@@ -122,7 +122,6 @@ func TestIT_Bedrock_AzureCommon_KV_Test(t *testing.T) {
 		TerraformDir: azureSingleKeyvaultFolder,
 		Upgrade:      true,
 		Vars: map[string]interface{}{
-			"address_space":            addressSpace,
 			"agent_vm_count":           "3",
 			"agent_vm_size":            "Standard_D2s_v3",
 			"cluster_name":             k8sName,
@@ -136,7 +135,6 @@ func TestIT_Bedrock_AzureCommon_KV_Test(t *testing.T) {
 			"ssh_public_key":           publickey,
 			"service_principal_id":     clientid,
 			"service_principal_secret": clientsecret,
-			"subnet_prefixes":          "10.39.0.0/16",
 			"subnet_name":              subnetName,
 			"vnet_name":                vnetName,
 		},