From 2253fc8e45ee826095f69a5ebbe2cc35db53156d Mon Sep 17 00:00:00 2001 From: hbc Date: Wed, 3 Nov 2021 11:51:47 +0800 Subject: [PATCH 1/5] feat: define OIDC issuer profile --- .../2021-11-01-preview/managedClusters.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json index 9d2b0d5e1f36..00b86a878bf9 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json @@ -3740,6 +3740,10 @@ "title": "The pod identity profile of the Managed Cluster.", "description": "See [use AAD pod identity](https://docs.microsoft.com/azure/aks/use-azure-ad-pod-identity) for more details on AAD pod identity integration." }, + "oidcIssuerProfile": { + "$ref": "#/definitions/ManagedClusterOIDCIssuerProfile", + "description": "The OIDC issuer profile of the Managed Cluster." + }, "nodeResourceGroup": { "type": "string", "description": "The name of the resource group containing agent pool nodes." @@ -4406,6 +4410,20 @@ "title": "The pod identity profile of the Managed Cluster.", "description": "See [use AAD pod identity](https://docs.microsoft.com/azure/aks/use-azure-ad-pod-identity) for more details on pod identity integration." }, + "ManagedClusterOIDCIssuerProfile": { + "properties": { + "issuerURL": { + "readOnly": true, + "type": "string", + "description": "The OIDC issuer url of this cluster." + }, + "enabled": { + "type": "boolean", + "description": "Whether the OIDC issuer is enabled." + } + }, + "description": "The OIDC issuer profile of the Managed Cluster." + }, "ManagedClusterUpgradeProfile": { "properties": { "id": { From 66220a93dbae2fae1ee1b85d5a80e8fee412f6a7 Mon Sep 17 00:00:00 2001 From: hbc Date: Mon, 22 Nov 2021 13:52:28 +0800 Subject: [PATCH 2/5] fix: add `OIDC` to custom-wrods.txt --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 8a82526fe146..4727d5ceabe4 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1385,6 +1385,7 @@ offboard offboards officedocument OLTP +OIDC onboarded Onboarding Onboards From 6e5ec0a49d9e443ad3b99098d78a7085e16aaf11 Mon Sep 17 00:00:00 2001 From: hbc Date: Mon, 22 Nov 2021 14:56:50 +0800 Subject: [PATCH 3/5] doc: update description --- .../preview/2021-11-01-preview/managedClusters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json index 00b86a878bf9..98ec1331476b 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json @@ -4415,7 +4415,7 @@ "issuerURL": { "readOnly": true, "type": "string", - "description": "The OIDC issuer url of this cluster." + "description": "The OIDC issuer url of the Managed Cluster." }, "enabled": { "type": "boolean", @@ -5648,4 +5648,4 @@ "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file From 6c524b6bf0c867b4029abccbf9fd389a5b909e5f Mon Sep 17 00:00:00 2001 From: hbc Date: Tue, 23 Nov 2021 10:54:44 +0800 Subject: [PATCH 4/5] style: fix style check --- .../preview/2021-11-01-preview/managedClusters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json index 98ec1331476b..efd8502a537a 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json @@ -5648,4 +5648,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} From 47997dfb0b82ae3cc1eb670039192924d59d9fe4 Mon Sep 17 00:00:00 2001 From: hbc Date: Wed, 24 Nov 2021 14:16:46 +0800 Subject: [PATCH 5/5] fix: add type --- .../preview/2021-11-01-preview/managedClusters.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json index efd8502a537a..8862de4eb956 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2021-11-01-preview/managedClusters.json @@ -4411,6 +4411,7 @@ "description": "See [use AAD pod identity](https://docs.microsoft.com/azure/aks/use-azure-ad-pod-identity) for more details on pod identity integration." }, "ManagedClusterOIDCIssuerProfile": { + "type": "object", "properties": { "issuerURL": { "readOnly": true,