diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/common/2021-05-01-preview/definitions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/common/2021-05-01-preview/definitions.json new file mode 100644 index 000000000000..45c6850f3d05 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/common/2021-05-01-preview/definitions.json @@ -0,0 +1,62 @@ +{ + "swagger": "2.0", + "info": { + "version": "2021-05-01-preview", + "title": "Common types and definitions", + "description": "Definitions and parameters common for all resource types of KubernetesConfiguration RP" + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": {}, + "definitions": {}, + "parameters": { + "ClusterRpParameter": { + "name": "clusterRp", + "in": "path", + "required": true, + "type": "string", + "enum": [ + "Microsoft.ContainerService", + "Microsoft.Kubernetes" + ], + "description": "The Kubernetes cluster RP - either Microsoft.ContainerService (for AKS clusters) or Microsoft.Kubernetes (for OnPrem K8S clusters).", + "x-ms-parameter-location": "method" + }, + "ClusterResourceNameParameter": { + "name": "clusterResourceName", + "in": "path", + "required": true, + "type": "string", + "enum": [ + "managedClusters", + "connectedClusters" + ], + "description": "The Kubernetes cluster resource name - either managedClusters (for AKS clusters) or connectedClusters (for OnPrem K8S clusters).", + "x-ms-parameter-location": "method" + }, + "ClusterNameParameter": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the kubernetes cluster.", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateExtension.json index fe176951756a..03da19eedb9f 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateExtension.json @@ -4,10 +4,10 @@ "resourceGroupName": "rg1", "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", - "extensionInstanceName": "ClusterMonitor", + "extensionName": "ClusterMonitor", "api-version": "2021-05-01-preview", "clusterName": "clusterName1", - "extensionInstance": { + "extension": { "properties": { "extensionType": "azuremonitor-containers", "autoUpgradeMinorVersion": true, @@ -28,13 +28,61 @@ } }, "responses": { + "201": { + "headers": { + "Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}", + "x-ms-async-operation-timeout": "PT48H" + }, + "description": "Details of the Kubernetes Extension's current status.", + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor", + "type": "Microsoft.KubernetesConfiguration/extensions", + "name": "ClusterMonitor", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2021-05-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2021-05-08T05:10:57.027Z" + }, + "properties": { + "extensionType": "azuremonitor-containers", + "autoUpgradeMinorVersion": true, + "releaseTrain": "Preview", + "version": "0.1.4", + "scope": { + "cluster": { + "releaseNamespace": "kube-system" + } + }, + "configurationSettings": { + "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", + "omsagent.env.clusterName": "clusterName1" + }, + "provisioningState": "Creating", + "statuses": [] + } + } + }, "200": { - "headers": {}, + "headers": { + "Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}", + "x-ms-async-operation-timeout": "PT48H" + }, "description": "Details of the Kubernetes Extension's current status.", "body": { "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor", "type": "Microsoft.KubernetesConfiguration/extensions", "name": "ClusterMonitor", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2021-05-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2021-05-08T05:10:57.027Z" + }, "properties": { "extensionType": "azuremonitor-containers", "autoUpgradeMinorVersion": true, @@ -49,11 +97,8 @@ "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", "omsagent.env.clusterName": "clusterName1" }, - "installState": "Pending", - "statuses": [], - "creationTime": "2020-06-08T05:10:57.027Z", - "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z" + "provisioningState": "Creating", + "statuses": [] } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateSourceControlConfiguration.json index ab5287b38c73..eb5a9418057c 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateSourceControlConfiguration.json @@ -19,6 +19,7 @@ "protectedSetting1Key": "protectedSetting1Value" }, "enableHelmOperator": true, + "sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=", "helmOperatorProperties": { "chartVersion": "0.3.0", "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" @@ -34,6 +35,14 @@ "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", "name": "SRS_GitHubConfig", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-09-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-09-08T05:10:57.027Z" + }, "properties": { "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", "operatorNamespace": "SRS_Namespace", @@ -47,10 +56,11 @@ "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" }, "repositoryPublicKey": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAqvTzeL+BWgcHnC1CTBRMg2ZfCh9khlrvb2avFHiGG24rRvjLHlKqtfiiw+cZNCKskUyVKqamD2RHrhyn/wXvJ9fFRt0LhYLKn4hJhJaPx4IawdWnW1MUv4U+Mr8o3Cxps4EmiZemqri3fOrhzEIlPL272whKpzlDLV7L4W1XQIGmVPwQ93HTzKEd5uHuEuw6JyFftDDLlCnd3Q1kQ7HOabFEfcSSr9cMx2MU4j/Pjuf3Rd/CzeksvKtU009KSXSnWKm8LL1fihSc1H1WDTi8iuZtT63hsNYH1yxrPRpMVScs3ufLViAGO9NEHQSgDdl/OERQQqKisUn2Qm6adgmftw== rsa-key-20190909", + "sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=", "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Pending", - "lastConfigApplied": "2020-06-08T05:25:32.122Z", + "lastConfigApplied": "2020-09-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" } @@ -64,6 +74,14 @@ "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", "name": "SRS_GitHubConfig", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-09-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-09-08T05:10:57.027Z" + }, "properties": { "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", "operatorNamespace": "SRS_Namespace", @@ -77,10 +95,11 @@ "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" }, "repositoryPublicKey": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAqvTzeL+BWgcHnC1CTBRMg2ZfCh9khlrvb2avFHiGG24rRvjLHlKqtfiiw+cZNCKskUyVKqamD2RHrhyn/wXvJ9fFRt0LhYLKn4hJhJaPx4IawdWnW1MUv4U+Mr8o3Cxps4EmiZemqri3fOrhzEIlPL272whKpzlDLV7L4W1XQIGmVPwQ93HTzKEd5uHuEuw6JyFftDDLlCnd3Q1kQ7HOabFEfcSSr9cMx2MU4j/Pjuf3Rd/CzeksvKtU009KSXSnWKm8LL1fihSc1H1WDTi8iuZtT63hsNYH1yxrPRpMVScs3ufLViAGO9NEHQSgDdl/OERQQqKisUn2Qm6adgmftw== rsa-key-20190909", + "sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=", "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Pending", - "lastConfigApplied": "2020-06-08T05:25:32.122Z", + "lastConfigApplied": "2020-09-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/DeleteExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/DeleteExtension.json index 2bf7d0a82d7e..6833265594b6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/DeleteExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/DeleteExtension.json @@ -4,11 +4,18 @@ "resourceGroupName": "rg1", "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", - "extensionInstanceName": "ClusterMonitor", + "extensionName": "ClusterMonitor", "api-version": "2021-05-01-preview", "clusterName": "clusterName1" }, "responses": { + "202": { + "headers": { + "Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}", + "x-ms-async-operation-timeout": "PT1H" + }, + "description": "Details of the Kubernetes Extension's current status." + }, "200": {}, "204": {} } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetAsyncOperationStatus.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetAsyncOperationStatus.json new file mode 100644 index 000000000000..f012668066e3 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetAsyncOperationStatus.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "extensionName": "ClusterMonitor", + "api-version": "2021-05-01-preview", + "clusterName": "clusterName1", + "operationId": "99999999-9999-9999-9999-999999999999" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/99999999-9999-9999-9999-999999999999", + "name": "99999999-9999-9999-9999-999999999999", + "status": "Succeeded", + "properties": {}, + "error": null + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetExtension.json index 625941cdd2d7..ca96095deed9 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetExtension.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", - "extensionInstanceName": "ClusterMonitor", + "extensionName": "ClusterMonitor", "api-version": "2021-05-01-preview", "clusterName": "clusterName1" }, @@ -16,6 +16,14 @@ "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor", "type": "Microsoft.KubernetesConfiguration/extensions", "name": "ClusterMonitor", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2021-05-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2021-05-08T05:10:57.027Z" + }, "properties": { "extensionType": "azuremonitor-containers", "autoUpgradeMinorVersion": true, @@ -30,11 +38,8 @@ "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", "omsagent.env.clusterName": "clusterName1" }, - "installState": "Pending", - "statuses": [], - "creationTime": "2020-06-08T05:10:57.027Z", - "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z" + "provisioningState": "Creating", + "statuses": [] } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetSourceControlConfiguration.json index 07bf7b44379c..2c6a47deb4c4 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/GetSourceControlConfiguration.json @@ -16,6 +16,14 @@ "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", "name": "SRS_GitHubConfig", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-09-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-09-08T05:10:57.027Z" + }, "properties": { "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", "operatorNamespace": "SRS_Namespace", @@ -28,10 +36,11 @@ "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" }, "repositoryPublicKey": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAqvTzeL+BWgcHnC1CTBRMg2ZfCh9khlrvb2avFHiGG24rRvjLHlKqtfiiw+cZNCKskUyVKqamD2RHrhyn/wXvJ9fFRt0LhYLKn4hJhJaPx4IawdWnW1MUv4U+Mr8o3Cxps4EmiZemqri3fOrhzEIlPL272whKpzlDLV7L4W1XQIGmVPwQ93HTzKEd5uHuEuw6JyFftDDLlCnd3Q1kQ7HOabFEfcSSr9cMx2MU4j/Pjuf3Rd/CzeksvKtU009KSXSnWKm8LL1fihSc1H1WDTi8iuZtT63hsNYH1yxrPRpMVScs3ufLViAGO9NEHQSgDdl/OERQQqKisUn2Qm6adgmftw== rsa-key-20190909", + "sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=", "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Pending", - "lastConfigApplied": "2020-06-08T05:25:32.122Z", + "lastConfigApplied": "2020-09-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListAsyncOperationStatus.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListAsyncOperationStatus.json new file mode 100644 index 000000000000..d9935ec7e207 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListAsyncOperationStatus.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "extensionName": "ClusterMonitor", + "api-version": "2021-05-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/99999999-9999-9999-9999-999999999999", + "name": "99999999-9999-9999-9999-999999999999", + "status": "Deleting", + "properties": {}, + "error": null + }, + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/88888888-8888-8888-8888-888888888888", + "name": "88888888-8888-8888-8888-888888888888", + "status": "Creating", + "properties": {}, + "error": null + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListExtensions.json index e3c8a3373db8..c90248b9547b 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListExtensions.json @@ -15,6 +15,14 @@ "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor", "type": "Microsoft.KubernetesConfiguration/extensions", "name": "ClusterMonitor", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2021-05-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2021-05-08T05:10:57.027Z" + }, "properties": { "extensionType": "azuremonitor-containers", "autoUpgradeMinorVersion": true, @@ -25,16 +33,26 @@ "releaseNamespace": "kube-system" } }, - "installState": "Pending", - "creationTime": "2020-06-08T05:10:57.027Z", - "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z" + "configurationSettings": { + "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", + "omsagent.env.clusterName": "clusterName1" + }, + "provisioningState": "Creating", + "statuses": [] } }, { "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/BackupVault01", "type": "Microsoft.KubernetesConfiguration/extensions", "name": "App1Monitor", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2021-05-08T04:09:23.011Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2021-05-08T04:09:23.011Z" + }, "properties": { "extensionType": "Microsoft.RecoveryServices/recoveryVault", "autoUpgradeMinorVersion": false, @@ -45,13 +63,13 @@ "releaseNamespace": "myKVNamespace" } }, - "installState": "Installed", - "creationTime": "2020-06-07T03:44:19.142Z", - "lastModifiedTime": "2020-06-07T03:44:19.142Z", - "lastStatusTime": "2020-06-07T04:09:23.011Z" + "configurationSettings": {}, + "provisioningState": "Creating", + "statuses": [] } } - ] + ], + "nextLink": null } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListSourceControlConfiguration.json index 462e411f5bf4..042572b24cff 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/ListSourceControlConfiguration.json @@ -15,12 +15,21 @@ "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", "name": "SRS_GitHubConfig", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-09-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-09-08T05:10:57.027Z" + }, "properties": { "repositoryUrl": "git@github.com:k8sdeveloper425/SRSClusterconfigs", "operatorNamespace": "SRS_Namespace", "operatorInstanceName": "SRSGitHubFluxOp-01", "operatorType": "Flux", "operatorScope": "namespace", + "sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=", "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Compliant" @@ -31,12 +40,21 @@ "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SCRS_GitHubConfig", "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", "name": "SCRS_GitHubConfig", + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-09-08T05:10:57.027Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-09-08T05:10:57.027Z" + }, "properties": { "repositoryUrl": "git@github.com:k8sdeveloper425/SCRSClusterconfigs", "operatorNamespace": "SCRS_Namespace", "operatorInstanceName": "SCRSGitHubFluxOp-02", "operatorType": "Flux", "operatorScope": "cluster", + "sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=", "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Compliant" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/OperationsList.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/OperationsList.json index 1ba122249714..b63a0d376b56 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/OperationsList.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/OperationsList.json @@ -6,58 +6,92 @@ "200": { "body": [ { - "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/read", + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/write", "display": { - "provider": "Microsoft KubernetesConfiguration", - "resource": "sourceControlConfigurations", - "operation": "Get Source Control Configuration", - "description": "Get the specified Source Control Configuration." - } + "operation": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/write", + "resource": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "description": "Creates or updates source control configuration.", + "provider": "Microsoft Kubernetes Configuration" + }, + "isDataAction": false, + "origin": "user,system" }, { - "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/write", + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/read", "display": { - "provider": "Microsoft KubernetesConfiguration", - "resource": "sourceControlConfigurations", - "operation": "Create a Source Control Configuration", - "description": "Create the Source Control Configuration specified." - } + "operation": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/read", + "resource": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "description": "Gets source control configuration.", + "provider": "Microsoft Kubernetes Configuration" + }, + "isDataAction": false, + "origin": "user,system" }, { "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/delete", "display": { - "provider": "Microsoft KubernetesConfiguration", - "resource": "sourceControlConfigurations", - "operation": "Delete Source Control Configuration", - "description": "Delete the specified Source Control Configuration." - } + "operation": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/delete", + "resource": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "description": "Deletes source control configuration.", + "provider": "Microsoft Kubernetes Configuration" + }, + "isDataAction": false, + "origin": "user,system" }, { "name": "Microsoft.KubernetesConfiguration/extensions/read", "display": { "provider": "Microsoft KubernetesConfiguration", "resource": "extensions", - "operation": "Get extension instance", - "description": "Get the specified Extension Instance." - } + "operation": "Get extension", + "description": "Get the specified Extension." + }, + "isDataAction": false, + "origin": "user,system" }, { "name": "Microsoft.KubernetesConfiguration/extensions/write", "display": { "provider": "Microsoft KubernetesConfiguration", "resource": "extensions", - "operation": "Create a Extension Instance", - "description": "Create the Extension Instance specified." - } + "operation": "Create a Extension", + "description": "Create the Extension specified." + }, + "isDataAction": false, + "origin": "user,system" }, { "name": "Microsoft.KubernetesConfiguration/extensions/delete", "display": { "provider": "Microsoft KubernetesConfiguration", "resource": "extensions", - "operation": "Delete Extension Instance", - "description": "Delete the specified Extension Instance." - } + "operation": "Delete Extension", + "description": "Delete the specified Extension." + }, + "isDataAction": false, + "origin": "user,system" + }, + { + "name": "Microsoft.KubernetesConfiguration/extensions/operations/read", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "extensions", + "operation": "Get Extension Async Operation Status", + "description": "Get the Status of the Extension Async Operation." + }, + "isDataAction": false, + "origin": "user,system" + }, + { + "name": "Microsoft.KubernetesConfiguration/register/action", + "display": { + "operation": "Microsoft.KubernetesConfiguration/register/action", + "resource": "Register", + "description": "Registers subscription to Microsoft.KubernetesConfiguration resource provider.", + "provider": "Microsoft Kubernetes Configuration" + }, + "isDataAction": false, + "origin": "user,system" } ] } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/UpdateExtension.json deleted file mode 100644 index 8d26cff09898..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/UpdateExtension.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subId1", - "resourceGroupName": "rg1", - "clusterRp": "Microsoft.Kubernetes", - "clusterResourceName": "connectedClusters", - "extensionInstanceName": "ClusterMonitor", - "api-version": "2021-05-01-preview", - "clusterName": "clusterName1", - "extensionInstance": { - "properties": { - "autoUpgradeMinorVersion": true, - "releaseTrain": "Stable" - } - } - }, - "responses": { - "200": { - "headers": {}, - "description": "Details of the Kubernetes Extension's current status.", - "body": { - "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor", - "type": "Microsoft.KubernetesConfiguration/extensions", - "name": "ClusterMonitor", - "properties": { - "extensionType": "azuremonitor-containers", - "autoUpgradeMinorVersion": true, - "releaseTrain": "Stable", - "version": "0.0.9", - "scope": { - "cluster": { - "releaseNamespace": "kube-system" - } - }, - "configurationSettings": { - "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", - "omsagent.env.clusterName": "clusterName1" - }, - "installState": "Pending", - "statuses": [], - "creationTime": "2020-06-08T05:10:57.027Z", - "lastModifiedTime": "2020-06-10T07:32:31.249Z", - "lastStatusTime": "2020-06-09T12:04:36.034Z" - } - } - } - } -} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/extensions.json index da979c979a6a..dd9cd4975641 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/extensions.json @@ -34,13 +34,13 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionInstanceName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionName}": { "put": { "tags": [ "Extensions", "ClusterExtensions" ], - "description": "Create a new Kubernetes Cluster Extension Instance.", + "description": "Create a new Kubernetes Cluster Extension.", "operationId": "Extensions_Create", "x-ms-examples": { "Create Extension": { @@ -49,49 +49,59 @@ }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { - "$ref": "#/parameters/ExtensionInstanceNameParameter" + "$ref": "#/parameters/ExtensionNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "name": "extensionInstance", + "name": "extension", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ExtensionInstance" + "$ref": "#/definitions/Extension" }, - "description": "Properties necessary to Create an Extension Instance." + "description": "Properties necessary to Create an Extension." } ], "responses": { + "201": { + "description": "Request received successfully.", + "schema": { + "$ref": "#/definitions/Extension" + } + }, "200": { - "description": "OK", + "description": "Request received successfully for an existing resource.", "schema": { - "$ref": "#/definitions/ExtensionInstance" + "$ref": "#/definitions/Extension" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" } }, "get": { @@ -99,7 +109,7 @@ "Extensions", "ClusterExtensions" ], - "description": "Gets details of the Kubernetes Cluster Extension Instance.", + "description": "Gets Kubernetes Cluster Extension.", "operationId": "Extensions_Get", "x-ms-examples": { "Get Extension": { @@ -108,196 +118,204 @@ }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { - "$ref": "#/parameters/ExtensionInstanceNameParameter" + "$ref": "#/parameters/ExtensionNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ExtensionInstance" + "$ref": "#/definitions/Extension" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } }, - "patch": { + "delete": { "tags": [ "Extensions", "ClusterExtensions" ], - "description": "Update an existing Kubernetes Cluster Extension Instance.", - "operationId": "Extensions_Update", + "description": "Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.", + "operationId": "Extensions_Delete", "x-ms-examples": { - "Create Extension": { - "$ref": "./examples/UpdateExtension.json" + "Delete Extension": { + "$ref": "./examples/DeleteExtension.json" } }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { - "$ref": "#/parameters/ExtensionInstanceNameParameter" + "$ref": "#/parameters/ExtensionNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "name": "extensionInstance", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/ExtensionInstanceUpdate" - }, - "description": "Properties to Update in the Extension Instance." + "name": "forceDelete", + "in": "query", + "description": "Delete the extension resource in Azure - not the normal asynchronous delete.", + "type": "boolean" } ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ExtensionInstance" - } + "description": "OK" + }, + "202": { + "description": "Accepted. The request has been accepted for processing." + }, + "204": { + "description": "No Content. The request has been accepted but the extension was not found." }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" } - }, - "delete": { + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions": { + "get": { "tags": [ "Extensions", "ClusterExtensions" ], - "description": "Delete a Kubernetes Cluster Extension Instance. This will cause the Agent to Uninstall the extension instance from the cluster.", - "operationId": "Extensions_Delete", + "description": "List all Extensions in the cluster.", + "operationId": "Extensions_List", "x-ms-examples": { - "Get Extension": { - "$ref": "./examples/DeleteExtension.json" + "List Extensions": { + "$ref": "./examples/ListExtensions.json" } }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ExtensionInstanceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { "200": { - "description": "OK. The request has been completed successfully." - }, - "204": { - "description": "No Content. The request has been accepted but the extension instance was not found." + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtensionsList" + } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionName}/operations": { "get": { "tags": [ - "Extensions", - "ClusterExtensions" + "Operations in a Cluster" ], - "description": "List all Source Control Configurations.", - "operationId": "Extensions_List", + "operationId": "OperationStatus_List", + "description": "List Async Operations, currently in progress, in a cluster", "x-ms-examples": { - "List Source Control Configuration": { - "$ref": "./examples/ListExtensions.json" + "AsyncOperationStatus List": { + "$ref": "./examples/ListAsyncOperationStatus.json" } }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ExtensionNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { "200": { - "description": "OK", + "description": "Operations in a cluster", "schema": { - "$ref": "#/definitions/ExtensionInstancesList" + "$ref": "#/definitions/OperationStatusList" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -305,181 +323,123 @@ "nextLinkName": "nextLink" } } - } - }, - "definitions": { - "SystemData": { - "description": "Top level metadata https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources", - "type": "object", - "properties": { - "createdBy": { - "description": "A string identifier for the identity that created the resource", - "type": "string", - "readOnly": true - }, - "createdByType": { - "description": "The type of identity that created the resource: user, application, managedIdentity, key", - "type": "string", - "readOnly": true - }, - "createdAt": { - "format": "date-time", - "description": "The timestamp of resource creation (UTC)", - "type": "string", - "readOnly": true - }, - "lastModifiedBy": { - "description": "A string identifier for the identity that last modified the resource", - "type": "string", - "readOnly": true - }, - "lastModifiedByType": { - "description": "The type of identity that last modified the resource: user, application, managedIdentity, key", - "type": "string", - "readOnly": true - }, - "lastModifiedAt": { - "format": "date-time", - "description": "The timestamp of resource last modification (UTC)", - "type": "string", - "readOnly": true - } - } - }, - "Resource": { - "description": "The Resource model definition.", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource Id" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - }, - "systemData": { - "description": "Top level metadata https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources", - "$ref": "#/definitions/SystemData" - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, - "ErrorResponse": { - "description": "Error response.", - "properties": { - "error": { - "description": "Error definition.", - "$ref": "#/definitions/ErrorDefinition" - } - } }, - "ErrorDefinition": { - "description": "Error definition.", - "readOnly": true, - "required": [ - "message", - "code" - ], - "properties": { - "code": { - "description": "Service specific error code which serves as the substatus for the HTTP error code.", - "type": "string", - "minimum": 100, - "maximum": 600 + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionName}/operations/{operationId}": { + "get": { + "tags": [ + "Operation Status" + ], + "operationId": "OperationStatus_Get", + "description": "Get Async Operation status", + "x-ms-examples": { + "AsyncOperationStatus Get": { + "$ref": "./examples/GetAsyncOperationStatus.json" + } }, - "message": { - "description": "Description of the error.", - "type": "string" + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" + }, + { + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "operationId", + "in": "path", + "description": "operation Id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Operation Status", + "schema": { + "$ref": "#/definitions/OperationStatusResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } } } - }, - "ConfigurationSettings": { - "description": "Name-value pairs for configuring the extensionInstance", - "additionalProperties": { - "type": "string" - } - }, - "ExtensionProtectedSettings": { - "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", - "additionalProperties": { - "type": "string" - } - }, - "ReleaseTrain": { - "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", - "type": "string", - "default": "Stable" - }, + } + }, + "definitions": { "ScopeCluster": { - "description": "Specifies that the scope of the extensionInstance is Cluster", + "description": "Specifies that the scope of the extension is Cluster", "type": "object", "properties": { "releaseNamespace": { - "description": "Namespace where the extension Release must be placed, for a Cluster scoped extensionInstance. If this namespace does not exist, it will be created", + "description": "Namespace where the extension Release must be placed, for a Cluster scoped extension. If this namespace does not exist, it will be created", "type": "string" } } }, "ScopeNamespace": { - "description": "Specifies that the scope of the extensionInstance is Namespace", + "description": "Specifies that the scope of the extension is Namespace", "type": "object", "properties": { "targetNamespace": { - "description": "Namespace where the extensionInstance will be created for an Namespace scoped extensionInstance. If this namespace does not exist, it will be created", + "description": "Namespace where the extension will be created for an Namespace scoped extension. If this namespace does not exist, it will be created", "type": "string" } } }, "Scope": { - "description": "Scope of the extensionInstance. It can be either Cluster or Namespace; but not both.", + "description": "Scope of the extension. It can be either Cluster or Namespace; but not both.", "type": "object", "properties": { "cluster": { "type": "object", - "description": "Specifies that the scope of the extensionInstance is Cluster", + "x-nullable": true, + "description": "Specifies that the scope of the extension is Cluster", "$ref": "#/definitions/ScopeCluster" }, "namespace": { "type": "object", - "description": "Specifies that the scope of the extensionInstance is Namespace", + "x-nullable": true, + "description": "Specifies that the scope of the extension is Namespace", "$ref": "#/definitions/ScopeNamespace" } } }, - "InstallStateDefinition": { - "description": "Status of installation of this instance of the extension.", + "provisioningState": { "type": "string", - "readOnly": true, + "description": "The provisioning state of the extension resource.", "enum": [ - "Pending", - "Installed", - "Failed" + "Succeeded", + "Failed", + "Canceled", + "Creating", + "Updating", + "Deleting" ], "x-ms-enum": { - "name": "InstallStateType", + "name": "ProvisioningState", "modelAsString": true } }, "ExtensionStatus": { - "description": "Status from this instance of the extension.", + "description": "Status from the extension.", "type": "object", "readOnly": true, "properties": { @@ -489,7 +449,7 @@ }, "displayStatus": { "type": "string", - "description": "Short description of status of this instance of the extension." + "description": "Short description of status of the extension." }, "level": { "type": "string", @@ -507,7 +467,7 @@ }, "message": { "type": "string", - "description": "Detailed message of the status from the Extension instance." + "description": "Detailed message of the status from the Extension." }, "time": { "type": "string", @@ -515,219 +475,184 @@ } } }, - "ConfigurationIdentity": { - "properties": { - "principalId": { - "readOnly": true, - "type": "string", - "description": "The principal id of the system assigned identity which is used by the configuration." - }, - "tenantId": { - "readOnly": true, - "type": "string", - "description": "The tenant id of the system assigned identity which is used by the configuration." - }, - "type": { - "type": "string", - "description": "The type of identity used for the configuration. Type 'SystemAssigned' will use an implicitly created identity. Type 'None' will not use Managed Identity for the configuration.", - "enum": [ - "SystemAssigned", - "None" - ], - "x-ms-enum": { - "name": "ResourceIdentityType", - "modelAsString": false - } - } - }, - "description": "Identity for the managed cluster." - }, - "ExtensionInstance": { - "description": "The Extension Instance object.", + "Extension": { + "description": "The Extension object.", "properties": { "properties": { "type": "object", "x-ms-client-flatten": true, - "description": "Properties of an Extension Instance resource", + "description": "Properties of an Extension resource", "properties": { "extensionType": { - "type": "string", - "description": "Type of the Extension, of which this resource is an instance of. It must be one of the Extension Types registered with Microsoft.KubernetesConfiguration by the Extension publisher." + "description": "Type of the Extension, of which this resource is an instance of. It must be one of the Extension Types registered with Microsoft.KubernetesConfiguration by the Extension publisher.", + "type": "string" }, "autoUpgradeMinorVersion": { - "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", - "type": "boolean" + "description": "Flag to note if this extension participates in auto upgrade of minor version, or not.", + "type": "boolean", + "default": true }, "releaseTrain": { - "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", - "$ref": "#/definitions/ReleaseTrain" + "description": "ReleaseTrain this extension participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", + "type": "string", + "default": "Stable" }, "version": { - "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version. autoUpgradeMinorVersion must be 'false'.", + "description": "Version of the extension for this extension, if it is 'pinned' to a specific version. autoUpgradeMinorVersion must be 'false'.", "type": "string" }, "scope": { - "description": "Scope at which the extension instance is installed.", + "description": "Scope at which the extension is installed.", "$ref": "#/definitions/Scope" }, "configurationSettings": { - "description": "Configuration settings, as name-value pairs for configuring this instance of the extension.", + "description": "Configuration settings, as name-value pairs for configuring this extension.", "type": "object", - "$ref": "#/definitions/ConfigurationSettings" + "x-nullable": true, + "additionalProperties": { + "type": "string" + } }, "configurationProtectedSettings": { - "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", + "description": "Configuration settings that are sensitive, as name-value pairs for configuring this extension.", "type": "object", - "$ref": "#/definitions/ExtensionProtectedSettings" + "x-nullable": true, + "x-ms-secret": true, + "additionalProperties": { + "type": "string" + } }, - "installState": { + "provisioningState": { + "description": "Status of installation of this extension.", "type": "string", - "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStateDefinition" + "readOnly": true, + "$ref": "#/definitions/provisioningState" }, "statuses": { + "description": "Status from this extension.", "type": "array", - "description": "Status from this instance of the extension.", + "x-nullable": true, "items": { "$ref": "#/definitions/ExtensionStatus" } }, - "creationTime": { - "type": "string", - "description": "DateLiteral (per ISO8601) noting the time the resource was created by the client (user).", - "readOnly": true - }, - "lastModifiedTime": { - "type": "string", - "description": "DateLiteral (per ISO8601) noting the time the resource was modified by the client (user).", - "readOnly": true - }, - "lastStatusTime": { - "type": "string", - "description": "DateLiteral (per ISO8601) noting the time of last status from the agent.", - "readOnly": true - }, "errorInfo": { - "type": "object", "description": "Error information from the Agent - e.g. errors during installation.", + "type": "object", + "readOnly": true, + "x-nullable": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail" + }, + "customLocationSettings": { + "description": "Custom Location settings properties.", + "type": "object", "readOnly": true, - "$ref": "#/definitions/ErrorDefinition" + "x-nullable": true, + "additionalProperties": { + "type": "string" + } }, - "identity": { - "$ref": "#/definitions/ConfigurationIdentity", - "description": "The identity of the configuration." + "packageUri": { + "description": "Uri of the Helm package", + "type": "string", + "readOnly": true, + "x-nullable": true } } + }, + "identity": { + "description": "Identity of the Extension resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/Identity" + }, + "systemData": { + "description": "Top level metadata https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" } ] }, - "ExtensionInstancesList": { - "description": "Result of the request to list Extension Instances. It contains a list of ExtensionInstance objects and a URL link to get the next set of results.", + "ExtensionsList": { + "description": "Result of the request to list Extensions. It contains a list of Extension objects and a URL link to get the next set of results.", "properties": { "value": { "type": "array", "readOnly": true, "items": { - "$ref": "#/definitions/ExtensionInstance" + "$ref": "#/definitions/Extension" }, - "description": "List of Extension Instances within a Kubernetes cluster." + "description": "List of Extensions within a Kubernetes cluster." }, "nextLink": { "type": "string", "readOnly": true, - "description": "URL to get the next set of extension instance objects, if any." + "description": "URL to get the next set of extension objects, if any." } } }, - "ExtensionInstanceUpdate": { - "description": "Update Extension Instance request object.", + "OperationStatusResult": { + "description": "The current status of an async operation.", + "type": "object", + "required": [ + "status" + ], "properties": { + "id": { + "description": "Fully qualified ID for the async operation.", + "type": "string" + }, + "name": { + "description": "Name of the async operation.", + "type": "string" + }, + "status": { + "description": "Operation status.", + "type": "string" + }, "properties": { + "description": "Additional information, if available.", "type": "object", - "x-ms-client-flatten": true, - "description": "Properties to update an Extension Instance resource", - "properties": { - "autoUpgradeMinorVersion": { - "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", - "type": "boolean" - }, - "releaseTrain": { - "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", - "$ref": "#/definitions/ReleaseTrain" - }, - "version": { - "description": "Version number of extension, to 'pin' to a specific version. autoUpgradeMinorVersion must be 'false'.", - "type": "string" - } + "x-nullable": true, + "additionalProperties": { + "type": "string" } + }, + "error": { + "description": "If present, details of the operation error.", + "type": "object", + "readOnly": true, + "x-nullable": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail" + } + } + }, + "OperationStatusList": { + "description": "The async operations in progress, in the cluster.", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/OperationStatusResult" + }, + "description": "List of async operations in progress, in the cluster." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to get the next set of Operation Result objects, if any." } } } }, "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" - }, - "ClusterRpParameter": { - "name": "clusterRp", - "in": "path", - "required": true, - "type": "string", - "enum": [ - "Microsoft.ContainerService", - "Microsoft.Kubernetes" - ], - "description": "The Kubernetes cluster RP - either Microsoft.ContainerService (for AKS clusters) or Microsoft.Kubernetes (for OnPrem K8S clusters).", - "x-ms-parameter-location": "method" - }, - "ClusterResourceNameParameter": { - "name": "clusterResourceName", - "in": "path", - "required": true, - "type": "string", - "enum": [ - "managedClusters", - "connectedClusters" - ], - "description": "The Kubernetes cluster resource name - either managedClusters (for AKS clusters) or connectedClusters (for OnPrem K8S clusters).", - "x-ms-parameter-location": "method" - }, - "ClusterNameParameter": { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the kubernetes cluster.", - "x-ms-parameter-location": "method" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "The API version to be used with the HTTP request." - }, - "ExtensionInstanceNameParameter": { - "name": "extensionInstanceName", + "ExtensionNameParameter": { + "name": "extensionName", "in": "path", - "description": "Name of an instance of the Extension.", + "description": "Name of the Extension.", "required": true, "type": "string", "x-ms-parameter-location": "method" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/kubernetesconfiguration.json index 4ed23685a57d..2324d6da9548 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/kubernetesconfiguration.json @@ -48,25 +48,25 @@ }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/SourceControlConfigurationNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -79,7 +79,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -97,25 +97,25 @@ }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/SourceControlConfigurationNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "name": "sourceControlConfiguration", @@ -143,7 +143,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -161,25 +161,25 @@ }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/SourceControlConfigurationNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -192,7 +192,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -213,22 +213,22 @@ }, "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ClusterRpParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterRpParameter" }, { - "$ref": "#/parameters/ClusterResourceNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterResourceNameParameter" }, { - "$ref": "#/parameters/ClusterNameParameter" + "$ref": "../../common/2021-05-01-preview/definitions.json#/parameters/ClusterNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -241,7 +241,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -264,7 +264,7 @@ "description": "List all the available operations the KubernetesConfiguration resource provider supports.", "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -277,7 +277,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -288,118 +288,6 @@ } }, "definitions": { - "SystemData": { - "description": "Top level metadata https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources", - "type": "object", - "properties": { - "createdBy": { - "description": "A string identifier for the identity that created the resource", - "type": "string", - "readOnly": true - }, - "createdByType": { - "description": "The type of identity that created the resource: user, application, managedIdentity, key", - "type": "string", - "readOnly": true - }, - "createdAt": { - "format": "date-time", - "description": "The timestamp of resource creation (UTC)", - "type": "string", - "readOnly": true - }, - "lastModifiedBy": { - "description": "A string identifier for the identity that last modified the resource", - "type": "string", - "readOnly": true - }, - "lastModifiedByType": { - "description": "The type of identity that last modified the resource: user, application, managedIdentity, key", - "type": "string", - "readOnly": true - }, - "lastModifiedAt": { - "format": "date-time", - "description": "The timestamp of resource last modification (UTC)", - "type": "string", - "readOnly": true - } - } - }, - "Resource": { - "description": "The Resource model definition.", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource Id" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - }, - "systemData": { - "description": "Top level metadata https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources", - "$ref": "#/definitions/SystemData" - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, - "Result": { - "description": "Sample result definition", - "properties": { - "sampleProperty": { - "type": "string", - "description": "Sample property of type string" - } - } - }, - "ErrorResponse": { - "description": "Error response.", - "properties": { - "error": { - "description": "Error definition.", - "$ref": "#/definitions/ErrorDefinition" - } - } - }, - "ErrorDefinition": { - "description": "Error definition.", - "readOnly": true, - "required": [ - "message", - "code" - ], - "properties": { - "code": { - "description": "Service specific error code which serves as the substatus for the HTTP error code.", - "type": "string", - "minimum": 100, - "maximum": 600 - }, - "message": { - "description": "Description of the error.", - "type": "string" - } - } - }, "ComplianceStatus": { "description": "Compliance Status details", "type": "object", @@ -576,11 +464,15 @@ "$ref": "#/definitions/ComplianceStatus" } } + }, + "systemData": { + "description": "Top level metadata https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" } ] }, @@ -658,60 +550,6 @@ } }, "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" - }, - "ClusterRpParameter": { - "name": "clusterRp", - "in": "path", - "required": true, - "type": "string", - "enum": [ - "Microsoft.ContainerService", - "Microsoft.Kubernetes" - ], - "description": "The Kubernetes cluster RP - either Microsoft.ContainerService (for AKS clusters) or Microsoft.Kubernetes (for OnPrem K8S clusters).", - "x-ms-parameter-location": "method" - }, - "ClusterResourceNameParameter": { - "name": "clusterResourceName", - "in": "path", - "required": true, - "type": "string", - "enum": [ - "managedClusters", - "connectedClusters" - ], - "description": "The Kubernetes cluster resource name - either managedClusters (for AKS clusters) or connectedClusters (for OnPrem K8S clusters).", - "x-ms-parameter-location": "method" - }, - "ClusterNameParameter": { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the kubernetes cluster.", - "x-ms-parameter-location": "method" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "The API version to be used with the HTTP request." - }, "SourceControlConfigurationNameParameter": { "name": "sourceControlConfigurationName", "in": "path", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2021-03-01/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2021-03-01/kubernetesconfiguration.json index e74239719a43..77b40eba2add 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2021-03-01/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2021-03-01/kubernetesconfiguration.json @@ -66,7 +66,7 @@ "$ref": "#/parameters/SourceControlConfigurationNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -115,7 +115,7 @@ "$ref": "#/parameters/SourceControlConfigurationNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "name": "sourceControlConfiguration", @@ -179,7 +179,7 @@ "$ref": "#/parameters/SourceControlConfigurationNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -228,7 +228,7 @@ "$ref": "#/parameters/ClusterNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -264,7 +264,7 @@ "description": "List all the available operations the KubernetesConfiguration resource provider supports.", "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -635,13 +635,6 @@ "description": "The name of the kubernetes cluster.", "x-ms-parameter-location": "method" }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "The API version to be used with the HTTP request." - }, "SourceControlConfigurationNameParameter": { "name": "sourceControlConfigurationName", "in": "path", diff --git a/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md b/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md index 91b45b331a14..63d496cd159c 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.azureresourceschema.md @@ -6,6 +6,7 @@ These settings apply only when `--azureresourceschema` is specified on the comma ``` yaml $(azureresourceschema) && $(multiapi) batch: + - tag: schema-kubernetesconfiguration-2021-05-01-preview - tag: schema-kubernetesconfiguration-2021-03-01 - tag: schema-kubernetesconfiguration-2020-10-01-preview - tag: schema-kubernetesconfiguration-2019-11-01-preview @@ -14,6 +15,17 @@ batch: Please also specify `--azureresourceschema-folder=`. +### Tag: schema-kubernetesconfiguration-2021-05-01-preview and azureresourceschema + +``` yaml $(tag) == 'schema-kubernetesconfiguration-2021-05-01-preview' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas + +# all the input files in this apiVersion +input-file: + - Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/kubernetesconfiguration.json + - Microsoft.KubernetesConfiguration/preview/2021-05-01-preview/extensions.json +``` + ### Tag: schema-kubernetesconfiguration-2021-03-01 and azureresourceschema ``` yaml $(tag) == 'schema-kubernetesconfiguration-2021-03-01' && $(azureresourceschema) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.go.md b/specification/kubernetesconfiguration/resource-manager/readme.go.md index 6e0ee087d1ce..94001cc33664 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.go.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.go.md @@ -13,11 +13,22 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-preview-2021-05 - tag: package-2021-03 - tag: package-2019-11-01-preview - tag: package-2020-07-01-preview ``` +### Tag: package-preview-2021-05 and go + +These settings apply only when `--tag=package-preview-2021-05 --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. + +```yaml $(tag) == 'package-preview-2021-05' && $(go) +namespace: kubernetesconfiguration +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-05-01-preview/$(namespace) +``` + ### Tag: package-2021-03 and go These settings apply only when `--tag=package-2021-03 --go` is specified on the command line. @@ -26,6 +37,9 @@ Please also specify `--go-sdks-folder=`. - ```yaml $(tag) == 'package-2020-07-01-preview' && $(go) namespace: kubernetesconfiguration -output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-07-01-preview/$(namespace) -``` +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-07-01-preview/$(namespace) \ No newline at end of file diff --git a/specification/kubernetesconfiguration/resource-manager/readme.java.md b/specification/kubernetesconfiguration/resource-manager/readme.java.md index 8e476cd0f2fb..8a36719a3c7d 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.java.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.java.md @@ -16,19 +16,34 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-kubernetesconfigura ``` yaml $(java) && $(multiapi) batch: - - tag: package-2019-11-01-preview + - tag: package-2021-05-01-preview + - tag: package-2021-03-01 - tag: package-2020-07-01-preview + - tag: package-2019-11-01-preview ``` -### Tag: package-2019-11-01-preview and java +### Tag: package-2021-05-01-preview and java -These settings apply only when `--tag=package-2019-11-01-preview --java` is specified on the command line. +These settings apply only when `--tag=package-2021-05-01-preview --java` is specified on the command line. Please also specify `--azure-libraries-for-java-folder=`. -``` yaml $(tag) == 'package-2019-11-01-preview' && $(java) && $(multiapi) +``` yaml $(tag) == 'package-2021-05-01-preview' && $(java) && $(multiapi) java: - namespace: com.microsoft.azure.management.kubernetesconfiguration.v2019_11_01_preview - output-folder: $(azure-libraries-for-java-folder)/sdk/kubernetesconfiguration/mgmt-v2019_11_01_preview + namespace: com.microsoft.azure.management.kubernetesconfiguration.v2021_05_01_preview + output-folder: $(azure-libraries-for-java-folder)/sdk/kubernetesconfiguration/mgmt-v2021_05_01_preview + regenerate-manager: true + generate-interface: true +``` + +### Tag: package-2021-03-01 and java + +These settings apply only when `--tag=package-2021-03-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-2021-03-01' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.kubernetesconfiguration.v2021_03_01 + output-folder: $(azure-libraries-for-java-folder)/sdk/kubernetesconfiguration/mgmt_v2021_03_01 regenerate-manager: true generate-interface: true ``` @@ -44,4 +59,17 @@ java: output-folder: $(azure-libraries-for-java-folder)/sdk/kubernetesconfiguration/mgmt-v2020_07_01_preview regenerate-manager: true generate-interface: true -``` \ No newline at end of file +``` + +### Tag: package-2019-11-01-preview and java + +These settings apply only when `--tag=package-2019-11-01-preview --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-2019-11-01-preview' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.kubernetesconfiguration.v2019_11_01_preview + output-folder: $(azure-libraries-for-java-folder)/sdk/kubernetesconfiguration/mgmt-v2019_11_01_preview + regenerate-manager: true + generate-interface: true +``` diff --git a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md index 74936bd89980..9360ba1303da 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md @@ -12,8 +12,30 @@ azure-arm: true ``` yaml $(ruby) && $(multiapi) batch: - - tag: package-2019-11-01-preview' + - tag: package-2021-05-01-preview' + - tag: package-2021-03-01' - tag: package-2020-07-01-preview' + - tag: package-2019-11-01-preview' +``` + +### Tag: package-2021-05-01-preview and ruby + +These settings apply only when `--tag=package-2021-05-01-preview --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2021-05-01-preview' && $(ruby) +namespace: "Azure::KubernetesConfiguration::Mgmt::V2021_05_01_preview" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_kubernetesconfiguration/lib +``` + +### Tag: package-2021-03-01 and ruby + +These settings apply only when `--tag=package-2021-03-01 --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2021-03-01' && $(ruby) +namespace: "Azure::KubernetesConfiguration::Mgmt::V2021_03_01" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_kubernetesconfiguration/lib ``` ### Tag: package-2019-11-01-preview and ruby