From a03d1c0cfac6c0d9dd15b1917b6fe074c86e2fa1 Mon Sep 17 00:00:00 2001
From: Matt Boersma <Matt.Boersma@microsoft.com>
Date: Tue, 24 Jul 2018 10:45:51 -0600
Subject: [PATCH] [AKS] remove "KeyVaultSecretRef" and rename to
 "ManagedClusterServicePrincipalProfile"

---
 .../stable/2018-03-31/managedClusters.json    | 33 +++----------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json
index b53f6cb77a24..374873f52428 100644
--- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json
@@ -750,28 +750,7 @@
         "Standard_NV6"
       ]
     },
-    "KeyVaultSecretRef": {
-      "properties": {
-        "vaultID": {
-          "type": "string",
-          "description": "Key vault identifier."
-        },
-        "secretName": {
-          "type": "string",
-          "description": "The secret name."
-        },
-        "version": {
-          "type": "string",
-          "description": "The secret version."
-        }
-      },
-      "description": "Reference to a secret stored in Azure Key Vault.",
-      "required": [
-        "vaultID",
-        "secretName"
-      ]
-    },
-    "ContainerServiceServicePrincipalProfile": {
+    "ManagedClusterServicePrincipalProfile": {
       "properties": {
         "clientId": {
           "type": "string",
@@ -780,13 +759,9 @@
         "secret": {
           "type": "string",
           "description": "The secret password associated with the service principal in plain text."
-        },
-        "keyVaultSecretRef": {
-          "$ref": "#/definitions/KeyVaultSecretRef",
-          "description": "Reference to a secret stored in Azure Key Vault."
         }
       },
-      "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs. Either secret or keyVaultSecretRef must be specified.",
+      "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs.",
       "required": [
         "clientId"
       ]
@@ -1121,8 +1096,8 @@
           "description": "Profile for Linux VMs in the container service cluster."
         },
         "servicePrincipalProfile": {
-          "$ref": "#/definitions/ContainerServiceServicePrincipalProfile",
-          "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs. Either secret or keyVaultSecretRef must be specified."
+          "$ref": "#/definitions/ManagedClusterServicePrincipalProfile",
+          "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs."
         },
         "addonProfiles": {
           "additionalProperties": {