Merge f661d35 into ffb6a5d

Azure · Sep 27, 2024 · 6b3c8dd · 6b3c8dd
2 parents ffb6a5d + f661d35
commit 6b3c8dd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/...ification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/SessionPools.json b/...ification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/SessionPools.json
@@ -404,7 +404,7 @@
       "description": "Session pool private registry credentials.",
       "type": "object",
       "properties": {
-        "registryServer": {
+        "server": {
           "description": "Container registry server.",
           "type": "string"
         },
@@ -415,6 +415,10 @@
         "passwordSecretRef": {
           "description": "The name of the secret that contains the registry login password",
           "type": "string"
+        },
+        "identity": {
+          "description": "A Managed Identity to use to authenticate with Azure Container Registry. For user-assigned identities, use the full user-assigned identity Resource ID. For system-assigned identities, use 'system'",
+          "type": "string"
         }
       }
     },

diff --git a/...anager/Microsoft.App/preview/2024-08-02-preview/examples/SessionPools_CreateOrUpdate.json b/...anager/Microsoft.App/preview/2024-08-02-preview/examples/SessionPools_CreateOrUpdate.json
@@ -88,6 +88,10 @@
             ],
             "ingress": {
               "targetPort": 80
+            },
+            "registryCredentials": {
+              "server": "test.azurecr.io",
+              "identity": "/subscriptions/7a497526-bb8d-4816-9795-db1418a1f977/resourcegroups/test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testSP"
             }
           },
           "sessionNetworkConfiguration": {
@@ -137,6 +141,10 @@
             ],
             "ingress": {
               "targetPort": 80
+            },
+            "registryCredentials": {
+              "server": "test.azurecr.io",
+              "identity": "/subscriptions/7a497526-bb8d-4816-9795-db1418a1f977/resourcegroups/test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testSP"
             }
           },
           "sessionNetworkConfiguration": {

diff --git a/.../resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/SessionPools_Get.json b/.../resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/SessionPools_Get.json
@@ -47,6 +47,10 @@
             ],
             "ingress": {
               "targetPort": 80
+            },
+            "registryCredentials": {
+              "server": "test.azurecr.io",
+              "identity": "/subscriptions/7a497526-bb8d-4816-9795-db1418a1f977/resourcegroups/test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testSP"
             }
           },
           "sessionNetworkConfiguration": {