From e0889b2abea2dd7cc12c33677189dd1859c5bfd8 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Sun, 5 Apr 2020 21:39:59 -0700 Subject: [PATCH 01/62] Add Microsoft.KubernetesConfiguration to azure api specs --- .../CreateSourceControlConfiguration.json | 88 +++ .../DeleteSourceControlConfiguration.json | 16 + .../GetSourceControlConfiguration.json | 42 ++ .../ListSourceControlConfiguration.json | 50 ++ .../examples/OperationsList.json | 38 + .../kubernetesconfiguration.json | 666 ++++++++++++++++++ 6 files changed, 900 insertions(+) create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json new file mode 100644 index 000000000000..81b2f37fdc6e --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json @@ -0,0 +1,88 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "sourceControlConfigurationName": "SRS_GitHubConfig", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1", + "sourceControlConfiguration": { + "properties":{ + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "enableHelmOperator": "true", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "chartValues" : "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" + } + } + } + }, + "responses": { + "201": { + "headers": {}, + "description": "Details of the Kubernetes Configuration's current status.", + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "enableHelmOperator": "true", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "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", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Pending", + "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "message": "Configuration successfully created", + "messageLevel": "Info" + } + } + } + }, + "200": { + "headers": {}, + "description": "Details of the Kubernetes Configuration's current status.", + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "enableHelmOperator": "true", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "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", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Pending", + "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "message": "Configuration successfully created", + "messageLevel": "Info" + } + } + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json new file mode 100644 index 000000000000..adb543503259 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "sourceControlConfigurationName": "SRS_GitHubConfig", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": {}, + "202": {}, + "204":{} + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json new file mode 100644 index 000000000000..675f16c910cc --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "sourceControlConfigurationName": "SRS_GitHubConfig", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": { + "headers": {}, + "description": "Details of the Source Control Configuration's current status.", + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "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", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Pending", + "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "message": "Configuration successfully created", + "messageLevel": "Info" + } + } + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json new file mode 100644 index 000000000000..1e1f51dba93a --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/SRSClusterconfigs", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Compliant" + } + } + }, + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SCRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SCRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/SCRSClusterconfigs", + "operatorNamespace": "SCRS_Namespace", + "operatorInstanceName": "SCRSGitHubFluxOp-02", + "operatorType": "Flux", + "operatorScope": "cluster", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Compliant" + } + } + } + ] + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json new file mode 100644 index 000000000000..1e988fe3ab4d --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": [ + { + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/read", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "sourceControlConfigurations", + "operation": "Get Source Control Configuration", + "description": "Get the specified Source Control Configuration." + } + }, + { + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/write", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "sourceControlConfigurations", + "operation": "Create a Source Control Configuration", + "description": "Create the Source Control Configuration specified." + } + }, + { + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/delete", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "sourceControlConfigurations", + "operation": "Delete Source Control Configuration", + "description": "Delete the specified Source Control Configuration." + } + } + ] + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json new file mode 100644 index 000000000000..45cca2ddacc4 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json @@ -0,0 +1,666 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "SourceControlConfigurationClient", + "description": "Use these APIs to create Source Control Configuration resources through ARM, for Kubernetes Clusters." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "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": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/{sourceControlConfigurationName}": { + "get": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "Gets details of the Source Control Configuration.", + "operationId": "SourceControlConfigurations_Get", + "x-ms-examples": { + "Get Source Control Configuration": { + "$ref": "./examples/GetSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/SourceControlConfigurationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "Create a new Kubernetes Source Control Configuration.", + "operationId": "SourceControlConfigurations_CreateOrUpdate", + "x-ms-examples": { + "Create Source Control Configuration": { + "$ref": "./examples/CreateSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/SourceControlConfigurationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "sourceControlConfiguration", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + }, + "description": "Properties necessary to Create KubernetesConfiguration." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + } + }, + "201": { + "description": "Created.", + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "This will delete the YAML file used to set up the Source control configuration, thus stopping future sync from the source repo.", + "operationId": "SourceControlConfigurations_Delete", + "x-ms-examples": { + "Delete Source Control Configuration": { + "$ref": "./examples/DeleteSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/SourceControlConfigurationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has been completed successfully." + }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously." + }, + "204": { + "description": "No Content. The request has been accepted but the configuration was not found." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations": { + "get": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "List all Source Control Configurations.", + "operationId": "SourceControlConfigurations_List", + "x-ms-examples": { + "List Source Control Configuration": { + "$ref": "./examples/ListSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SourceControlConfigurationList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.KubernetesConfiguration/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "x-ms-examples": { + "BatchAccountDelete": { + "$ref": "./examples/OperationsList.json" + } + }, + "description": "List all the available operations the KubernetesConfiguration resource provider supports.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK response definition.", + "schema": { + "$ref": "#/definitions/ResourceProviderOperationList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "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" + } + }, + "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.", + "properties": { + "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Description of the error.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true + } + } + }, + "ComplianceStatus": { + "description": "Compliance Status details", + "type": "object", + "readOnly": true, + "properties": { + "complianceState": { + "description": "The compliance state of the configuration.", + "$ref": "#/definitions/ComplianceState", + "readOnly": true + }, + "lastConfigApplied": { + "description": "Datetime the configuration was last applied.", + "type": "string", + "format": "date-time" + }, + "message": { + "description": "Message from when the configuration was applied.", + "type": "string" + }, + "messageLevel": { + "description": "Level of the message.", + "type": "string", + "enum": [ + "Error", + "Warning", + "Information" + ], + "x-ms-enum": { + "name": "messageLevel", + "modelAsString": true + } + } + } + }, + "ComplianceState": { + "description": "The compliance state of the configuration.", + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "complianceState", + "modelAsString": true + }, + "enum": [ + "Pending", + "Compliant", + "Noncompliant" + ] + }, + "ChartVersion": { + "description": "Version of the operator Helm chart.", + "type": "string" + }, + "ChartValues": { + "description": "Values override for the operator Helm chart.", + "type": "string" + }, + "HelmOperatorProperties": { + "description": "Properties for Helm operator.", + "type": "object", + "properties": { + "chartVersion": { + "description": "Version of the operator Helm chart.", + "$ref": "#/definitions/ChartVersion" + }, + "chartValues": { + "description": "Values override for the operator Helm chart.", + "$ref": "#/definitions/ChartValues" + } + } + }, + "SourceControlConfiguration": { + "description": "The SourceControl Configuration object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties to create a Source Control Configuration resource", + "properties": { + "repositoryUrl": { + "type": "string", + "description": "Url of the SourceControl Repository." + }, + "operatorNamespace": { + "description": "The namespace to which this operator is installed to. Maximum of 253 lower case alphanumeric characters, hyphen and period only.", + "type": "string", + "default": "default" + }, + "operatorInstanceName": { + "description": "Instance name of the operator - identifying the specific configuration.", + "type": "string" + }, + "operatorType": { + "description": "Type of the operator", + "type": "string", + "enum": [ + "Flux" + ], + "x-ms-enum": { + "name": "operatorType", + "modelAsString": true + } + }, + "operatorParams": { + "description": "Any Parameters for the Operator instance in string format.", + "type": "string" + }, + "operatorScope": { + "description": "Scope at which the operator will be installed.", + "type": "string", + "enum": [ + "cluster", + "namespace" + ], + "default": "cluster", + "x-ms-enum": { + "name": "operatorScope", + "modelAsString": true + } + }, + "repositoryPublicKey": { + "description": "Public Key associated with this SourceControl configuration (either generated within the cluster or provided by the user).", + "type": "string", + "readOnly": true + }, + "enableHelmOperator": { + "description": "Option to enable Helm Operator for this git configuration.", + "type": "string", + "enum": [ + "true", + "false" + ], + "x-ms-enum": { + "name": "enableHelmOperator", + "modelAsString": true + } + }, + "helmOperatorProperties": { + "description": "Properties for Helm operator.", + "type": "object", + "$ref": "#/definitions/HelmOperatorProperties" + }, + "provisioningState": { + "type": "string", + "description": "The provisioning state of the resource provider.", + "readOnly": true, + "x-ms-enum": { + "modelAsString": true, + "name": "ProvisioningState" + }, + "enum": [ + "Accepted", + "Deleting", + "Running", + "Succeeded", + "Failed" + ] + }, + "complianceStatus": { + "type": "object", + "description": "Compliance Status of the Configuration", + "readOnly": true, + "$ref": "#/definitions/ComplianceStatus" + } + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + }, + "SourceControlConfigurationList": { + "description": "Result of the request to list Source Control Configurations. It contains a list of SourceControlConfiguration objects and a URL link to get the next set of results.", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/SourceControlConfiguration" + }, + "description": "List of Source Control Configurations within a Kubernetes cluster." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to get the next set of configuration objects, if any." + } + } + }, + "ResourceProviderOperation": { + "description": "Supported operation of this resource provider.", + "readOnly": true, + "properties": { + "name": { + "description": "Operation name, in format of {provider}/{resource}/{operation}", + "type": "string" + }, + "display": { + "description": "Display metadata associated with the operation.", + "properties": { + "provider": { + "description": "Resource provider: Microsoft KubernetesConfiguration.", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed.", + "type": "string" + }, + "operation": { + "description": "Type of operation: get, read, delete, etc.", + "type": "string" + }, + "description": { + "description": "Description of this operation.", + "type": "string" + } + } + } + } + }, + "ResourceProviderOperationList": { + "description": "Result of the request to list operations.", + "readOnly": true, + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ResourceProviderOperation" + }, + "description": "List of operations supported by this resource provider." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to the next set of results, 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.", + "x-ms-parameter-location": "method" + }, + "SourceControlConfigurationNameParameter": { + "name": "sourceControlConfigurationName", + "in": "path", + "description": "Name of the Source Control Configuration.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} From 8771184685fe0567316b24e0b81de9cfabb412f9 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Sun, 5 Apr 2020 23:09:15 -0700 Subject: [PATCH 02/62] Revert "Add Microsoft.KubernetesConfiguration to azure api specs" This reverts commit e0889b2abea2dd7cc12c33677189dd1859c5bfd8. --- .../CreateSourceControlConfiguration.json | 88 --- .../DeleteSourceControlConfiguration.json | 16 - .../GetSourceControlConfiguration.json | 42 -- .../ListSourceControlConfiguration.json | 50 -- .../examples/OperationsList.json | 38 - .../kubernetesconfiguration.json | 666 ------------------ 6 files changed, 900 deletions(-) delete mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json delete mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json delete mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json delete mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json delete mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json delete mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json deleted file mode 100644 index 81b2f37fdc6e..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/CreateSourceControlConfiguration.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subId1", - "resourceGroupName": "rg1", - "clusterRp": "Microsoft.Kubernetes", - "clusterResourceName": "connectedClusters", - "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2019-11-01-preview", - "clusterName": "clusterName1", - "sourceControlConfiguration": { - "properties":{ - "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", - "operatorNamespace": "SRS_Namespace", - "operatorInstanceName": "SRSGitHubFluxOp-01", - "operatorType": "Flux", - "operatorScope": "namespace", - "operatorParams": "--git-email=xyzgituser@users.srs.github.com", - "enableHelmOperator": "true", - "helmOperatorProperties": { - "chartVersion": "0.3.0", - "chartValues" : "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" - } - } - } - }, - "responses": { - "201": { - "headers": {}, - "description": "Details of the Kubernetes Configuration's current status.", - "body": { - "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", - "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", - "name": "SRS_GitHubConfig", - "properties": { - "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", - "operatorNamespace": "SRS_Namespace", - "operatorInstanceName": "SRSGitHubFluxOp-01", - "operatorType": "Flux", - "operatorScope": "namespace", - "operatorParams": "--git-email=xyzgituser@users.srs.github.com", - "enableHelmOperator": "true", - "helmOperatorProperties": { - "chartVersion": "0.3.0", - "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", - "provisioningState": "Succeeded", - "complianceStatus": { - "complianceState": "Pending", - "lastConfigApplied": "2019-09-10T05:10:57.027Z", - "message": "Configuration successfully created", - "messageLevel": "Info" - } - } - } - }, - "200": { - "headers": {}, - "description": "Details of the Kubernetes Configuration's current status.", - "body": { - "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", - "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", - "name": "SRS_GitHubConfig", - "properties": { - "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", - "operatorNamespace": "SRS_Namespace", - "operatorInstanceName": "SRSGitHubFluxOp-01", - "operatorType": "Flux", - "operatorScope": "namespace", - "operatorParams": "--git-email=xyzgituser@users.srs.github.com", - "enableHelmOperator": "true", - "helmOperatorProperties": { - "chartVersion": "0.3.0", - "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", - "provisioningState": "Succeeded", - "complianceStatus": { - "complianceState": "Pending", - "lastConfigApplied": "2019-09-10T05:10:57.027Z", - "message": "Configuration successfully created", - "messageLevel": "Info" - } - } - } - } - } -} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json deleted file mode 100644 index adb543503259..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/DeleteSourceControlConfiguration.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subId1", - "resourceGroupName": "rg1", - "clusterRp": "Microsoft.Kubernetes", - "clusterResourceName": "connectedClusters", - "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2019-11-01-preview", - "clusterName": "clusterName1" - }, - "responses": { - "200": {}, - "202": {}, - "204":{} - } -} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json deleted file mode 100644 index 675f16c910cc..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/GetSourceControlConfiguration.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subId1", - "resourceGroupName": "rg1", - "clusterRp": "Microsoft.Kubernetes", - "clusterResourceName": "connectedClusters", - "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2019-11-01-preview", - "clusterName": "clusterName1" - }, - "responses": { - "200": { - "headers": {}, - "description": "Details of the Source Control Configuration's current status.", - "body": { - "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", - "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", - "name": "SRS_GitHubConfig", - "properties": { - "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", - "operatorNamespace": "SRS_Namespace", - "operatorInstanceName": "SRSGitHubFluxOp-01", - "operatorType": "Flux", - "operatorScope": "namespace", - "operatorParams": "--git-email=xyzgituser@users.srs.github.com", - "helmOperatorProperties": { - "chartVersion": "0.3.0", - "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", - "provisioningState": "Succeeded", - "complianceStatus": { - "complianceState": "Pending", - "lastConfigApplied": "2019-09-10T05:10:57.027Z", - "message": "Configuration successfully created", - "messageLevel": "Info" - } - } - } - } - } -} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json deleted file mode 100644 index 1e1f51dba93a..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/ListSourceControlConfiguration.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subId1", - "resourceGroupName": "rg1", - "clusterRp": "Microsoft.Kubernetes", - "clusterResourceName": "connectedClusters", - "api-version": "2019-11-01-preview", - "clusterName": "clusterName1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", - "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", - "name": "SRS_GitHubConfig", - "properties": { - "repositoryUrl": "git@github.com:k8sdeveloper425/SRSClusterconfigs", - "operatorNamespace": "SRS_Namespace", - "operatorInstanceName": "SRSGitHubFluxOp-01", - "operatorType": "Flux", - "operatorScope": "namespace", - "provisioningState": "Succeeded", - "complianceStatus": { - "complianceState": "Compliant" - } - } - }, - { - "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SCRS_GitHubConfig", - "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", - "name": "SCRS_GitHubConfig", - "properties": { - "repositoryUrl": "git@github.com:k8sdeveloper425/SCRSClusterconfigs", - "operatorNamespace": "SCRS_Namespace", - "operatorInstanceName": "SCRSGitHubFluxOp-02", - "operatorType": "Flux", - "operatorScope": "cluster", - "provisioningState": "Succeeded", - "complianceStatus": { - "complianceState": "Compliant" - } - } - } - ] - } - } - } -} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json deleted file mode 100644 index 1e988fe3ab4d..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/examples/OperationsList.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "parameters": { - "api-version": "2019-11-01-preview" - }, - "responses": { - "200": { - "body": [ - { - "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/read", - "display": { - "provider": "Microsoft KubernetesConfiguration", - "resource": "sourceControlConfigurations", - "operation": "Get Source Control Configuration", - "description": "Get the specified Source Control Configuration." - } - }, - { - "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/write", - "display": { - "provider": "Microsoft KubernetesConfiguration", - "resource": "sourceControlConfigurations", - "operation": "Create a Source Control Configuration", - "description": "Create the Source Control Configuration specified." - } - }, - { - "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/delete", - "display": { - "provider": "Microsoft KubernetesConfiguration", - "resource": "sourceControlConfigurations", - "operation": "Delete Source Control Configuration", - "description": "Delete the specified Source Control Configuration." - } - } - ] - } - } -} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json deleted file mode 100644 index 45cca2ddacc4..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json +++ /dev/null @@ -1,666 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2019-11-01-preview", - "title": "SourceControlConfigurationClient", - "description": "Use these APIs to create Source Control Configuration resources through ARM, for Kubernetes Clusters." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "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": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/{sourceControlConfigurationName}": { - "get": { - "tags": [ - "SourceControlConfiguration" - ], - "description": "Gets details of the Source Control Configuration.", - "operationId": "SourceControlConfigurations_Get", - "x-ms-examples": { - "Get Source Control Configuration": { - "$ref": "./examples/GetSourceControlConfiguration.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/SourceControlConfigurationNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SourceControlConfiguration" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "put": { - "tags": [ - "SourceControlConfiguration" - ], - "description": "Create a new Kubernetes Source Control Configuration.", - "operationId": "SourceControlConfigurations_CreateOrUpdate", - "x-ms-examples": { - "Create Source Control Configuration": { - "$ref": "./examples/CreateSourceControlConfiguration.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/SourceControlConfigurationNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "sourceControlConfiguration", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/SourceControlConfiguration" - }, - "description": "Properties necessary to Create KubernetesConfiguration." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SourceControlConfiguration" - } - }, - "201": { - "description": "Created.", - "schema": { - "$ref": "#/definitions/SourceControlConfiguration" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "delete": { - "tags": [ - "SourceControlConfiguration" - ], - "description": "This will delete the YAML file used to set up the Source control configuration, thus stopping future sync from the source repo.", - "operationId": "SourceControlConfigurations_Delete", - "x-ms-examples": { - "Delete Source Control Configuration": { - "$ref": "./examples/DeleteSourceControlConfiguration.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/SourceControlConfigurationNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK. The request has been completed successfully." - }, - "202": { - "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously." - }, - "204": { - "description": "No Content. The request has been accepted but the configuration was not found." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations": { - "get": { - "tags": [ - "SourceControlConfiguration" - ], - "description": "List all Source Control Configurations.", - "operationId": "SourceControlConfigurations_List", - "x-ms-examples": { - "List Source Control Configuration": { - "$ref": "./examples/ListSourceControlConfiguration.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SourceControlConfigurationList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/providers/Microsoft.KubernetesConfiguration/operations": { - "get": { - "tags": [ - "Operations" - ], - "operationId": "Operations_List", - "x-ms-examples": { - "BatchAccountDelete": { - "$ref": "./examples/OperationsList.json" - } - }, - "description": "List all the available operations the KubernetesConfiguration resource provider supports.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK response definition.", - "schema": { - "$ref": "#/definitions/ResourceProviderOperationList" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "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" - } - }, - "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.", - "properties": { - "code": { - "description": "Service specific error code which serves as the substatus for the HTTP error code.", - "type": "string", - "readOnly": true - }, - "message": { - "description": "Description of the error.", - "type": "string", - "readOnly": true - }, - "details": { - "description": "Internal error details.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDefinition" - }, - "readOnly": true - } - } - }, - "ComplianceStatus": { - "description": "Compliance Status details", - "type": "object", - "readOnly": true, - "properties": { - "complianceState": { - "description": "The compliance state of the configuration.", - "$ref": "#/definitions/ComplianceState", - "readOnly": true - }, - "lastConfigApplied": { - "description": "Datetime the configuration was last applied.", - "type": "string", - "format": "date-time" - }, - "message": { - "description": "Message from when the configuration was applied.", - "type": "string" - }, - "messageLevel": { - "description": "Level of the message.", - "type": "string", - "enum": [ - "Error", - "Warning", - "Information" - ], - "x-ms-enum": { - "name": "messageLevel", - "modelAsString": true - } - } - } - }, - "ComplianceState": { - "description": "The compliance state of the configuration.", - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "complianceState", - "modelAsString": true - }, - "enum": [ - "Pending", - "Compliant", - "Noncompliant" - ] - }, - "ChartVersion": { - "description": "Version of the operator Helm chart.", - "type": "string" - }, - "ChartValues": { - "description": "Values override for the operator Helm chart.", - "type": "string" - }, - "HelmOperatorProperties": { - "description": "Properties for Helm operator.", - "type": "object", - "properties": { - "chartVersion": { - "description": "Version of the operator Helm chart.", - "$ref": "#/definitions/ChartVersion" - }, - "chartValues": { - "description": "Values override for the operator Helm chart.", - "$ref": "#/definitions/ChartValues" - } - } - }, - "SourceControlConfiguration": { - "description": "The SourceControl Configuration object.", - "properties": { - "properties": { - "type": "object", - "x-ms-client-flatten": true, - "description": "Properties to create a Source Control Configuration resource", - "properties": { - "repositoryUrl": { - "type": "string", - "description": "Url of the SourceControl Repository." - }, - "operatorNamespace": { - "description": "The namespace to which this operator is installed to. Maximum of 253 lower case alphanumeric characters, hyphen and period only.", - "type": "string", - "default": "default" - }, - "operatorInstanceName": { - "description": "Instance name of the operator - identifying the specific configuration.", - "type": "string" - }, - "operatorType": { - "description": "Type of the operator", - "type": "string", - "enum": [ - "Flux" - ], - "x-ms-enum": { - "name": "operatorType", - "modelAsString": true - } - }, - "operatorParams": { - "description": "Any Parameters for the Operator instance in string format.", - "type": "string" - }, - "operatorScope": { - "description": "Scope at which the operator will be installed.", - "type": "string", - "enum": [ - "cluster", - "namespace" - ], - "default": "cluster", - "x-ms-enum": { - "name": "operatorScope", - "modelAsString": true - } - }, - "repositoryPublicKey": { - "description": "Public Key associated with this SourceControl configuration (either generated within the cluster or provided by the user).", - "type": "string", - "readOnly": true - }, - "enableHelmOperator": { - "description": "Option to enable Helm Operator for this git configuration.", - "type": "string", - "enum": [ - "true", - "false" - ], - "x-ms-enum": { - "name": "enableHelmOperator", - "modelAsString": true - } - }, - "helmOperatorProperties": { - "description": "Properties for Helm operator.", - "type": "object", - "$ref": "#/definitions/HelmOperatorProperties" - }, - "provisioningState": { - "type": "string", - "description": "The provisioning state of the resource provider.", - "readOnly": true, - "x-ms-enum": { - "modelAsString": true, - "name": "ProvisioningState" - }, - "enum": [ - "Accepted", - "Deleting", - "Running", - "Succeeded", - "Failed" - ] - }, - "complianceStatus": { - "type": "object", - "description": "Compliance Status of the Configuration", - "readOnly": true, - "$ref": "#/definitions/ComplianceStatus" - } - } - } - }, - "allOf": [ - { - "$ref": "#/definitions/ProxyResource" - } - ] - }, - "SourceControlConfigurationList": { - "description": "Result of the request to list Source Control Configurations. It contains a list of SourceControlConfiguration objects and a URL link to get the next set of results.", - "properties": { - "value": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/SourceControlConfiguration" - }, - "description": "List of Source Control Configurations within a Kubernetes cluster." - }, - "nextLink": { - "type": "string", - "readOnly": true, - "description": "URL to get the next set of configuration objects, if any." - } - } - }, - "ResourceProviderOperation": { - "description": "Supported operation of this resource provider.", - "readOnly": true, - "properties": { - "name": { - "description": "Operation name, in format of {provider}/{resource}/{operation}", - "type": "string" - }, - "display": { - "description": "Display metadata associated with the operation.", - "properties": { - "provider": { - "description": "Resource provider: Microsoft KubernetesConfiguration.", - "type": "string" - }, - "resource": { - "description": "Resource on which the operation is performed.", - "type": "string" - }, - "operation": { - "description": "Type of operation: get, read, delete, etc.", - "type": "string" - }, - "description": { - "description": "Description of this operation.", - "type": "string" - } - } - } - } - }, - "ResourceProviderOperationList": { - "description": "Result of the request to list operations.", - "readOnly": true, - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ResourceProviderOperation" - }, - "description": "List of operations supported by this resource provider." - }, - "nextLink": { - "type": "string", - "readOnly": true, - "description": "URL to the next set of results, 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.", - "x-ms-parameter-location": "method" - }, - "SourceControlConfigurationNameParameter": { - "name": "sourceControlConfigurationName", - "in": "path", - "description": "Name of the Source Control Configuration.", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - } - } -} From f1658a8332a7610e272566684632578a09c4ee29 Mon Sep 17 00:00:00 2001 From: NarayanThiru Date: Mon, 1 Jun 2020 12:13:52 -0700 Subject: [PATCH 03/62] Adds base for updating Microsoft.KubernetesConfiguration from version preview/2019-11-01-preview to version 2020-07-01-preview --- .../CreateSourceControlConfiguration.json | 88 +++ .../DeleteSourceControlConfiguration.json | 15 + .../GetSourceControlConfiguration.json | 42 ++ .../ListSourceControlConfiguration.json | 50 ++ .../examples/OperationsList.json | 38 + .../kubernetesconfiguration.json | 664 ++++++++++++++++++ 6 files changed, 897 insertions(+) create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json new file mode 100644 index 000000000000..619c3831e7e9 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json @@ -0,0 +1,88 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "sourceControlConfigurationName": "SRS_GitHubConfig", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1", + "sourceControlConfiguration": { + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "enableHelmOperator": "true", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" + } + } + } + }, + "responses": { + "201": { + "headers": {}, + "description": "Details of the Kubernetes Configuration's current status.", + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "enableHelmOperator": "true", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "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", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Pending", + "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "message": "Configuration successfully created", + "messageLevel": "Info" + } + } + } + }, + "200": { + "headers": {}, + "description": "Details of the Kubernetes Configuration's current status.", + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "enableHelmOperator": "true", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "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", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Pending", + "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "message": "Configuration successfully created", + "messageLevel": "Info" + } + } + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json new file mode 100644 index 000000000000..7b8df4bf751d --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "sourceControlConfigurationName": "SRS_GitHubConfig", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json new file mode 100644 index 000000000000..6773b204f031 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "sourceControlConfigurationName": "SRS_GitHubConfig", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": { + "headers": {}, + "description": "Details of the Source Control Configuration's current status.", + "body": { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "helmOperatorProperties": { + "chartVersion": "0.3.0", + "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", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Pending", + "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "message": "Configuration successfully created", + "messageLevel": "Info" + } + } + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json new file mode 100644 index 000000000000..1e1f51dba93a --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "api-version": "2019-11-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/SRSClusterconfigs", + "operatorNamespace": "SRS_Namespace", + "operatorInstanceName": "SRSGitHubFluxOp-01", + "operatorType": "Flux", + "operatorScope": "namespace", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Compliant" + } + } + }, + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/SCRS_GitHubConfig", + "type": "Microsoft.KubernetesConfiguration/sourceControlConfigurations", + "name": "SCRS_GitHubConfig", + "properties": { + "repositoryUrl": "git@github.com:k8sdeveloper425/SCRSClusterconfigs", + "operatorNamespace": "SCRS_Namespace", + "operatorInstanceName": "SCRSGitHubFluxOp-02", + "operatorType": "Flux", + "operatorScope": "cluster", + "provisioningState": "Succeeded", + "complianceStatus": { + "complianceState": "Compliant" + } + } + } + ] + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json new file mode 100644 index 000000000000..1e988fe3ab4d --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": [ + { + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/read", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "sourceControlConfigurations", + "operation": "Get Source Control Configuration", + "description": "Get the specified Source Control Configuration." + } + }, + { + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/write", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "sourceControlConfigurations", + "operation": "Create a Source Control Configuration", + "description": "Create the Source Control Configuration specified." + } + }, + { + "name": "Microsoft.KubernetesConfiguration/sourceControlConfigurations/delete", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "sourceControlConfigurations", + "operation": "Delete Source Control Configuration", + "description": "Delete the specified Source Control Configuration." + } + } + ] + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json new file mode 100644 index 000000000000..77717c096ced --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -0,0 +1,664 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "SourceControlConfigurationClient", + "description": "Use these APIs to create Source Control Configuration resources through ARM, for Kubernetes Clusters." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "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": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations/{sourceControlConfigurationName}": { + "get": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "Gets details of the Source Control Configuration.", + "operationId": "SourceControlConfigurations_Get", + "x-ms-examples": { + "Get Source Control Configuration": { + "$ref": "./examples/GetSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/SourceControlConfigurationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "Create a new Kubernetes Source Control Configuration.", + "operationId": "SourceControlConfigurations_CreateOrUpdate", + "x-ms-examples": { + "Create Source Control Configuration": { + "$ref": "./examples/CreateSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/SourceControlConfigurationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "sourceControlConfiguration", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + }, + "description": "Properties necessary to Create KubernetesConfiguration." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + } + }, + "201": { + "description": "Created.", + "schema": { + "$ref": "#/definitions/SourceControlConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "This will delete the YAML file used to set up the Source control configuration, thus stopping future sync from the source repo.", + "operationId": "SourceControlConfigurations_Delete", + "x-ms-examples": { + "Delete Source Control Configuration": { + "$ref": "./examples/DeleteSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/SourceControlConfigurationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has been completed successfully." + }, + "204": { + "description": "No Content. The request has been accepted but the configuration was not found." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations": { + "get": { + "tags": [ + "SourceControlConfiguration" + ], + "description": "List all Source Control Configurations.", + "operationId": "SourceControlConfigurations_List", + "x-ms-examples": { + "List Source Control Configuration": { + "$ref": "./examples/ListSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SourceControlConfigurationList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.KubernetesConfiguration/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "x-ms-examples": { + "BatchAccountDelete": { + "$ref": "./examples/OperationsList.json" + } + }, + "description": "List all the available operations the KubernetesConfiguration resource provider supports.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK response definition.", + "schema": { + "$ref": "#/definitions/ResourceProviderOperationList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "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" + } + }, + "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.", + "properties": { + "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Description of the error.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true + } + } + }, + "ComplianceStatus": { + "description": "Compliance Status details", + "type": "object", + "readOnly": true, + "properties": { + "complianceState": { + "description": "The compliance state of the configuration.", + "$ref": "#/definitions/ComplianceState", + "readOnly": true + }, + "lastConfigApplied": { + "description": "Datetime the configuration was last applied.", + "type": "string", + "format": "date-time" + }, + "message": { + "description": "Message from when the configuration was applied.", + "type": "string" + }, + "messageLevel": { + "description": "Level of the message.", + "type": "string", + "enum": [ + "Error", + "Warning", + "Information" + ], + "x-ms-enum": { + "name": "messageLevel", + "modelAsString": true + } + } + } + }, + "ComplianceState": { + "description": "The compliance state of the configuration.", + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "complianceState", + "modelAsString": true + }, + "enum": [ + "Pending", + "Compliant", + "Noncompliant", + "Installed", + "Failed" + ] + }, + "ChartVersion": { + "description": "Version of the operator Helm chart.", + "type": "string" + }, + "ChartValues": { + "description": "Values override for the operator Helm chart.", + "type": "string" + }, + "HelmOperatorProperties": { + "description": "Properties for Helm operator.", + "type": "object", + "properties": { + "chartVersion": { + "description": "Version of the operator Helm chart.", + "$ref": "#/definitions/ChartVersion" + }, + "chartValues": { + "description": "Values override for the operator Helm chart.", + "$ref": "#/definitions/ChartValues" + } + } + }, + "SourceControlConfiguration": { + "description": "The SourceControl Configuration object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties to create a Source Control Configuration resource", + "properties": { + "repositoryUrl": { + "type": "string", + "description": "Url of the SourceControl Repository." + }, + "operatorNamespace": { + "description": "The namespace to which this operator is installed to. Maximum of 253 lower case alphanumeric characters, hyphen and period only.", + "type": "string", + "default": "default" + }, + "operatorInstanceName": { + "description": "Instance name of the operator - identifying the specific configuration.", + "type": "string" + }, + "operatorType": { + "description": "Type of the operator", + "type": "string", + "enum": [ + "Flux" + ], + "x-ms-enum": { + "name": "operatorType", + "modelAsString": true + } + }, + "operatorParams": { + "description": "Any Parameters for the Operator instance in string format.", + "type": "string" + }, + "operatorScope": { + "description": "Scope at which the operator will be installed.", + "type": "string", + "enum": [ + "cluster", + "namespace" + ], + "default": "cluster", + "x-ms-enum": { + "name": "operatorScope", + "modelAsString": true + } + }, + "repositoryPublicKey": { + "description": "Public Key associated with this SourceControl configuration (either generated within the cluster or provided by the user).", + "type": "string", + "readOnly": true + }, + "enableHelmOperator": { + "description": "Option to enable Helm Operator for this git configuration.", + "type": "string", + "enum": [ + "true", + "false" + ], + "x-ms-enum": { + "name": "enableHelmOperator", + "modelAsString": true + } + }, + "helmOperatorProperties": { + "description": "Properties for Helm operator.", + "type": "object", + "$ref": "#/definitions/HelmOperatorProperties" + }, + "provisioningState": { + "type": "string", + "description": "The provisioning state of the resource provider.", + "readOnly": true, + "x-ms-enum": { + "modelAsString": true, + "name": "ProvisioningState" + }, + "enum": [ + "Accepted", + "Deleting", + "Running", + "Succeeded", + "Failed" + ] + }, + "complianceStatus": { + "type": "object", + "description": "Compliance Status of the Configuration", + "readOnly": true, + "$ref": "#/definitions/ComplianceStatus" + } + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + }, + "SourceControlConfigurationList": { + "description": "Result of the request to list Source Control Configurations. It contains a list of SourceControlConfiguration objects and a URL link to get the next set of results.", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/SourceControlConfiguration" + }, + "description": "List of Source Control Configurations within a Kubernetes cluster." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to get the next set of configuration objects, if any." + } + } + }, + "ResourceProviderOperation": { + "description": "Supported operation of this resource provider.", + "readOnly": true, + "properties": { + "name": { + "description": "Operation name, in format of {provider}/{resource}/{operation}", + "type": "string" + }, + "display": { + "description": "Display metadata associated with the operation.", + "properties": { + "provider": { + "description": "Resource provider: Microsoft KubernetesConfiguration.", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed.", + "type": "string" + }, + "operation": { + "description": "Type of operation: get, read, delete, etc.", + "type": "string" + }, + "description": { + "description": "Description of this operation.", + "type": "string" + } + } + } + } + }, + "ResourceProviderOperationList": { + "description": "Result of the request to list operations.", + "readOnly": true, + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ResourceProviderOperation" + }, + "description": "List of operations supported by this resource provider." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to the next set of results, 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." + }, + "SourceControlConfigurationNameParameter": { + "name": "sourceControlConfigurationName", + "in": "path", + "description": "Name of the Source Control Configuration.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} From fd1b9106b2866a9f520554346f7f3d7d300932b0 Mon Sep 17 00:00:00 2001 From: NarayanThiru Date: Mon, 1 Jun 2020 12:14:13 -0700 Subject: [PATCH 04/62] Updates readme --- .../resource-manager/readme.md | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index 67f97d8b6dcf..aa0dcfa2a2af 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -24,16 +24,25 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor These are the global settings for the kubernetesconfiguration. -```yaml +``` yaml openapi-type: arm -tag: package-2019-11-01-preview +tag: package-preview-2020-07 ``` + +### Tag: package-preview-2020-07 + +These settings apply only when `--tag=package-preview-2020-07` is specified on the command line. + +```yaml $(tag) == 'package-preview-2020-07' +input-file: + - Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +``` ### Tag: package-2019-11-01-preview These settings apply only when `--tag=package-2019-11-01-preview` is specified on the command line. -```yaml $(tag) == 'package-2019-11-01-preview' +``` yaml $(tag) == 'package-2019-11-01-preview' input-file: - Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json ``` @@ -47,7 +56,7 @@ input-file: This section describes what SDK should be generated by the automatic system. This is not used by Autorest itself. -```yaml $(swagger-to-sdk) +``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-python - repo: azure-sdk-for-java @@ -80,9 +89,9 @@ See configuration in [readme.csharp.md](./readme.csharp.md) ## Multi-API/Profile support for AutoRest v3 generators -AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. +AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. -This block is updated by an automatic script. Edits may be lost! +This block is updated by an automatic script. Edits may be lost! ``` yaml $(tag) == 'all-api-versions' /* autogenerated */ # include the azure profile definitions from the standard location @@ -92,12 +101,12 @@ require: $(this-folder)/../../../profiles/readme.md input-file: - $(this-folder)/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json -``` +``` -If there are files that should not be in the `all-api-versions` set, -uncomment the `exclude-file` section below and add the file paths. +If there are files that should not be in the `all-api-versions` set, +uncomment the `exclude-file` section below and add the file paths. -``` yaml $(tag) == 'all-api-versions' +``` yaml $(tag) == 'all-api-versions' #exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json -``` \ No newline at end of file +``` From 3a2ca1f4f8e2ed737f33f3205aca4c2c8595d23c Mon Sep 17 00:00:00 2001 From: NarayanThiru Date: Mon, 1 Jun 2020 12:14:17 -0700 Subject: [PATCH 05/62] Updates API version in new specs and examples --- .../examples/CreateSourceControlConfiguration.json | 2 +- .../examples/DeleteSourceControlConfiguration.json | 2 +- .../examples/GetSourceControlConfiguration.json | 2 +- .../examples/ListSourceControlConfiguration.json | 2 +- .../preview/2020-07-01-preview/examples/OperationsList.json | 2 +- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json index 619c3831e7e9..9ee0ad99413c 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2019-11-01-preview", + "api-version": "2020-07-01-preview", "clusterName": "clusterName1", "sourceControlConfiguration": { "properties": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json index 7b8df4bf751d..c6a4b48757e1 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteSourceControlConfiguration.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2019-11-01-preview", + "api-version": "2020-07-01-preview", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json index 6773b204f031..fa02e958332b 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2019-11-01-preview", + "api-version": "2020-07-01-preview", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json index 1e1f51dba93a..4e6fd48563bd 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListSourceControlConfiguration.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", - "api-version": "2019-11-01-preview", + "api-version": "2020-07-01-preview", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json index 1e988fe3ab4d..4926b92f0e82 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-11-01-preview" + "api-version": "2020-07-01-preview" }, "responses": { "200": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 77717c096ced..8cd6cb63c9ed 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01-preview", + "version": "2020-07-01-preview", "title": "SourceControlConfigurationClient", "description": "Use these APIs to create Source Control Configuration resources through ARM, for Kubernetes Clusters." }, From 41745495bebcc297b1db6eade26bd570c52cd0a6 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 8 Jun 2020 14:18:47 -0700 Subject: [PATCH 06/62] Add resource type 'Extensions' --- .../examples/CreateExtension.json | 60 ++ .../examples/DeleteExtension.json | 15 + .../examples/GetExtension.json | 43 ++ .../examples/ListExtensions.json | 77 +++ .../examples/UpdateExtension.json | 66 ++ .../kubernetesconfiguration.json | 579 +++++++++++++++++- 6 files changed, 827 insertions(+), 13 deletions(-) create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteExtension.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json new file mode 100644 index 000000000000..046e5dedabac --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "extensionInstanceName": "ClusterMonitor", + "api-version": "2020-07-01-preview", + "clusterName": "clusterName1", + "extensionInstance": { + "properties": { + "extensionType": "Microsoft.OperationInsights/containerMonitoring", + "autoUpgrade": "true", + "releaseTrain": "Preview", + "scope": "namespace", + "namspace": "insights", + "configuration": { + "settings": [ + { + "name": "WorkspaceId", + "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + } + ] + } + } + } + }, + "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": "Microsoft.OperationInsights/containerMonitoring", + "autoUpgrade": "true", + "releaseTrain": "Preview", + "version": "0.1.4", + "scope": "namespace", + "namspace": "insights", + "configuration": { + "settings": [ + { + "name": "WorkspaceId", + "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + } + ] + }, + "installStatus": "InstallPending", + "statuses": [], + "creationTime": "2020-06-08T05:10:57.027Z", + "lastStatusTime": "2020-06-08T05:10:57.027Z", + "error": {} + } + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteExtension.json new file mode 100644 index 000000000000..9f8c35d3dcdc --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/DeleteExtension.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "extensionInstanceName": "ClusterMonitor", + "api-version": "2020-07-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json new file mode 100644 index 000000000000..652f298f25cb --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "extensionInstanceName": "ClusterMonitor", + "api-version": "2020-07-01-preview", + "clusterName": "clusterName1" + }, + "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": "Microsoft.OperationInsights/containerMonitoring", + "autoUpgrade": "true", + "releaseTrain": "Preview", + "version": "0.1.4", + "scope": "namespace", + "namspace": "insights", + "configuration": { + "settings": [ + { + "name": "WorkspaceId", + "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + } + ] + }, + "installStatus": "InstallPending", + "statuses": [], + "creationTime": "2020-06-08T05:10:57.027Z", + "lastStatusTime": "2020-06-08T05:10:57.027Z", + "error": {} + } + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json new file mode 100644 index 000000000000..7ce8e9da7495 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -0,0 +1,77 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "api-version": "2020-07-01-preview", + "clusterName": "clusterName1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor", + "type": "Microsoft.KubernetesConfiguration/extensions", + "name": "ClusterMonitor", + "properties": { + "extensionType": "Microsoft.OperationInsights/containerMonitoring", + "autoUpgrade": "true", + "releaseTrain": "Preview", + "version": "0.1.4", + "scope": "namespace", + "namspace": "insights", + "configuration": { + "settings": [ + { + "name": "WorkspaceId", + "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + } + ] + }, + "installStatus": "InstallPending", + "statuses": [], + "creationTime": "2020-06-08T05:10:57.027Z", + "lastStatusTime": "2020-06-08T05:10:57.027Z", + "error": {} + } + }, + { + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/App1Monitor", + "type": "Microsoft.KubernetesConfiguration/extensions", + "name": "App1Monitor", + "properties": { + "extensionType": "Microsoft.OperationInsights/containerMonitoring", + "autoUpgrade": "false", + "version": "1.0.1", + "scope": "namespace", + "namspace": "app1", + "configuration": { + "settings": [ + { + "name": "storageAccountId", + "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/app1stor01" + } + ] + }, + "installStatus": "Installed", + "statuses": [ + { + "code": "Succeeded", + "displayStatus": "Storage Account Mapped", + "level": "Info", + "message": "Storage Account has been mapped successfully.", + "time": "2020-06-07T04:09:23.011Z" + } + ], + "creationTime": "2020-06-07T03:44:19.142Z", + "lastStatusTime": "2020-06-07T04:09:23.011Z", + "error": {} + } + } + ] + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json new file mode 100644 index 000000000000..5c68c165e326 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -0,0 +1,66 @@ +{ + "parameters": { + "subscriptionId": "subId1", + "resourceGroupName": "rg1", + "clusterRp": "Microsoft.Kubernetes", + "clusterResourceName": "connectedClusters", + "extensionInstanceName": "ClusterMonitor", + "api-version": "2020-07-01-preview", + "clusterName": "clusterName1", + "extensionInstance": { + "properties": { + "extensionType": "Microsoft.OperationInsights/containerMonitoring", + "autoUpgrade": "true", + "releaseTrain": "Stable", + "configuration": { + "settings": [ + { + "name": "WorkspaceId", + "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + } + ] + } + } + } + }, + "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": "Microsoft.OperationInsights/containerMonitoring", + "autoUpgrade": "true", + "releaseTrain": "Stable", + "version": "0.0.9", + "scope": "namespace", + "namspace": "insights", + "configuration": { + "settings": [ + { + "name": "WorkspaceId", + "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + } + ] + }, + "installStatus": "InstallPending", + "statuses": [ + { + "code": "Configured", + "displayStatus": "Container Insights Configured", + "level": "Info", + "message": "Container Insights has been configured successfully.", + "time": "2020-06-08T06:02:11.045Z" + } + ], + "creationTime": "2020-06-08T05:10:57.027Z", + "lastStatusTime": "2020-06-09T12:04:36.034Z", + "error": {} + } + } + } + } +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 8cd6cb63c9ed..8c8a1b88d77e 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -195,8 +195,7 @@ "$ref": "#/definitions/ErrorResponse" } } - }, - "x-ms-long-running-operation": true + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations": { @@ -279,6 +278,278 @@ "nextLinkName": "nextLink" } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionInstanceName}": { + "put": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "Create a new Kubernetes Cluster Extension Instance.", + "operationId": "Extensions_Create", + "x-ms-examples": { + "Create Extension": { + "$ref": "./examples/CreateExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "extensionInstance", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExtensionInstanceDefinition" + }, + "description": "Properties necessary to Create an Extension Instance." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtensionInstanceDefinition" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "Gets details of the Kubernetes Cluster Extension Instance.", + "operationId": "Extensions_Get", + "x-ms-examples": { + "Get Extension": { + "$ref": "./examples/GetExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtensionInstanceDefinition" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "update": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "Update an existing Kubernetes Cluster Extension Instance.", + "operationId": "Extensions_Update", + "x-ms-examples": { + "Create Extension": { + "$ref": "./examples/UpdateExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "extensionInstance", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExtensionInstanceUpdateDefinition" + }, + "description": "Properties to Update in the Extension Instance." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtensionInstanceDefinition" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "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", + "x-ms-examples": { + "Get Extension": { + "$ref": "./examples/DeleteExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/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." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions": { + "get": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "List all Source Control Configurations.", + "operationId": "SourceControlConfigurations_List", + "x-ms-examples": { + "List Source Control Configuration": { + "$ref": "./examples/ListSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtenionInstancesListDefinition" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } } }, "definitions": { @@ -334,24 +605,21 @@ }, "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", - "readOnly": true + "minimum": 100, + "maximum": 600 }, "message": { "description": "Description of the error.", - "type": "string", - "readOnly": true - }, - "details": { - "description": "Internal error details.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDefinition" - }, - "readOnly": true + "type": "string" } } }, @@ -595,6 +863,283 @@ "description": "URL to the next set of results, if any." } } + }, + "SettingsDefinition": { + "type": "object", + "description": "Definition object with properties of a setting", + "properties": { + "name": { + "type": "string", + "description": "Name of the setting" + }, + "value": { + "type": "string", + "description": "Value of the setting" + } + } + }, + "ExtensionConfigurationDefinition": { + "description": "Configuration settings for this instance of the extension.", + "type": "object", + "readOnly": true, + "properties": { + "settings": { + "type": "array", + "description": "Array of settings (name/value pair) specific to this instance of the extension.", + "items": { + "$ref": "#/definitions/SettingsDefinition" + } + }, + "protectedSettings": { + "type": "array", + "description": "Array of protected settings (name/value pair) specific to this instance of the extension. These values are not returned in Get & List", + "items": { + "$ref": "#/definitions/SettingsDefinition" + } + } + } + }, + "InstallStatusDefinition": { + "description": "Status of installation of this instance of the extension.", + "type": "string", + "readOnly": true, + "enum": [ + "InstallPending", + "Installed", + "InstallFailed" + ] + }, + "ExtensionStatusDefinition": { + "description": "Status from this instance of the extension.", + "type": "object", + "readOnly": true, + "properties": { + "code": { + "type": "string", + "description": "Status code provided by the Extension" + }, + "displayStatus": { + "type": "string", + "description": "Short description of status of this instanace of the extension." + }, + "level": { + "type": "string", + "description": "Level of the status.", + "enum": [ + "Error", + "Warning", + "Information" + ] + }, + "message": { + "type": "string", + "description": "Detailed message of the status from the Extension instance." + }, + "time": { + "type": "string", + "description": "DateLiteral (per ISO8601) noting the time of installation status." + } + } + }, + "ExtensionInstanceDefinition": { + "description": "The Extension Instance object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties of an Extension Instance 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." + }, + "autoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "type": "string", + "enum": [ + "true", + "false" + ], + "x-ms-enum": { + "name": "autoUpgradeType", + "modelAsString": true + } + }, + "releaseTrain": { + "description": "The upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "type": "string", + "enum": [ + "Stable", + "Preview" + ], + "x-ms-enum": { + "name": "releaseTrainType", + "modelAsString": true + } + }, + "version": { + "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", + "type": "string" + }, + "scope": { + "description": "Scope at which the extension instance is installed.", + "type": "string", + "enum": [ + "cluster", + "namespace" + ], + "default": "namespace", + "x-ms-enum": { + "name": "extensionScope", + "modelAsString": true + } + }, + "namespace": { + "description": "The namespace to which this extension is installed.", + "type": "string", + "default": "default" + }, + "configuration": { + "description": "Configuration, in two arrays (settings and protected-settings) for this instance of extension.", + "type": "object", + "$ref": "#/definitions/ExtensionConfigurationDefinition" + }, + "installStatus": { + "type": "string", + "description": "Status of installation of this instance of the extension.", + "$ref": "#/definitions/InstallStatusDefinition" + }, + "statuses": [ + { + "type": "object", + "description": "Status from this instance of the extension.", + "$ref": "#/definitions/ExtensionStatusDefinition" + } + ], + "creationTime": { + "type": "string", + "description": "DateLiteral (per ISO8601) noting the time of extensionInstance creation.", + "readOnly": true + }, + "lastStatusTime": { + "type": "string", + "description": "DateLiteral (per ISO8601) noting the time of last status.", + "readOnly": true + }, + "error": { + "type": "object", + "description": "Error information from the Agent for errors during installation.", + "readOnly": true, + "$ref": "#/definitions/ErrorDefinition" + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + } + }, + "ExtenionInstancesListDefinition": { + "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.", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ExtensionInstanceDefinition" + }, + "description": "List of Extension Instances within a Kubernetes cluster." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to get the next set of extension instanace objects, if any." + } + } + }, + "ExtensionInstanceUpdateDefinition": { + "description": "Update Extension Instance request object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties to update an Extension Instance 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." + }, + "autoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "type": "string", + "enum": [ + "true", + "false" + ], + "x-ms-enum": { + "name": "autoUpgradeType", + "modelAsString": true + } + }, + "releaseTrain": { + "description": "The upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "type": "string", + "enum": [ + "Stable", + "Preview" + ], + "x-ms-enum": { + "name": "releaseTrainType", + "modelAsString": true + } + }, + "version": { + "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", + "type": "string" + }, + "configuration": { + "description": "Configuration, in two arrays (settings and protected-settings) for this instance of extension. These settings overwrite all existing settings.", + "type": "object", + "$ref": "#/definitions/ExtensionConfigurationDefinition" + }, + "installStatus": { + "type": "string", + "description": "Status of installation of this instance of the extension.", + "$ref": "#/definitions/InstallStatusDefinition" + }, + "statuses": [ + { + "type": "object", + "description": "Status from this instance of the extension.", + "$ref": "#/definitions/ExtensionStatusDefinition" + } + ], + "creationTime": { + "type": "string", + "description": "DateLiteral (per ISO8601) noting the time of extensionInstance creation.", + "readOnly": true + }, + "lastStatusTime": { + "type": "string", + "description": "DateLiteral (per ISO8601) noting the time of last status.", + "readOnly": true + }, + "error": { + "type": "object", + "description": "Error information from the Agent for errors during installation.", + "readOnly": true, + "$ref": "#/definitions/ErrorDefinition" + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + } } }, "parameters": { @@ -659,6 +1204,14 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "ExtensionInstanceNameParameter": { + "name": "extensionInstanceName", + "in": "path", + "description": "Name of an instance of the Extension.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } } } From dd3b6749ba003d969fd659762723fb374a8844eb Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 16:05:54 -0700 Subject: [PATCH 07/62] Updates for Configuration settings, etc. --- .../examples/CreateExtension.json | 19 +- .../examples/GetExtension.json | 10 +- .../examples/ListExtensions.json | 26 +- .../examples/UpdateExtension.json | 31 +- .../kubernetesconfiguration.json | 289 ++++++++++-------- 5 files changed, 177 insertions(+), 198 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index 046e5dedabac..9543579f68e6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -14,13 +14,8 @@ "releaseTrain": "Preview", "scope": "namespace", "namspace": "insights", - "configuration": { - "settings": [ - { - "name": "WorkspaceId", - "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - } - ] + "configurationSettings": { + "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" } } } @@ -40,17 +35,13 @@ "version": "0.1.4", "scope": "namespace", "namspace": "insights", - "configuration": { - "settings": [ - { - "name": "WorkspaceId", - "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - } - ] + "configurationSettings": { + "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", + "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", "error": {} } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 652f298f25cb..3afc9867cc24 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -23,17 +23,13 @@ "version": "0.1.4", "scope": "namespace", "namspace": "insights", - "configuration": { - "settings": [ - { - "name": "WorkspaceId", - "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - } - ] + "configurationSettings": { + "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", + "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", "error": {} } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index 7ce8e9da7495..701e1693ec84 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -22,50 +22,36 @@ "version": "0.1.4", "scope": "namespace", "namspace": "insights", - "configuration": { - "settings": [ - { - "name": "WorkspaceId", - "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - } - ] - }, "installStatus": "InstallPending", "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", + "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", "error": {} } }, { - "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/App1Monitor", + "id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/BackupVault01", "type": "Microsoft.KubernetesConfiguration/extensions", "name": "App1Monitor", "properties": { - "extensionType": "Microsoft.OperationInsights/containerMonitoring", + "extensionType": "Microsoft.RecoveryServices/recoveryVault", "autoUpgrade": "false", "version": "1.0.1", "scope": "namespace", "namspace": "app1", - "configuration": { - "settings": [ - { - "name": "storageAccountId", - "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/app1stor01" - } - ] - }, "installStatus": "Installed", "statuses": [ { "code": "Succeeded", - "displayStatus": "Storage Account Mapped", + "displayStatus": "Recovery vault mapped", "level": "Info", - "message": "Storage Account has been mapped successfully.", + "message": "Recovery vault has been mapped successfully.", "time": "2020-06-07T04:09:23.011Z" } ], "creationTime": "2020-06-07T03:44:19.142Z", + "lastModifiedTime": "2020-06-07T03:44:19.142Z", "lastStatusTime": "2020-06-07T04:09:23.011Z", "error": {} } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index 5c68c165e326..a7affc477332 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -9,17 +9,8 @@ "clusterName": "clusterName1", "extensionInstance": { "properties": { - "extensionType": "Microsoft.OperationInsights/containerMonitoring", "autoUpgrade": "true", - "releaseTrain": "Stable", - "configuration": { - "settings": [ - { - "name": "WorkspaceId", - "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - } - ] - } + "releaseTrain": "Stable" } } }, @@ -38,25 +29,13 @@ "version": "0.0.9", "scope": "namespace", "namspace": "insights", - "configuration": { - "settings": [ - { - "name": "WorkspaceId", - "value": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - } - ] + "configurationSettings": { + "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", - "statuses": [ - { - "code": "Configured", - "displayStatus": "Container Insights Configured", - "level": "Info", - "message": "Container Insights has been configured successfully.", - "time": "2020-06-08T06:02:11.045Z" - } - ], + "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", + "lastModifiedTime": "2020-06-10T07:32:31.249Z", "lastStatusTime": "2020-06-09T12:04:36.034Z", "error": {} } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 8c8a1b88d77e..97124bd5441d 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -319,7 +319,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ExtensionInstanceDefinition" + "$ref": "#/definitions/ExtensionInstance" }, "description": "Properties necessary to Create an Extension Instance." } @@ -328,7 +328,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ExtensionInstanceDefinition" + "$ref": "#/definitions/ExtensionInstance" } }, "default": { @@ -378,7 +378,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ExtensionInstanceDefinition" + "$ref": "#/definitions/ExtensionInstance" } }, "default": { @@ -389,7 +389,7 @@ } } }, - "update": { + "patch": { "tags": [ "Extensions", "ClusterExtensions" @@ -428,7 +428,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ExtensionInstanceUpdateDefinition" + "$ref": "#/definitions/ExtensionInstanceUpdate" }, "description": "Properties to Update in the Extension Instance." } @@ -437,7 +437,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ExtensionInstanceDefinition" + "$ref": "#/definitions/ExtensionInstance" } }, "default": { @@ -536,7 +536,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ExtenionInstancesListDefinition" + "$ref": "#/definitions/ExtensionInstanceForList" } }, "default": { @@ -599,11 +599,11 @@ "properties": { "error": { "description": "Error definition.", - "$ref": "#/definitions/ErrorDefinition" + "$ref": "#/definitions/Error" } } }, - "ErrorDefinition": { + "Error": { "description": "Error definition.", "readOnly": true, "required": [ @@ -696,6 +696,9 @@ } }, "SourceControlConfiguration": { + "tags": [ + "SourceControlConfiguration" + ], "description": "The SourceControl Configuration object.", "properties": { "properties": { @@ -864,42 +867,58 @@ } } }, - "SettingsDefinition": { - "type": "object", - "description": "Definition object with properties of a setting", - "properties": { - "name": { - "type": "string", - "description": "Name of the setting" - }, - "value": { - "type": "string", - "description": "Value of the setting" - } + "ExtensionConfigurationSettings": { + "description": "Name-value pairs for configuring the extensionInstance", + "additionalProperties": { + "type": "string" } }, - "ExtensionConfigurationDefinition": { - "description": "Configuration settings for this instance of the extension.", - "type": "object", - "readOnly": true, - "properties": { - "settings": { - "type": "array", - "description": "Array of settings (name/value pair) specific to this instance of the extension.", - "items": { - "$ref": "#/definitions/SettingsDefinition" - } - }, - "protectedSettings": { - "type": "array", - "description": "Array of protected settings (name/value pair) specific to this instance of the extension. These values are not returned in Get & List", - "items": { - "$ref": "#/definitions/SettingsDefinition" - } - } + "ExtensionConfigurationProtectedSettings": { + "description": "Name-value pairs of protected configuration settings for the extensionInstance", + "additionalProperties": { + "type": "string" + } + }, + "ExtensionAutoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "type": "string", + "enum": [ + "true", + "false" + ], + "default": "true", + "x-ms-enum": { + "name": "autoUpgradeType", + "modelAsString": true + } + }, + "ExtensionReleaseTrain": { + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "type": "string", + "enum": [ + "Stable", + "Preview" + ], + "default": "Stable", + "x-ms-enum": { + "name": "releaseTrainType", + "modelAsString": true + } + }, + "ExtensionScope": { + "description": "Scope at which the extension instance is installed.", + "type": "string", + "enum": [ + "cluster", + "namespace" + ], + "default": "namespace", + "x-ms-enum": { + "name": "extensionScope", + "modelAsString": true } }, - "InstallStatusDefinition": { + "InstallStatus": { "description": "Status of installation of this instance of the extension.", "type": "string", "readOnly": true, @@ -909,7 +928,7 @@ "InstallFailed" ] }, - "ExtensionStatusDefinition": { + "ExtensionStatus": { "description": "Status from this instance of the extension.", "type": "object", "readOnly": true, @@ -941,7 +960,11 @@ } } }, - "ExtensionInstanceDefinition": { + "ExtensionInstance": { + "tags": [ + "ClusterExtensions", + "Extensions" + ], "description": "The Extension Instance object.", "properties": { "properties": { @@ -951,31 +974,16 @@ "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.", + "required": true }, "autoUpgrade": { "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", - "type": "string", - "enum": [ - "true", - "false" - ], - "x-ms-enum": { - "name": "autoUpgradeType", - "modelAsString": true - } + "$ref": "#/definitions/ExtensionAutoUpgrade" }, "releaseTrain": { - "description": "The upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", - "type": "string", - "enum": [ - "Stable", - "Preview" - ], - "x-ms-enum": { - "name": "releaseTrainType", - "modelAsString": true - } + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "$ref": "#/definitions/ExtensionReleaseTrain" }, "version": { "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", @@ -983,54 +991,55 @@ }, "scope": { "description": "Scope at which the extension instance is installed.", - "type": "string", - "enum": [ - "cluster", - "namespace" - ], - "default": "namespace", - "x-ms-enum": { - "name": "extensionScope", - "modelAsString": true - } + "$ref": "#/definitions/ExtensionScope" }, "namespace": { "description": "The namespace to which this extension is installed.", "type": "string", "default": "default" }, - "configuration": { - "description": "Configuration, in two arrays (settings and protected-settings) for this instance of extension.", + "configurationSettings": { + "description": "Configuration settings, as name-value pairs for configuring this instance of the extension..", + "type": "object", + "$ref": "#/definitions/ExtensionConfigurationSettings" + }, + "configurationProtectedSettings": { + "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension..", "type": "object", - "$ref": "#/definitions/ExtensionConfigurationDefinition" + "$ref": "#/definitions/ExtensionConfigurationProtectedSettings" }, "installStatus": { "type": "string", "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStatusDefinition" + "$ref": "#/definitions/InstallStatus" }, "statuses": [ { "type": "object", "description": "Status from this instance of the extension.", - "$ref": "#/definitions/ExtensionStatusDefinition" + "$ref": "#/definitions/ExtensionStatus" } ], "creationTime": { "type": "string", - "description": "DateLiteral (per ISO8601) noting the time of extensionInstance creation.", + "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.", + "description": "DateLiteral (per ISO8601) noting the time of last status from the agent.", "readOnly": true }, "error": { "type": "object", "description": "Error information from the Agent for errors during installation.", "readOnly": true, - "$ref": "#/definitions/ErrorDefinition" + "$ref": "#/definitions/Error" } } }, @@ -1041,31 +1050,14 @@ ] } }, - "ExtenionInstancesListDefinition": { - "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.", - "properties": { - "value": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/ExtensionInstanceDefinition" - }, - "description": "List of Extension Instances within a Kubernetes cluster." - }, - "nextLink": { - "type": "string", - "readOnly": true, - "description": "URL to get the next set of extension instanace objects, if any." - } - } - }, - "ExtensionInstanceUpdateDefinition": { - "description": "Update Extension Instance request object.", + "ExtensionInstanceForList": { + "description": "The Extension Instance object.", "properties": { "properties": { "type": "object", "x-ms-client-flatten": true, - "description": "Properties to update an Extension Instance resource", + "description": "Properties of an Extension Instance resource", + "readOnly": true, "properties": { "extensionType": { "type": "string", @@ -1073,64 +1065,99 @@ }, "autoUpgrade": { "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", - "type": "string", - "enum": [ - "true", - "false" - ], - "x-ms-enum": { - "name": "autoUpgradeType", - "modelAsString": true - } + "$ref": "#/definitions/ExtensionAutoUpgrade" }, "releaseTrain": { - "description": "The upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", - "type": "string", - "enum": [ - "Stable", - "Preview" - ], - "x-ms-enum": { - "name": "releaseTrainType", - "modelAsString": true - } + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "$ref": "#/definitions/ExtensionReleaseTrain" }, "version": { "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", "type": "string" }, - "configuration": { - "description": "Configuration, in two arrays (settings and protected-settings) for this instance of extension. These settings overwrite all existing settings.", - "type": "object", - "$ref": "#/definitions/ExtensionConfigurationDefinition" + "scope": { + "description": "Scope at which the extension instance is installed.", + "$ref": "#/definitions/ExtensionScope" + }, + "namespace": { + "description": "The namespace to which this extension is installed.", + "type": "string", + "default": "default" }, "installStatus": { "type": "string", "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStatusDefinition" + "$ref": "#/definitions/InstallStatus" }, "statuses": [ { "type": "object", "description": "Status from this instance of the extension.", - "$ref": "#/definitions/ExtensionStatusDefinition" + "$ref": "#/definitions/ExtensionStatus" } ], "creationTime": { "type": "string", - "description": "DateLiteral (per ISO8601) noting the time of extensionInstance creation.", + "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.", + "description": "DateLiteral (per ISO8601) noting the time of last status from the agent.", "readOnly": true }, "error": { "type": "object", "description": "Error information from the Agent for errors during installation.", "readOnly": true, - "$ref": "#/definitions/ErrorDefinition" + "$ref": "#/definitions/Error" + } + } + } + } + }, + "ExtenionInstancesList": { + "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.", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ExtensionInstance" + }, + "description": "List of Extension Instances within a Kubernetes cluster." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to get the next set of extension instanace objects, if any." + } + } + }, + "ExtensionInstanceUpdate": { + "description": "Update Extension Instance request object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties to update an Extension Instance resource", + "properties": { + "autoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "$ref": "#/definitions/ExtensionAutoUpgrade" + }, + "releaseTrain": { + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "$ref": "#/definitions/ExtensionReleaseTrain" + }, + "version": { + "description": "Version number of extension, to 'pin' to a specific version. autoUpgrade must be 'false'.", + "type": "string" } } }, @@ -1214,4 +1241,4 @@ "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file From e46e39166bb7e0b89b0a1aa9160b2dd961df9a97 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 16:41:42 -0700 Subject: [PATCH 08/62] Fix validation errors --- .../kubernetesconfiguration.json | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 97124bd5441d..9aa6b4b63573 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -536,7 +536,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ExtensionInstanceForList" + "$ref": "#/definitions/ExtenionInstancesList" } }, "default": { @@ -961,10 +961,6 @@ } }, "ExtensionInstance": { - "tags": [ - "ClusterExtensions", - "Extensions" - ], "description": "The Extension Instance object.", "properties": { "properties": { @@ -974,8 +970,7 @@ "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.", - "required": true + "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." }, "autoUpgrade": { "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", @@ -1042,13 +1037,13 @@ "$ref": "#/definitions/Error" } } - }, - "allOf": [ - { - "$ref": "#/definitions/ProxyResource" - } - ] - } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] }, "ExtensionInstanceForList": { "description": "The Extension Instance object.", @@ -1160,12 +1155,7 @@ "type": "string" } } - }, - "allOf": [ - { - "$ref": "#/definitions/ProxyResource" - } - ] + } } } }, From ab094139fe29b82f7765b06547bf677e41de1e96 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 18:23:32 -0700 Subject: [PATCH 09/62] Move extensions spec to separate file --- .../2020-07-01-preview/extensions.json | 728 ++++++++++++++++++ .../kubernetesconfiguration.json | 602 +-------------- 2 files changed, 744 insertions(+), 586 deletions(-) create mode 100644 specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json new file mode 100644 index 000000000000..06d456643154 --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -0,0 +1,728 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-07-01-preview", + "title": "ExtensionsClient", + "description": "Use these APIs to create extension resources through ARM, for Kubernetes Clusters." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "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": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionInstanceName}": { + "put": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "Create a new Kubernetes Cluster Extension Instance.", + "operationId": "Extensions_Create", + "x-ms-examples": { + "Create Extension": { + "$ref": "./examples/CreateExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "extensionInstance", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExtensionInstance" + }, + "description": "Properties necessary to Create an Extension Instance." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtensionInstance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "Gets details of the Kubernetes Cluster Extension Instance.", + "operationId": "Extensions_Get", + "x-ms-examples": { + "Get Extension": { + "$ref": "./examples/GetExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtensionInstance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "Update an existing Kubernetes Cluster Extension Instance.", + "operationId": "Extensions_Update", + "x-ms-examples": { + "Create Extension": { + "$ref": "./examples/UpdateExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "extensionInstance", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExtensionInstanceUpdate" + }, + "description": "Properties to Update in the Extension Instance." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtensionInstance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "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", + "x-ms-examples": { + "Get Extension": { + "$ref": "./examples/DeleteExtension.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ExtensionInstanceNameParameter" + }, + { + "$ref": "#/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." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions": { + "get": { + "tags": [ + "Extensions", + "ClusterExtensions" + ], + "description": "List all Source Control Configurations.", + "operationId": "SourceControlConfigurations_List", + "x-ms-examples": { + "List Source Control Configuration": { + "$ref": "./examples/ListSourceControlConfiguration.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ExtenionInstancesList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "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" + } + }, + "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/Error" + } + } + }, + "Error": { + "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" + } + } + }, + "ConfigurationSettings": { + "description": "Name-value pairs for configuring the extensionInstance", + "additionalProperties": { + "type": "string" + } + }, + "ConfigurationProtectedSettings": { + "description": "Name-value pairs of protected configuration settings for the extensionInstance", + "additionalProperties": { + "type": "string" + } + }, + "AutoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "type": "string", + "enum": [ + "true", + "false" + ], + "default": "true", + "x-ms-enum": { + "name": "autoUpgradeType", + "modelAsString": true + } + }, + "ReleaseTrain": { + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "type": "string", + "enum": [ + "Stable", + "Preview" + ], + "default": "Stable", + "x-ms-enum": { + "name": "releaseTrainType", + "modelAsString": true + } + }, + "Scope": { + "description": "Scope at which the extension instance is installed.", + "type": "string", + "enum": [ + "cluster", + "namespace" + ], + "default": "namespace", + "x-ms-enum": { + "name": "extensionScope", + "modelAsString": true + } + }, + "InstallStatus": { + "description": "Status of installation of this instance of the extension.", + "type": "string", + "readOnly": true, + "enum": [ + "InstallPending", + "Installed", + "InstallFailed" + ] + }, + "ExtensionStatus": { + "description": "Status from this instance of the extension.", + "type": "object", + "readOnly": true, + "properties": { + "code": { + "type": "string", + "description": "Status code provided by the Extension" + }, + "displayStatus": { + "type": "string", + "description": "Short description of status of this instanace of the extension." + }, + "level": { + "type": "string", + "description": "Level of the status.", + "enum": [ + "Error", + "Warning", + "Information" + ] + }, + "message": { + "type": "string", + "description": "Detailed message of the status from the Extension instance." + }, + "time": { + "type": "string", + "description": "DateLiteral (per ISO8601) noting the time of installation status." + } + } + }, + "ExtensionInstance": { + "description": "The Extension Instance object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties of an Extension Instance 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." + }, + "autoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "$ref": "#/definitions/AutoUpgrade" + }, + "releaseTrain": { + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "$ref": "#/definitions/ReleaseTrain" + }, + "version": { + "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", + "type": "string" + }, + "scope": { + "description": "Scope at which the extension instance is installed.", + "$ref": "#/definitions/Scope" + }, + "namespace": { + "description": "The namespace to which this extension is installed.", + "type": "string", + "default": "default" + }, + "configurationSettings": { + "description": "Configuration settings, as name-value pairs for configuring this instance of the extension..", + "type": "object", + "$ref": "#/definitions/ConfigurationSettings" + }, + "configurationProtectedSettings": { + "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension..", + "type": "object", + "$ref": "#/definitions/ConfigurationProtectedSettings" + }, + "installStatus": { + "type": "string", + "description": "Status of installation of this instance of the extension.", + "$ref": "#/definitions/InstallStatus" + }, + "statuses": [ + { + "type": "object", + "description": "Status from this instance of the extension.", + "$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 + }, + "error": { + "type": "object", + "description": "Error information from the Agent for errors during installation.", + "readOnly": true, + "$ref": "#/definitions/Error" + } + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + }, + "ExtensionInstanceForList": { + "description": "The Extension Instance object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties of an Extension Instance resource", + "readOnly": true, + "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." + }, + "autoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "$ref": "#/definitions/AutoUpgrade" + }, + "releaseTrain": { + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "$ref": "#/definitions/ReleaseTrain" + }, + "version": { + "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", + "type": "string" + }, + "scope": { + "description": "Scope at which the extension instance is installed.", + "$ref": "#/definitions/Scope" + }, + "namespace": { + "description": "The namespace to which this extension is installed.", + "type": "string", + "default": "default" + }, + "installStatus": { + "type": "string", + "description": "Status of installation of this instance of the extension.", + "$ref": "#/definitions/InstallStatus" + }, + "statuses": [ + { + "type": "object", + "description": "Status from this instance of the extension.", + "$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 + }, + "error": { + "type": "object", + "description": "Error information from the Agent for errors during installation.", + "readOnly": true, + "$ref": "#/definitions/Error" + } + } + } + } + }, + "ExtenionInstancesList": { + "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.", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ExtensionInstanceForList" + }, + "description": "List of Extension Instances within a Kubernetes cluster." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to get the next set of extension instanace objects, if any." + } + } + }, + "ExtensionInstanceUpdate": { + "description": "Update Extension Instance request object.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties to update an Extension Instance resource", + "properties": { + "autoUpgrade": { + "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "$ref": "#/definitions/AutoUpgrade" + }, + "releaseTrain": { + "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "$ref": "#/definitions/ReleaseTrain" + }, + "version": { + "description": "Version number of extension, to 'pin' to a specific version. autoUpgrade must be 'false'.", + "type": "string" + } + } + } + } + } + }, + "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", + "in": "path", + "description": "Name of an instance of the Extension.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} \ No newline at end of file diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 9aa6b4b63573..4b203ab3b4c0 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-07-01-preview", + "version": "2019-11-01-preview", "title": "SourceControlConfigurationClient", "description": "Use these APIs to create Source Control Configuration resources through ARM, for Kubernetes Clusters." }, @@ -195,7 +195,8 @@ "$ref": "#/definitions/ErrorResponse" } } - } + }, + "x-ms-long-running-operation": true } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/sourceControlConfigurations": { @@ -278,278 +279,6 @@ "nextLinkName": "nextLink" } } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionInstanceName}": { - "put": { - "tags": [ - "Extensions", - "ClusterExtensions" - ], - "description": "Create a new Kubernetes Cluster Extension Instance.", - "operationId": "Extensions_Create", - "x-ms-examples": { - "Create Extension": { - "$ref": "./examples/CreateExtension.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/ExtensionInstanceNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "extensionInstance", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/ExtensionInstance" - }, - "description": "Properties necessary to Create an Extension Instance." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ExtensionInstance" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "get": { - "tags": [ - "Extensions", - "ClusterExtensions" - ], - "description": "Gets details of the Kubernetes Cluster Extension Instance.", - "operationId": "Extensions_Get", - "x-ms-examples": { - "Get Extension": { - "$ref": "./examples/GetExtension.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/ExtensionInstanceNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ExtensionInstance" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "patch": { - "tags": [ - "Extensions", - "ClusterExtensions" - ], - "description": "Update an existing Kubernetes Cluster Extension Instance.", - "operationId": "Extensions_Update", - "x-ms-examples": { - "Create Extension": { - "$ref": "./examples/UpdateExtension.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/ExtensionInstanceNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "extensionInstance", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/ExtensionInstanceUpdate" - }, - "description": "Properties to Update in the Extension Instance." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ExtensionInstance" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "delete": { - "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", - "x-ms-examples": { - "Get Extension": { - "$ref": "./examples/DeleteExtension.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/ExtensionInstanceNameParameter" - }, - { - "$ref": "#/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." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions": { - "get": { - "tags": [ - "Extensions", - "ClusterExtensions" - ], - "description": "List all Source Control Configurations.", - "operationId": "SourceControlConfigurations_List", - "x-ms-examples": { - "List Source Control Configuration": { - "$ref": "./examples/ListSourceControlConfiguration.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterRpParameter" - }, - { - "$ref": "#/parameters/ClusterResourceNameParameter" - }, - { - "$ref": "#/parameters/ClusterNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ExtenionInstancesList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } } }, "definitions": { @@ -599,27 +328,30 @@ "properties": { "error": { "description": "Error definition.", - "$ref": "#/definitions/Error" + "$ref": "#/definitions/ErrorDefinition" } } }, - "Error": { + "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 + "readOnly": true }, "message": { "description": "Description of the error.", - "type": "string" + "type": "string", + "readOnly": true + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true } } }, @@ -696,9 +428,6 @@ } }, "SourceControlConfiguration": { - "tags": [ - "SourceControlConfiguration" - ], "description": "The SourceControl Configuration object.", "properties": { "properties": { @@ -866,297 +595,6 @@ "description": "URL to the next set of results, if any." } } - }, - "ExtensionConfigurationSettings": { - "description": "Name-value pairs for configuring the extensionInstance", - "additionalProperties": { - "type": "string" - } - }, - "ExtensionConfigurationProtectedSettings": { - "description": "Name-value pairs of protected configuration settings for the extensionInstance", - "additionalProperties": { - "type": "string" - } - }, - "ExtensionAutoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", - "type": "string", - "enum": [ - "true", - "false" - ], - "default": "true", - "x-ms-enum": { - "name": "autoUpgradeType", - "modelAsString": true - } - }, - "ExtensionReleaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", - "type": "string", - "enum": [ - "Stable", - "Preview" - ], - "default": "Stable", - "x-ms-enum": { - "name": "releaseTrainType", - "modelAsString": true - } - }, - "ExtensionScope": { - "description": "Scope at which the extension instance is installed.", - "type": "string", - "enum": [ - "cluster", - "namespace" - ], - "default": "namespace", - "x-ms-enum": { - "name": "extensionScope", - "modelAsString": true - } - }, - "InstallStatus": { - "description": "Status of installation of this instance of the extension.", - "type": "string", - "readOnly": true, - "enum": [ - "InstallPending", - "Installed", - "InstallFailed" - ] - }, - "ExtensionStatus": { - "description": "Status from this instance of the extension.", - "type": "object", - "readOnly": true, - "properties": { - "code": { - "type": "string", - "description": "Status code provided by the Extension" - }, - "displayStatus": { - "type": "string", - "description": "Short description of status of this instanace of the extension." - }, - "level": { - "type": "string", - "description": "Level of the status.", - "enum": [ - "Error", - "Warning", - "Information" - ] - }, - "message": { - "type": "string", - "description": "Detailed message of the status from the Extension instance." - }, - "time": { - "type": "string", - "description": "DateLiteral (per ISO8601) noting the time of installation status." - } - } - }, - "ExtensionInstance": { - "description": "The Extension Instance object.", - "properties": { - "properties": { - "type": "object", - "x-ms-client-flatten": true, - "description": "Properties of an Extension Instance 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." - }, - "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", - "$ref": "#/definitions/ExtensionAutoUpgrade" - }, - "releaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", - "$ref": "#/definitions/ExtensionReleaseTrain" - }, - "version": { - "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", - "type": "string" - }, - "scope": { - "description": "Scope at which the extension instance is installed.", - "$ref": "#/definitions/ExtensionScope" - }, - "namespace": { - "description": "The namespace to which this extension is installed.", - "type": "string", - "default": "default" - }, - "configurationSettings": { - "description": "Configuration settings, as name-value pairs for configuring this instance of the extension..", - "type": "object", - "$ref": "#/definitions/ExtensionConfigurationSettings" - }, - "configurationProtectedSettings": { - "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension..", - "type": "object", - "$ref": "#/definitions/ExtensionConfigurationProtectedSettings" - }, - "installStatus": { - "type": "string", - "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStatus" - }, - "statuses": [ - { - "type": "object", - "description": "Status from this instance of the extension.", - "$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 - }, - "error": { - "type": "object", - "description": "Error information from the Agent for errors during installation.", - "readOnly": true, - "$ref": "#/definitions/Error" - } - } - } - }, - "allOf": [ - { - "$ref": "#/definitions/ProxyResource" - } - ] - }, - "ExtensionInstanceForList": { - "description": "The Extension Instance object.", - "properties": { - "properties": { - "type": "object", - "x-ms-client-flatten": true, - "description": "Properties of an Extension Instance resource", - "readOnly": true, - "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." - }, - "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", - "$ref": "#/definitions/ExtensionAutoUpgrade" - }, - "releaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", - "$ref": "#/definitions/ExtensionReleaseTrain" - }, - "version": { - "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version.", - "type": "string" - }, - "scope": { - "description": "Scope at which the extension instance is installed.", - "$ref": "#/definitions/ExtensionScope" - }, - "namespace": { - "description": "The namespace to which this extension is installed.", - "type": "string", - "default": "default" - }, - "installStatus": { - "type": "string", - "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStatus" - }, - "statuses": [ - { - "type": "object", - "description": "Status from this instance of the extension.", - "$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 - }, - "error": { - "type": "object", - "description": "Error information from the Agent for errors during installation.", - "readOnly": true, - "$ref": "#/definitions/Error" - } - } - } - } - }, - "ExtenionInstancesList": { - "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.", - "properties": { - "value": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/ExtensionInstance" - }, - "description": "List of Extension Instances within a Kubernetes cluster." - }, - "nextLink": { - "type": "string", - "readOnly": true, - "description": "URL to get the next set of extension instanace objects, if any." - } - } - }, - "ExtensionInstanceUpdate": { - "description": "Update Extension Instance request object.", - "properties": { - "properties": { - "type": "object", - "x-ms-client-flatten": true, - "description": "Properties to update an Extension Instance resource", - "properties": { - "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", - "$ref": "#/definitions/ExtensionAutoUpgrade" - }, - "releaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", - "$ref": "#/definitions/ExtensionReleaseTrain" - }, - "version": { - "description": "Version number of extension, to 'pin' to a specific version. autoUpgrade must be 'false'.", - "type": "string" - } - } - } - } } }, "parameters": { @@ -1221,14 +659,6 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" - }, - "ExtensionInstanceNameParameter": { - "name": "extensionInstanceName", - "in": "path", - "description": "Name of an instance of the Extension.", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" } } } \ No newline at end of file From cf0afed7253c6efe09e8e122782eb336064f9d93 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 18:42:13 -0700 Subject: [PATCH 10/62] Fix validation errors --- .../2020-07-01-preview/extensions.json | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 06d456643154..24c8bb6dbbc9 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -510,13 +510,11 @@ "description": "Status of installation of this instance of the extension.", "$ref": "#/definitions/InstallStatus" }, - "statuses": [ - { - "type": "object", - "description": "Status from this instance of the extension.", - "$ref": "#/definitions/ExtensionStatus" - } - ], + "statuses": { + "type": "array", + "description": "Status from this instance of the extension.", + "$ref": "#/definitions/ExtensionStatus" + }, "creationTime": { "type": "string", "description": "DateLiteral (per ISO8601) noting the time the resource was created by the client (user).", @@ -586,13 +584,11 @@ "description": "Status of installation of this instance of the extension.", "$ref": "#/definitions/InstallStatus" }, - "statuses": [ - { - "type": "object", - "description": "Status from this instance of the extension.", - "$ref": "#/definitions/ExtensionStatus" - } - ], + "statuses": { + "type": "array", + "description": "Status from this instance of the extension.", + "$ref": "#/definitions/ExtensionStatus" + }, "creationTime": { "type": "string", "description": "DateLiteral (per ISO8601) noting the time the resource was created by the client (user).", From 9c3a64b3d0a544a69e17b1b9be7862ff5c0d2f51 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 19:00:24 -0700 Subject: [PATCH 11/62] Fix validation errors --- .../2020-07-01-preview/examples/CreateExtension.json | 6 +++--- .../preview/2020-07-01-preview/examples/GetExtension.json | 2 +- .../preview/2020-07-01-preview/examples/ListExtensions.json | 2 +- .../2020-07-01-preview/examples/UpdateExtension.json | 2 +- .../preview/2020-07-01-preview/extensions.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index 9543579f68e6..4c7cb1774af7 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -13,7 +13,7 @@ "autoUpgrade": "true", "releaseTrain": "Preview", "scope": "namespace", - "namspace": "insights", + "namespace": "insights", "configurationSettings": { "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" } @@ -34,12 +34,12 @@ "releaseTrain": "Preview", "version": "0.1.4", "scope": "namespace", - "namspace": "insights", + "namespace": "insights", "configurationSettings": { "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", - "statuses": [], + "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 3afc9867cc24..fb7d2c264b4b 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -27,7 +27,7 @@ "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", - "statuses": [], + "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index 701e1693ec84..d8dd0e7770b9 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -23,7 +23,7 @@ "scope": "namespace", "namspace": "insights", "installStatus": "InstallPending", - "statuses": [], + "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index a7affc477332..7cbdb27ecbd0 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -33,7 +33,7 @@ "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", - "statuses": [], + "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/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 24c8bb6dbbc9..0da2f9488ccb 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -261,10 +261,10 @@ "ClusterExtensions" ], "description": "List all Source Control Configurations.", - "operationId": "SourceControlConfigurations_List", + "operationId": "Extensions_List", "x-ms-examples": { "List Source Control Configuration": { - "$ref": "./examples/ListSourceControlConfiguration.json" + "$ref": "./examples/ListExtensions.json" } }, "parameters": [ From b06bddd6e2843ead058e1d1329c9ae9eb58b7208 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 19:02:29 -0700 Subject: [PATCH 12/62] Remove empty error objects in examples --- .../2020-07-01-preview/examples/CreateExtension.json | 3 +-- .../preview/2020-07-01-preview/examples/GetExtension.json | 3 +-- .../preview/2020-07-01-preview/examples/ListExtensions.json | 6 ++---- .../2020-07-01-preview/examples/UpdateExtension.json | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index 4c7cb1774af7..70b7d9789053 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -42,8 +42,7 @@ "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z", - "error": {} + "lastStatusTime": "2020-06-08T05:10:57.027Z" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index fb7d2c264b4b..9acff5ee534c 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -30,8 +30,7 @@ "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z", - "error": {} + "lastStatusTime": "2020-06-08T05:10:57.027Z" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index d8dd0e7770b9..e0ccd73c6340 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -26,8 +26,7 @@ "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z", - "error": {} + "lastStatusTime": "2020-06-08T05:10:57.027Z" } }, { @@ -52,8 +51,7 @@ ], "creationTime": "2020-06-07T03:44:19.142Z", "lastModifiedTime": "2020-06-07T03:44:19.142Z", - "lastStatusTime": "2020-06-07T04:09:23.011Z", - "error": {} + "lastStatusTime": "2020-06-07T04:09:23.011Z" } } ] diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index 7cbdb27ecbd0..886579e04f72 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -36,8 +36,7 @@ "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-10T07:32:31.249Z", - "lastStatusTime": "2020-06-09T12:04:36.034Z", - "error": {} + "lastStatusTime": "2020-06-09T12:04:36.034Z" } } } From 54124f1747e4cb99927e38c209402d523c6c2a1e Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 19:14:13 -0700 Subject: [PATCH 13/62] Fix statuses array def & references --- .../preview/2020-07-01-preview/examples/GetExtension.json | 2 +- .../2020-07-01-preview/examples/ListExtensions.json | 4 ++-- .../2020-07-01-preview/examples/UpdateExtension.json | 2 +- .../preview/2020-07-01-preview/extensions.json | 8 ++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 9acff5ee534c..3030b9db2830 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -22,7 +22,7 @@ "releaseTrain": "Preview", "version": "0.1.4", "scope": "namespace", - "namspace": "insights", + "namespace": "insights", "configurationSettings": { "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index e0ccd73c6340..9b85be628d09 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -21,7 +21,7 @@ "releaseTrain": "Preview", "version": "0.1.4", "scope": "namespace", - "namspace": "insights", + "namespace": "insights", "installStatus": "InstallPending", "statuses": {}, "creationTime": "2020-06-08T05:10:57.027Z", @@ -38,7 +38,7 @@ "autoUpgrade": "false", "version": "1.0.1", "scope": "namespace", - "namspace": "app1", + "namespace": "app1", "installStatus": "Installed", "statuses": [ { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index 886579e04f72..b3d916060844 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -28,7 +28,7 @@ "releaseTrain": "Stable", "version": "0.0.9", "scope": "namespace", - "namspace": "insights", + "namespace": "insights", "configurationSettings": { "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 0da2f9488ccb..ce1567e6928a 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -513,7 +513,9 @@ "statuses": { "type": "array", "description": "Status from this instance of the extension.", - "$ref": "#/definitions/ExtensionStatus" + "items": { + "$ref": "#/definitions/ExtensionStatus" + } }, "creationTime": { "type": "string", @@ -587,7 +589,9 @@ "statuses": { "type": "array", "description": "Status from this instance of the extension.", - "$ref": "#/definitions/ExtensionStatus" + "items": { + "$ref": "#/definitions/ExtensionStatus" + } }, "creationTime": { "type": "string", From f3acbf4145299ff1eb65eb843064ec67e3c72bfb Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 19:34:53 -0700 Subject: [PATCH 14/62] Fix statuses in examples --- .../preview/2020-07-01-preview/examples/CreateExtension.json | 2 +- .../preview/2020-07-01-preview/examples/GetExtension.json | 2 +- .../preview/2020-07-01-preview/examples/ListExtensions.json | 2 +- .../preview/2020-07-01-preview/examples/UpdateExtension.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index 70b7d9789053..cc420abaf34f 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -39,7 +39,7 @@ "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", - "statuses": {}, + "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 3030b9db2830..2155d73f0977 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -27,7 +27,7 @@ "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", - "statuses": {}, + "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index 9b85be628d09..56436445807a 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -23,7 +23,7 @@ "scope": "namespace", "namespace": "insights", "installStatus": "InstallPending", - "statuses": {}, + "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index b3d916060844..6baf0282b8e1 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -33,7 +33,7 @@ "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", - "statuses": {}, + "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-10T07:32:31.249Z", "lastStatusTime": "2020-06-09T12:04:36.034Z" From aedc7220bc1d1fe40581ecddc6f27055ae17c97b Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 19:42:29 -0700 Subject: [PATCH 15/62] Fix error in list example --- .../2020-07-01-preview/examples/ListExtensions.json | 2 +- .../preview/2020-07-01-preview/extensions.json | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index 56436445807a..4211e3124571 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -44,7 +44,7 @@ { "code": "Succeeded", "displayStatus": "Recovery vault mapped", - "level": "Info", + "level": "Information", "message": "Recovery vault has been mapped successfully.", "time": "2020-06-07T04:09:23.011Z" } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index ce1567e6928a..c466782745af 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -616,7 +616,12 @@ } } } - } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] }, "ExtenionInstancesList": { "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.", From fb6aeb237572603a6a236c8aa0e4dbb10e8b6c29 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 19:52:25 -0700 Subject: [PATCH 16/62] Fix spellcheck errors --- .../preview/2020-07-01-preview/extensions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index c466782745af..88d120517351 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -291,7 +291,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ExtenionInstancesList" + "$ref": "#/definitions/ExtensionInstancesList" } }, "default": { @@ -382,7 +382,7 @@ } }, "AutoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", "type": "string", "enum": [ "true", @@ -441,7 +441,7 @@ }, "displayStatus": { "type": "string", - "description": "Short description of status of this instanace of the extension." + "description": "Short description of status of this instance of the extension." }, "level": { "type": "string", @@ -475,7 +475,7 @@ "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." }, "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", "$ref": "#/definitions/AutoUpgrade" }, "releaseTrain": { @@ -561,7 +561,7 @@ "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." }, "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", "$ref": "#/definitions/AutoUpgrade" }, "releaseTrain": { @@ -623,7 +623,7 @@ } ] }, - "ExtenionInstancesList": { + "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.", "properties": { "value": { @@ -637,7 +637,7 @@ "nextLink": { "type": "string", "readOnly": true, - "description": "URL to get the next set of extension instanace objects, if any." + "description": "URL to get the next set of extension instance objects, if any." } } }, @@ -650,7 +650,7 @@ "description": "Properties to update an Extension Instance resource", "properties": { "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecylce Management or not.", + "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", "$ref": "#/definitions/AutoUpgrade" }, "releaseTrain": { From a3bad8a5faa277c1e8f3d06061b1ce333ef08521 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 20:14:21 -0700 Subject: [PATCH 17/62] Prettier fixes --- .../preview/2020-07-01-preview/examples/CreateExtension.json | 4 ++-- .../preview/2020-07-01-preview/examples/GetExtension.json | 2 +- .../preview/2020-07-01-preview/examples/UpdateExtension.json | 2 +- .../preview/2020-07-01-preview/extensions.json | 2 +- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index cc420abaf34f..8046da564880 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -15,7 +15,7 @@ "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" } } } @@ -36,7 +36,7 @@ "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", "statuses": [], diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 2155d73f0977..dfe86c1fed7e 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -24,7 +24,7 @@ "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", "statuses": [], diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index 6baf0282b8e1..4fa41a063def 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -30,7 +30,7 @@ "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId" : "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" }, "installStatus": "InstallPending", "statuses": [], diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 88d120517351..97774e47a851 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -730,4 +730,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 4b203ab3b4c0..77717c096ced 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -661,4 +661,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} From 834f75d4a728acd70c583b4506c3db1415dd7fb1 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 10 Jun 2020 20:33:12 -0700 Subject: [PATCH 18/62] Update readme files --- .../resource-manager/readme.go.md | 10 ++++++++++ .../resource-manager/readme.java.md | 14 ++++++++++++++ .../resource-manager/readme.md | 3 +++ .../resource-manager/readme.ruby.md | 11 +++++++++++ 4 files changed, 38 insertions(+) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.go.md b/specification/kubernetesconfiguration/resource-manager/readme.go.md index 2e168bef03b1..81cfe6d36d3a 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.go.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.go.md @@ -13,6 +13,7 @@ go: ``` yaml $(go) && $(multiapi) batch: - tag: package-2019-11-01-preview + - tag: package-2020-07-01-preview ``` ### Tag: package-2019-11-01-preview and go @@ -24,3 +25,12 @@ 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) +``` diff --git a/specification/kubernetesconfiguration/resource-manager/readme.java.md b/specification/kubernetesconfiguration/resource-manager/readme.java.md index 14b37a01d1b7..ce5fb633aa0f 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.java.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.java.md @@ -17,6 +17,7 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-kubernetesconfigura ``` yaml $(java) && $(multiapi) batch: - tag: package-2019-11-01-preview + - tag: package-2020-07-01-preview ``` ### Tag: package-2019-11-01-preview and java @@ -31,3 +32,16 @@ java: regenerate-manager: true generate-interface: true ``` + +### Tag: package-2020-07-01-preview and java + +These settings apply only when `--tag=package-2020-07-01-preview --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-2020-07-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-v2020_07_01_preview + regenerate-manager: true + generate-interface: true +``` \ No newline at end of file diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index aa0dcfa2a2af..84bad60923e8 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -37,6 +37,7 @@ These settings apply only when `--tag=package-preview-2020-07` is specified on t ```yaml $(tag) == 'package-preview-2020-07' input-file: - Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json + - Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json ``` ### Tag: package-2019-11-01-preview @@ -100,6 +101,8 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: - $(this-folder)/Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json + - $(this-folder)/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json + - $(this-folder)/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json ``` diff --git a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md index 18eab73d201b..74936bd89980 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md @@ -13,6 +13,7 @@ azure-arm: true ``` yaml $(ruby) && $(multiapi) batch: - tag: package-2019-11-01-preview' + - tag: package-2020-07-01-preview' ``` ### Tag: package-2019-11-01-preview and ruby @@ -24,3 +25,13 @@ Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2020-07-01-preview' && $(ruby) +namespace: "Azure::KubernetesConfiguration::Mgmt::V2020_07_01_preview" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_kubernetesconfiguration/lib +``` From 97b68e676f59566e16b80a635caf0ed34d71f016 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Thu, 11 Jun 2020 14:52:22 -0700 Subject: [PATCH 19/62] Remove statuses in List & fix Autorest errors --- .../2020-07-01-preview/examples/ListExtensions.json | 10 ---------- .../preview/2020-07-01-preview/extensions.json | 7 ------- .../resource-manager/readme.md | 12 +++++++++--- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index 4211e3124571..0b1d9c199e19 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -23,7 +23,6 @@ "scope": "namespace", "namespace": "insights", "installStatus": "InstallPending", - "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z" @@ -40,15 +39,6 @@ "scope": "namespace", "namespace": "app1", "installStatus": "Installed", - "statuses": [ - { - "code": "Succeeded", - "displayStatus": "Recovery vault mapped", - "level": "Information", - "message": "Recovery vault has been mapped successfully.", - "time": "2020-06-07T04:09:23.011Z" - } - ], "creationTime": "2020-06-07T03:44:19.142Z", "lastModifiedTime": "2020-06-07T03:44:19.142Z", "lastStatusTime": "2020-06-07T04:09:23.011Z" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 97774e47a851..a4d14850ff67 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -586,13 +586,6 @@ "description": "Status of installation of this instance of the extension.", "$ref": "#/definitions/InstallStatus" }, - "statuses": { - "type": "array", - "description": "Status from this instance of the extension.", - "items": { - "$ref": "#/definitions/ExtensionStatus" - } - }, "creationTime": { "type": "string", "description": "DateLiteral (per ISO8601) noting the time the resource was created by the client (user).", diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index 84bad60923e8..86af2f8dcced 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -2,11 +2,11 @@ > see https://aka.ms/autorest -This is the AutoRest configuration file for kubernetesconfiguration. +This is the AutoRest configuration file for KubernetesConfiguration. ## Getting Started -To build the SDKs for My API, simply install AutoRest via `npm` (`npm install -g autorest`) and then run: +To build the SDKs for KubernetesConfiguration, simply install AutoRest via `npm` (`npm install -g autorest`) and then run: > `autorest readme.md` @@ -25,11 +25,12 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor These are the global settings for the kubernetesconfiguration. ``` yaml +title: SourceControlConfigurationClient +description: KubernetesConfiguration Client openapi-type: arm tag: package-preview-2020-07 ``` - ### Tag: package-preview-2020-07 These settings apply only when `--tag=package-preview-2020-07` is specified on the command line. @@ -39,6 +40,8 @@ input-file: - Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json - Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json ``` + + ### Tag: package-2019-11-01-preview These settings apply only when `--tag=package-2019-11-01-preview` is specified on the command line. @@ -68,6 +71,7 @@ swagger-to-sdk: - bundle install && rake arm:regen_all_profiles['azure_mgmt_kubernetesconfiguration'] ``` + ## Go See configuration in [readme.go.md](./readme.go.md) @@ -88,6 +92,8 @@ See configuration in [readme.typescript.md](./readme.typescript.md) See configuration in [readme.csharp.md](./readme.csharp.md) + + ## Multi-API/Profile support for AutoRest v3 generators AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. From 992615c04ebbdf45a620eb56508e68f1e3666fcc Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Thu, 11 Jun 2020 18:32:10 -0700 Subject: [PATCH 20/62] Update ErrorDefinition --- .../2020-07-01-preview/extensions.json | 4 ++-- .../kubernetesconfiguration.json | 19 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index a4d14850ff67..38f4e74622c0 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -345,11 +345,11 @@ "properties": { "error": { "description": "Error definition.", - "$ref": "#/definitions/Error" + "$ref": "#/definitions/ErrorDefinition" } } }, - "Error": { + "ErrorDefinition": { "description": "Error definition.", "readOnly": true, "required": [ diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 77717c096ced..aa728b716fe3 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -334,24 +334,21 @@ }, "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", - "readOnly": true + "minimum": 100, + "maximum": 600 }, "message": { "description": "Description of the error.", - "type": "string", - "readOnly": true - }, - "details": { - "description": "Internal error details.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDefinition" - }, - "readOnly": true + "type": "string" } } }, From 22a394259f6864649e990b06823833a42fdc4beb Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Thu, 11 Jun 2020 18:42:42 -0700 Subject: [PATCH 21/62] Update ErrorDefinition reference --- .../preview/2020-07-01-preview/extensions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 38f4e74622c0..36167b29a342 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -536,7 +536,7 @@ "type": "object", "description": "Error information from the Agent for errors during installation.", "readOnly": true, - "$ref": "#/definitions/Error" + "$ref": "#/definitions/ErrorResponse" } } } @@ -605,7 +605,7 @@ "type": "object", "description": "Error information from the Agent for errors during installation.", "readOnly": true, - "$ref": "#/definitions/Error" + "$ref": "#/definitions/ErrorResponse" } } } From 5d23f9b281e55994cc4b8361d0477261e65f81fd Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 12 Jun 2020 15:06:48 -0700 Subject: [PATCH 22/62] Fix API version --- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index aa728b716fe3..8f461c9639d9 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01-preview", + "version": "2020-07-01-preview", "title": "SourceControlConfigurationClient", "description": "Use these APIs to create Source Control Configuration resources through ARM, for Kubernetes Clusters." }, From f7b5f058a7514c01e8a5205950721140dc84a3e7 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 12 Jun 2020 16:05:03 -0700 Subject: [PATCH 23/62] Fix Readme file for Java --- .../kubernetesconfiguration/resource-manager/readme.java.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.java.md b/specification/kubernetesconfiguration/resource-manager/readme.java.md index ce5fb633aa0f..8e476cd0f2fb 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.java.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.java.md @@ -40,7 +40,7 @@ Please also specify `--azure-libraries-for-java-folder= Date: Sun, 14 Jun 2020 21:35:48 -0700 Subject: [PATCH 24/62] Update readme files --- .../kubernetesconfiguration/resource-manager/readme.go.md | 1 + .../kubernetesconfiguration/resource-manager/readme.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.go.md b/specification/kubernetesconfiguration/resource-manager/readme.go.md index 81cfe6d36d3a..e813e065bccd 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.go.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.go.md @@ -5,6 +5,7 @@ These settings apply only when `--go` is specified on the command line. ```yaml $(go) go: license-header: MICROSOFT_APACHE_NO_VERSION + namespace: kubernetesconfiguration clear-output-folder: true ``` diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index 86af2f8dcced..640eb7412e18 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -28,14 +28,14 @@ These are the global settings for the kubernetesconfiguration. title: SourceControlConfigurationClient description: KubernetesConfiguration Client openapi-type: arm -tag: package-preview-2020-07 +tag: package-2020-07-01-preview ``` -### Tag: package-preview-2020-07 +### Tag: package-2020-07-01-preview -These settings apply only when `--tag=package-preview-2020-07` is specified on the command line. +These settings apply only when `--tag=package-2020-07-01-preview` is specified on the command line. -```yaml $(tag) == 'package-preview-2020-07' +```yaml $(tag) == 'package-2020-07-01-preview' input-file: - Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json - Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json From 92eb4808d59f62a124d040a17a53a7fc7f64380a Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 15 Jun 2020 19:18:44 -0700 Subject: [PATCH 25/62] Fix Linter issue --- .../preview/2020-07-01-preview/extensions.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 36167b29a342..997481047b4c 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -416,7 +416,7 @@ ], "default": "namespace", "x-ms-enum": { - "name": "extensionScope", + "name": "extensionScopeType", "modelAsString": true } }, @@ -428,7 +428,11 @@ "InstallPending", "Installed", "InstallFailed" - ] + ], + "x-ms-enum": { + "name": "installStatusType", + "modelAsString": true + } }, "ExtensionStatus": { "description": "Status from this instance of the extension.", @@ -450,7 +454,12 @@ "Error", "Warning", "Information" - ] + ], + "default": "Information", + "x-ms-enum": { + "name": "statusMessageLevelType", + "modelAsString": true + } }, "message": { "type": "string", From c249570930743f058d77c2bc8a165a70eba5a341 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Thu, 18 Jun 2020 10:14:11 -0700 Subject: [PATCH 26/62] Updated OperationsList example to address review comment --- .../examples/OperationsList.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json index 4926b92f0e82..f69e3136c7dd 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/OperationsList.json @@ -31,6 +31,33 @@ "operation": "Delete Source Control Configuration", "description": "Delete the specified Source Control Configuration." } + }, + { + "name": "Microsoft.KubernetesConfiguration/extensions/read", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "extensions", + "operation": "Get extension instance", + "description": "Get the specified Extension Instance." + } + }, + { + "name": "Microsoft.KubernetesConfiguration/extensions/write", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "extensions", + "operation": "Create a Extension Instance", + "description": "Create the Extension Instance specified." + } + }, + { + "name": "Microsoft.KubernetesConfiguration/extensions/delete", + "display": { + "provider": "Microsoft KubernetesConfiguration", + "resource": "extensions", + "operation": "Delete Extension Instance", + "description": "Delete the specified Extension Instance." + } } ] } From d4e20da172f02cf0f4492b2cf206e6b56efdee78 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 31 Jul 2020 11:34:28 -0700 Subject: [PATCH 27/62] Updated the spec - new property and property name changes --- .../examples/CreateExtension.json | 24 ++- .../CreateSourceControlConfiguration.json | 3 + .../examples/GetExtension.json | 14 +- .../examples/ListExtensions.json | 10 +- .../examples/UpdateExtension.json | 13 +- .../2020-07-01-preview/extensions.json | 187 +++++++++++++----- .../kubernetesconfiguration.json | 11 ++ 7 files changed, 190 insertions(+), 72 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index 8046da564880..de851e6ac44f 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -9,13 +9,17 @@ "clusterName": "clusterName1", "extensionInstance": { "properties": { - "extensionType": "Microsoft.OperationInsights/containerMonitoring", - "autoUpgrade": "true", + "extensionType": "azuremonitor-containers", + "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" + "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", + "omsagent.env.clusterName": "clusterName1" + }, + "configurationProtectedSettings": { + "omsagent.secret.key": "secretKeyValue01" } } } @@ -29,20 +33,22 @@ "type": "Microsoft.KubernetesConfiguration/extensions", "name": "ClusterMonitor", "properties": { - "extensionType": "Microsoft.OperationInsights/containerMonitoring", - "autoUpgrade": "true", + "extensionType": "azuremonitor-containers", + "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", "version": "0.1.4", "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - }, - "installStatus": "InstallPending", + "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" + "lastStatusTime": "2020-06-08T05:10:57.027Z", + "ErrorInfo": "" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json index 9ee0ad99413c..c83f0f250dd6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json @@ -15,6 +15,9 @@ "operatorType": "Flux", "operatorScope": "namespace", "operatorParams": "--git-email=xyzgituser@users.srs.github.com", + "configurationProtectedSettings": { + "protectedSetting1Key": "protectedSetting1Value" + }, "enableHelmOperator": "true", "helmOperatorProperties": { "chartVersion": "0.3.0", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index dfe86c1fed7e..07b26ba650c0 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -17,20 +17,22 @@ "type": "Microsoft.KubernetesConfiguration/extensions", "name": "ClusterMonitor", "properties": { - "extensionType": "Microsoft.OperationInsights/containerMonitoring", - "autoUpgrade": "true", + "extensionType": "azuremonitor-containers", + "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", "version": "0.1.4", "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - }, - "installStatus": "InstallPending", + "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" + "lastStatusTime": "2020-06-08T05:10:57.027Z", + "ErrorInfo": "" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index 0b1d9c199e19..99ac4c0772dd 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -16,13 +16,13 @@ "type": "Microsoft.KubernetesConfiguration/extensions", "name": "ClusterMonitor", "properties": { - "extensionType": "Microsoft.OperationInsights/containerMonitoring", - "autoUpgrade": "true", + "extensionType": "azuremonitor-containers", + "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", "version": "0.1.4", "scope": "namespace", "namespace": "insights", - "installStatus": "InstallPending", + "installState": "Pending", "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z" @@ -34,11 +34,11 @@ "name": "App1Monitor", "properties": { "extensionType": "Microsoft.RecoveryServices/recoveryVault", - "autoUpgrade": "false", + "autoUpgradeMinorVersion": "false", "version": "1.0.1", "scope": "namespace", "namespace": "app1", - "installStatus": "Installed", + "installState": "Installed", "creationTime": "2020-06-07T03:44:19.142Z", "lastModifiedTime": "2020-06-07T03:44:19.142Z", "lastStatusTime": "2020-06-07T04:09:23.011Z" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index 4fa41a063def..be51e16483bb 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -9,7 +9,7 @@ "clusterName": "clusterName1", "extensionInstance": { "properties": { - "autoUpgrade": "true", + "autoUpgradeMinorVersion": "true", "releaseTrain": "Stable" } } @@ -23,16 +23,17 @@ "type": "Microsoft.KubernetesConfiguration/extensions", "name": "ClusterMonitor", "properties": { - "extensionType": "Microsoft.OperationInsights/containerMonitoring", - "autoUpgrade": "true", + "extensionType": "azuremonitor-containers", + "autoUpgradeMinorVersion": "true", "releaseTrain": "Stable", "version": "0.0.9", "scope": "namespace", "namespace": "insights", "configurationSettings": { - "LogAnalyticsWorkspaceId": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.OperationalInsights/workspaces/65b8a862-ad7f-48b9-a9de-7478682b1fb4" - }, - "installStatus": "InstallPending", + "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", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 997481047b4c..d01adb10b78f 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -381,8 +381,8 @@ "type": "string" } }, - "AutoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", + "AutoUpgradeMinorVersion": { + "description": "Flag to note if this instance is enabled for Automatic upgrade of minor versions, or not.", "type": "string", "enum": [ "true", @@ -390,47 +390,62 @@ ], "default": "true", "x-ms-enum": { - "name": "autoUpgradeType", + "name": "autoUpgradeMinorVersionType", "modelAsString": true } }, "ReleaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", "type": "string", - "enum": [ - "Stable", - "Preview" - ], - "default": "Stable", - "x-ms-enum": { - "name": "releaseTrainType", - "modelAsString": true + "default": "Stable" + }, + "ScopeCluster": { + "description": "Specifies that the scope of the extensionInstance 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", + "type": "string" + } + } + }, + "ScopeNamespace": { + "description": "Specifies that the scope of the extensionInstance 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", + "type": "string" + } } }, "Scope": { - "description": "Scope at which the extension instance is installed.", - "type": "string", - "enum": [ - "cluster", - "namespace" - ], - "default": "namespace", - "x-ms-enum": { - "name": "extensionScopeType", - "modelAsString": true + "description": "Scope of the extensionInstance. 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", + "$ref": "#/definitions/ScopeCluster" + }, + "namespace": { + "type": "object", + "description": "Specifies that the scope of the extensionInstance is Namespace", + "$ref": "#/definitions/ScopeNamespace" + } } }, - "InstallStatus": { + "InstallState": { "description": "Status of installation of this instance of the extension.", "type": "string", "readOnly": true, "enum": [ - "InstallPending", + "Pending", "Installed", - "InstallFailed" + "Failed" ], "x-ms-enum": { - "name": "installStatusType", + "name": "installStateType", "modelAsString": true } }, @@ -483,16 +498,96 @@ "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." }, - "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", - "$ref": "#/definitions/AutoUpgrade" + "autoUpgradeMinorVersion": { + "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", + "$ref": "#/definitions/AutoUpgradeMinorVersion" }, "releaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "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 of the extension for this extension instance, if it is 'pinned' to a specific version.", + "description": "Version of the extension for this extension instance, if it is 'pinned' to a specific version. autoUpgradeMinorVersion must be 'false'.", + "type": "string" + }, + "scope": { + "description": "Scope at which the extension instance is installed.", + "$ref": "#/definitions/Scope" + }, + "namespace": { + "description": "The namespace to which this extension is installed.", + "type": "string", + "default": "default" + }, + "configurationSettings": { + "description": "Configuration settings, as name-value pairs for configuring this instance of the extension..", + "type": "object", + "$ref": "#/definitions/ConfigurationSettings" + }, + "installState": { + "type": "string", + "description": "Status of installation of this instance of the extension.", + "$ref": "#/definitions/InstallState" + }, + "statuses": { + "type": "array", + "description": "Status from this instance of the extension.", + "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.", + "readOnly": true, + "$ref": "#/definitions/ErrorDefinition" + } + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + }, + "ExtensionInstanceForCreate": { + "description": "Object to create a new Extension Instance.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties of an Extension Instance 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." + }, + "autoUpgradeMinorVersion": { + "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", + "$ref": "#/definitions/AutoUpgradeMinorVersion" + }, + "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 of the extension for this extension instance, if it is 'pinned' to a specific version. autoUpgradeMinorVersion must be 'false'.", "type": "string" }, "scope": { @@ -514,10 +609,10 @@ "type": "object", "$ref": "#/definitions/ConfigurationProtectedSettings" }, - "installStatus": { + "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStatus" + "$ref": "#/definitions/InstallState" }, "statuses": { "type": "array", @@ -541,11 +636,11 @@ "description": "DateLiteral (per ISO8601) noting the time of last status from the agent.", "readOnly": true }, - "error": { + "errorInfo": { "type": "object", - "description": "Error information from the Agent for errors during installation.", + "description": "Error information from the Agent - e.g. errors during installation.", "readOnly": true, - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorDefinition" } } } @@ -569,12 +664,12 @@ "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." }, - "autoUpgrade": { - "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", - "$ref": "#/definitions/AutoUpgrade" + "autoUpgradeMinorVersion": { + "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", + "$ref": "#/definitions/AutoUpgradeMinorVersion" }, "releaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", "$ref": "#/definitions/ReleaseTrain" }, "version": { @@ -590,10 +685,10 @@ "type": "string", "default": "default" }, - "installStatus": { + "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStatus" + "$ref": "#/definitions/InstallState" }, "creationTime": { "type": "string", @@ -651,16 +746,16 @@ "x-ms-client-flatten": true, "description": "Properties to update an Extension Instance resource", "properties": { - "autoUpgrade": { + "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", - "$ref": "#/definitions/AutoUpgrade" + "$ref": "#/definitions/AutoUpgradeMinorVersion" }, "releaseTrain": { - "description": "Upgrade releaseTrain this extension instance participates in - only if autoUpgrade is 'true'.", + "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. autoUpgrade must be 'false'.", + "description": "Version number of extension, to 'pin' to a specific version. autoUpgradeMinorVersion must be 'false'.", "type": "string" } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 8f461c9639d9..ccc9cd0aa9a6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -424,6 +424,12 @@ } } }, + "ConfigurationProtectedSettings": { + "description": "Name-value pairs of protected configuration settings for the configuration", + "additionalProperties": { + "type": "string" + } + }, "SourceControlConfiguration": { "description": "The SourceControl Configuration object.", "properties": { @@ -460,6 +466,11 @@ "description": "Any Parameters for the Operator instance in string format.", "type": "string" }, + "ConfigurationProtectedSettings": { + "description": "Name-value pairs of protected configuration settings for the configuration", + "type": "object", + "$ref": "#/definitions/ConfigurationProtectedSettings" + }, "operatorScope": { "description": "Scope at which the operator will be installed.", "type": "string", From 9faae7647d4dee6536439fb27a7bbacfd2fc149d Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 31 Jul 2020 11:56:03 -0700 Subject: [PATCH 28/62] Fix validation errors - 1 --- .../examples/CreateExtension.json | 18 ++++++++++++------ .../examples/GetExtension.json | 11 +++++++---- .../examples/ListExtensions.json | 14 ++++++++++---- .../examples/UpdateExtension.json | 9 ++++++--- .../preview/2020-07-01-preview/extensions.json | 15 --------------- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index de851e6ac44f..e16ae617f119 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -12,8 +12,11 @@ "extensionType": "azuremonitor-containers", "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", - "scope": "namespace", - "namespace": "insights", + "scope": { + "cluster": { + "releaseNamespace": "kube-system" + } + }, "configurationSettings": { "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", "omsagent.env.clusterName": "clusterName1" @@ -37,12 +40,15 @@ "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", "version": "0.1.4", - "scope": "namespace", - "namespace": "insights", + "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", @@ -53,4 +59,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 07b26ba650c0..aa91b53b16e9 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -21,12 +21,15 @@ "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", "version": "0.1.4", - "scope": "namespace", - "namespace": "insights", + "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", @@ -37,4 +40,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index 99ac4c0772dd..def5ae1bf79a 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -20,8 +20,11 @@ "autoUpgradeMinorVersion": "true", "releaseTrain": "Preview", "version": "0.1.4", - "scope": "namespace", - "namespace": "insights", + "scope": { + "cluster": { + "releaseNamespace": "kube-system" + } + }, "installState": "Pending", "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", @@ -36,8 +39,11 @@ "extensionType": "Microsoft.RecoveryServices/recoveryVault", "autoUpgradeMinorVersion": "false", "version": "1.0.1", - "scope": "namespace", - "namespace": "app1", + "scope": { + "cluster": { + "releaseNamespace": "myKVNamespace" + } + }, "installState": "Installed", "creationTime": "2020-06-07T03:44:19.142Z", "lastModifiedTime": "2020-06-07T03:44:19.142Z", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index be51e16483bb..2e3a0f94b4cc 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -27,12 +27,15 @@ "autoUpgradeMinorVersion": "true", "releaseTrain": "Stable", "version": "0.0.9", - "scope": "namespace", - "namespace": "insights", + "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", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index d01adb10b78f..3d0d0851e1c9 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -514,11 +514,6 @@ "description": "Scope at which the extension instance is installed.", "$ref": "#/definitions/Scope" }, - "namespace": { - "description": "The namespace to which this extension is installed.", - "type": "string", - "default": "default" - }, "configurationSettings": { "description": "Configuration settings, as name-value pairs for configuring this instance of the extension..", "type": "object", @@ -594,11 +589,6 @@ "description": "Scope at which the extension instance is installed.", "$ref": "#/definitions/Scope" }, - "namespace": { - "description": "The namespace to which this extension is installed.", - "type": "string", - "default": "default" - }, "configurationSettings": { "description": "Configuration settings, as name-value pairs for configuring this instance of the extension..", "type": "object", @@ -680,11 +670,6 @@ "description": "Scope at which the extension instance is installed.", "$ref": "#/definitions/Scope" }, - "namespace": { - "description": "The namespace to which this extension is installed.", - "type": "string", - "default": "default" - }, "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", From 701228cf56e2a2de8a5a1a964674ffc54874cbd6 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 31 Jul 2020 14:48:49 -0700 Subject: [PATCH 29/62] Fix validation errors - 2 --- .../preview/2020-07-01-preview/extensions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 3d0d0851e1c9..025ac45d78c7 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -375,8 +375,8 @@ "type": "string" } }, - "ConfigurationProtectedSettings": { - "description": "Name-value pairs of protected configuration settings for the extensionInstance", + "ExtensionProtectedSettings": { + "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", "additionalProperties": { "type": "string" } @@ -515,7 +515,7 @@ "$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 instance of the extension.", "type": "object", "$ref": "#/definitions/ConfigurationSettings" }, @@ -590,14 +590,14 @@ "$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 instance of the extension.", "type": "object", "$ref": "#/definitions/ConfigurationSettings" }, "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 instance of the extension.", "type": "object", - "$ref": "#/definitions/ConfigurationProtectedSettings" + "$ref": "#/definitions/ExtensionProtectedSettings" }, "installState": { "type": "string", From c3fde959b4abf2a5f80b22d7ea3cece9ba4e3ab6 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:47:39 -0700 Subject: [PATCH 30/62] Fix validation errors - 3 --- .../examples/CreateExtension.json | 2 +- .../examples/GetExtension.json | 2 +- .../2020-07-01-preview/extensions.json | 35 +------------------ 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index e16ae617f119..d3cd2a600610 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -54,7 +54,7 @@ "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", - "ErrorInfo": "" + "ErrorInfo": {} } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index aa91b53b16e9..7e58a32e5064 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -35,7 +35,7 @@ "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", - "ErrorInfo": "" + "ErrorInfo": {} } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 025ac45d78c7..861395970ab3 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -74,7 +74,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ExtensionInstance" + "$ref": "#/definitions/ExtensionInstanceForCreate" }, "description": "Properties necessary to Create an Extension Instance." } @@ -598,39 +598,6 @@ "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", "type": "object", "$ref": "#/definitions/ExtensionProtectedSettings" - }, - "installState": { - "type": "string", - "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallState" - }, - "statuses": { - "type": "array", - "description": "Status from this instance of the extension.", - "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.", - "readOnly": true, - "$ref": "#/definitions/ErrorDefinition" } } } From 0cf5e13b836b2975e1a044b2b3c304162df320a1 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 31 Jul 2020 16:14:41 -0700 Subject: [PATCH 31/62] Fix validation errors - 4 --- .../examples/CreateExtension.json | 2 +- .../examples/GetExtension.json | 2 +- .../kubernetesconfiguration.json | 94 +++++++++++++++++-- 3 files changed, 89 insertions(+), 9 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index d3cd2a600610..e4e1bed74c5c 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -54,7 +54,7 @@ "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", - "ErrorInfo": {} + "errorInfo": {} } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 7e58a32e5064..789abae3b605 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -35,7 +35,7 @@ "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", "lastStatusTime": "2020-06-08T05:10:57.027Z", - "ErrorInfo": {} + "errorInfo": {} } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index ccc9cd0aa9a6..fef0a4c9f578 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -122,7 +122,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/SourceControlConfiguration" + "$ref": "#/definitions/SourceControlConfigurationForCreate" }, "description": "Properties necessary to Create KubernetesConfiguration." } @@ -431,7 +431,7 @@ } }, "SourceControlConfiguration": { - "description": "The SourceControl Configuration object.", + "description": "The SourceControl Configuration object returned in Get & Put response.", "properties": { "properties": { "type": "object", @@ -466,11 +466,6 @@ "description": "Any Parameters for the Operator instance in string format.", "type": "string" }, - "ConfigurationProtectedSettings": { - "description": "Name-value pairs of protected configuration settings for the configuration", - "type": "object", - "$ref": "#/definitions/ConfigurationProtectedSettings" - }, "operatorScope": { "description": "Scope at which the operator will be installed.", "type": "string", @@ -537,6 +532,91 @@ } ] }, + "SourceControlConfigurationForCreate": { + "description": "The SourceControl Configuration object to create a new configuration.", + "properties": { + "properties": { + "type": "object", + "x-ms-client-flatten": true, + "description": "Properties to create a Source Control Configuration resource", + "properties": { + "repositoryUrl": { + "type": "string", + "description": "Url of the SourceControl Repository." + }, + "operatorNamespace": { + "description": "The namespace to which this operator is installed to. Maximum of 253 lower case alphanumeric characters, hyphen and period only.", + "type": "string", + "default": "default" + }, + "operatorInstanceName": { + "description": "Instance name of the operator - identifying the specific configuration.", + "type": "string" + }, + "operatorType": { + "description": "Type of the operator", + "type": "string", + "enum": [ + "Flux" + ], + "x-ms-enum": { + "name": "operatorType", + "modelAsString": true + } + }, + "operatorParams": { + "description": "Any Parameters for the Operator instance in string format.", + "type": "string" + }, + "ConfigurationProtectedSettings": { + "description": "Name-value pairs of protected configuration settings for the configuration", + "type": "object", + "$ref": "#/definitions/ConfigurationProtectedSettings" + }, + "operatorScope": { + "description": "Scope at which the operator will be installed.", + "type": "string", + "enum": [ + "cluster", + "namespace" + ], + "default": "cluster", + "x-ms-enum": { + "name": "operatorScope", + "modelAsString": true + } + }, + "repositoryPublicKey": { + "description": "Public Key associated with this SourceControl configuration (either generated within the cluster or provided by the user).", + "type": "string", + "readOnly": true + }, + "enableHelmOperator": { + "description": "Option to enable Helm Operator for this git configuration.", + "type": "string", + "enum": [ + "true", + "false" + ], + "x-ms-enum": { + "name": "enableHelmOperator", + "modelAsString": true + } + }, + "helmOperatorProperties": { + "description": "Properties for Helm operator.", + "type": "object", + "$ref": "#/definitions/HelmOperatorProperties" + } + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + }, "SourceControlConfigurationList": { "description": "Result of the request to list Source Control Configurations. It contains a list of SourceControlConfiguration objects and a URL link to get the next set of results.", "properties": { From 6aed2ab6844a0210777df6f0953d2b170bb0d90b Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 31 Jul 2020 16:50:56 -0700 Subject: [PATCH 32/62] Fix validation errors - 5 --- .../preview/2020-07-01-preview/examples/CreateExtension.json | 3 +-- .../preview/2020-07-01-preview/examples/GetExtension.json | 3 +-- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index e4e1bed74c5c..a9ad2ccba990 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -53,8 +53,7 @@ "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z", - "errorInfo": {} + "lastStatusTime": "2020-06-08T05:10:57.027Z" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 789abae3b605..8c3e7730e454 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -34,8 +34,7 @@ "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", "lastModifiedTime": "2020-06-08T05:10:57.027Z", - "lastStatusTime": "2020-06-08T05:10:57.027Z", - "errorInfo": {} + "lastStatusTime": "2020-06-08T05:10:57.027Z" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index fef0a4c9f578..0b8063b2e30c 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -568,7 +568,7 @@ "description": "Any Parameters for the Operator instance in string format.", "type": "string" }, - "ConfigurationProtectedSettings": { + "configurationProtectedSettings": { "description": "Name-value pairs of protected configuration settings for the configuration", "type": "object", "$ref": "#/definitions/ConfigurationProtectedSettings" From aaa59abb111d97e7fda1769623f74b583b314ffe Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Fri, 31 Jul 2020 17:44:57 -0700 Subject: [PATCH 33/62] Fix Prettier & LintDiff errors --- .../preview/2020-07-01-preview/extensions.json | 2 +- .../kubernetesconfiguration.json | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 861395970ab3..51a86600dd4d 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -472,7 +472,7 @@ ], "default": "Information", "x-ms-enum": { - "name": "statusMessageLevelType", + "name": "levelType", "modelAsString": true } }, diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 0b8063b2e30c..36cd054b1ccb 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -380,7 +380,7 @@ "Information" ], "x-ms-enum": { - "name": "messageLevel", + "name": "messageLevelType", "modelAsString": true } } @@ -391,7 +391,7 @@ "type": "string", "readOnly": true, "x-ms-enum": { - "name": "complianceState", + "name": "complianceStateType", "modelAsString": true }, "enum": [ @@ -475,7 +475,7 @@ ], "default": "cluster", "x-ms-enum": { - "name": "operatorScope", + "name": "operatorScopeType", "modelAsString": true } }, @@ -492,7 +492,7 @@ "false" ], "x-ms-enum": { - "name": "enableHelmOperator", + "name": "enableHelmOperatorType", "modelAsString": true } }, @@ -507,7 +507,7 @@ "readOnly": true, "x-ms-enum": { "modelAsString": true, - "name": "ProvisioningState" + "name": "ProvisioningStateType" }, "enum": [ "Accepted", @@ -582,7 +582,7 @@ ], "default": "cluster", "x-ms-enum": { - "name": "operatorScope", + "name": "operatorScopeType", "modelAsString": true } }, @@ -599,7 +599,7 @@ "false" ], "x-ms-enum": { - "name": "enableHelmOperator", + "name": "enableHelmOperatorType", "modelAsString": true } }, From 12253dd0c238506e4a91a416d1cf67094e72b569 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 11:31:01 -0700 Subject: [PATCH 34/62] Fix Prettier & LintDiff errors - 2 --- .../2020-07-01-preview/extensions.json | 20 +++++------ .../kubernetesconfiguration.json | 36 ++++++++----------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 51a86600dd4d..9a66d52252c8 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -381,7 +381,7 @@ "type": "string" } }, - "AutoUpgradeMinorVersion": { + "AutoUpgradeMinorVersionDefinition": { "description": "Flag to note if this instance is enabled for Automatic upgrade of minor versions, or not.", "type": "string", "enum": [ @@ -390,7 +390,7 @@ ], "default": "true", "x-ms-enum": { - "name": "autoUpgradeMinorVersionType", + "name": "AutoUpgradeMinorVersionType", "modelAsString": true } }, @@ -435,7 +435,7 @@ } } }, - "InstallState": { + "InstallStateDefinition": { "description": "Status of installation of this instance of the extension.", "type": "string", "readOnly": true, @@ -445,7 +445,7 @@ "Failed" ], "x-ms-enum": { - "name": "installStateType", + "name": "InstallStateType", "modelAsString": true } }, @@ -472,7 +472,7 @@ ], "default": "Information", "x-ms-enum": { - "name": "levelType", + "name": "LevelType", "modelAsString": true } }, @@ -522,7 +522,7 @@ "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallState" + "$ref": "#/definitions/InstallStateDefinition" }, "statuses": { "type": "array", @@ -575,7 +575,7 @@ }, "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersion" + "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", @@ -623,7 +623,7 @@ }, "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersion" + "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", @@ -640,7 +640,7 @@ "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallState" + "$ref": "#/definitions/InstallStateDefinition" }, "creationTime": { "type": "string", @@ -700,7 +700,7 @@ "properties": { "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersion" + "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 36cd054b1ccb..c092f20d61e6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -359,8 +359,18 @@ "properties": { "complianceState": { "description": "The compliance state of the configuration.", - "$ref": "#/definitions/ComplianceState", - "readOnly": true + "readOnly": true, + "x-ms-enum": { + "name": "ComplianceStateType", + "modelAsString": true + }, + "enum": [ + "Pending", + "Compliant", + "Noncompliant", + "Installed", + "Failed" + ] }, "lastConfigApplied": { "description": "Datetime the configuration was last applied.", @@ -380,28 +390,12 @@ "Information" ], "x-ms-enum": { - "name": "messageLevelType", + "name": "MessageLevelType", "modelAsString": true } } } }, - "ComplianceState": { - "description": "The compliance state of the configuration.", - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "complianceStateType", - "modelAsString": true - }, - "enum": [ - "Pending", - "Compliant", - "Noncompliant", - "Installed", - "Failed" - ] - }, "ChartVersion": { "description": "Version of the operator Helm chart.", "type": "string" @@ -458,7 +452,7 @@ "Flux" ], "x-ms-enum": { - "name": "operatorType", + "name": "OperatorType", "modelAsString": true } }, @@ -475,7 +469,7 @@ ], "default": "cluster", "x-ms-enum": { - "name": "operatorScopeType", + "name": "OperatorScopeType", "modelAsString": true } }, From 42d819521f0c599bfa4c4a8d4b86c80819e876e9 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 11:39:20 -0700 Subject: [PATCH 35/62] Fix Prettier & LintDiff errors - 3 --- .../preview/2020-07-01-preview/extensions.json | 2 +- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 9a66d52252c8..6ae30b1a0c8e 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -500,7 +500,7 @@ }, "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersion" + "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index c092f20d61e6..e81e7b41bee6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -354,7 +354,7 @@ }, "ComplianceStatus": { "description": "Compliance Status details", - "type": "object", + "type": "string", "readOnly": true, "properties": { "complianceState": { From 7eb71f18bfc77aa440c1722f67ffdf35080fc2eb Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 11:52:17 -0700 Subject: [PATCH 36/62] Fix Prettier & LintDiff errors - 4 --- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index e81e7b41bee6..c092f20d61e6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -354,7 +354,7 @@ }, "ComplianceStatus": { "description": "Compliance Status details", - "type": "string", + "type": "object", "readOnly": true, "properties": { "complianceState": { From d6179eb2d7774dbca1d7f0c4245b15bf65b28184 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 12:22:58 -0700 Subject: [PATCH 37/62] Fix Prettier issues, etc. --- .../preview/2020-07-01-preview/examples/CreateExtension.json | 2 +- .../preview/2020-07-01-preview/examples/GetExtension.json | 2 +- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index a9ad2ccba990..5acf395bd562 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -58,4 +58,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 8c3e7730e454..5fb7c11cf8c1 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -39,4 +39,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index c092f20d61e6..543a1c0535f6 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -359,6 +359,7 @@ "properties": { "complianceState": { "description": "The compliance state of the configuration.", + "type": "string", "readOnly": true, "x-ms-enum": { "name": "ComplianceStateType", From e2fa8a936ec019205ba807dbb83ad801b48d9322 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:31:58 -0700 Subject: [PATCH 38/62] Change AutoUpgrade to boolean type --- .../2020-07-01-preview/extensions.json | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 6ae30b1a0c8e..729e755f2032 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -381,19 +381,6 @@ "type": "string" } }, - "AutoUpgradeMinorVersionDefinition": { - "description": "Flag to note if this instance is enabled for Automatic upgrade of minor versions, or not.", - "type": "string", - "enum": [ - "true", - "false" - ], - "default": "true", - "x-ms-enum": { - "name": "AutoUpgradeMinorVersionType", - "modelAsString": true - } - }, "ReleaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", "type": "string", @@ -500,7 +487,7 @@ }, "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" + "type": "boolean" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", @@ -575,7 +562,7 @@ }, "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" + "type": "boolean" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", @@ -623,7 +610,7 @@ }, "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in auto upgrade of minor version, or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" + "type": "boolean" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", @@ -700,7 +687,7 @@ "properties": { "autoUpgradeMinorVersion": { "description": "Flag to note if this instance participates in Extension Lifecycle Management or not.", - "$ref": "#/definitions/AutoUpgradeMinorVersionDefinition" + "type": "boolean" }, "releaseTrain": { "description": "ReleaseTrain this extension instance participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.", From d3f18e78b5a76ea81884fc416428b9f2d69413b3 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:42:08 -0700 Subject: [PATCH 39/62] Change AutoUpgrade to boolean type in examples --- .../preview/2020-07-01-preview/examples/CreateExtension.json | 4 ++-- .../preview/2020-07-01-preview/examples/GetExtension.json | 2 +- .../preview/2020-07-01-preview/examples/ListExtensions.json | 4 ++-- .../preview/2020-07-01-preview/examples/UpdateExtension.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json index 5acf395bd562..deb7ba07f06d 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateExtension.json @@ -10,7 +10,7 @@ "extensionInstance": { "properties": { "extensionType": "azuremonitor-containers", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "releaseTrain": "Preview", "scope": { "cluster": { @@ -37,7 +37,7 @@ "name": "ClusterMonitor", "properties": { "extensionType": "azuremonitor-containers", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "releaseTrain": "Preview", "version": "0.1.4", "scope": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 5fb7c11cf8c1..0bee4dfe5a61 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -18,7 +18,7 @@ "name": "ClusterMonitor", "properties": { "extensionType": "azuremonitor-containers", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "releaseTrain": "Preview", "version": "0.1.4", "scope": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index def5ae1bf79a..b94742788aac 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -17,7 +17,7 @@ "name": "ClusterMonitor", "properties": { "extensionType": "azuremonitor-containers", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "releaseTrain": "Preview", "version": "0.1.4", "scope": { @@ -37,7 +37,7 @@ "name": "App1Monitor", "properties": { "extensionType": "Microsoft.RecoveryServices/recoveryVault", - "autoUpgradeMinorVersion": "false", + "autoUpgradeMinorVersion": false, "version": "1.0.1", "scope": { "cluster": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index 2e3a0f94b4cc..a5b5e4f5726f 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -24,7 +24,7 @@ "name": "ClusterMonitor", "properties": { "extensionType": "azuremonitor-containers", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "releaseTrain": "Stable", "version": "0.0.9", "scope": { From 1833347e8228deb641fed14338e0ab62864d8ec1 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 14:32:52 -0700 Subject: [PATCH 40/62] Change AutoUpgrade to boolean type in Update example --- .../preview/2020-07-01-preview/examples/UpdateExtension.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json index a5b5e4f5726f..0285f5dc7aa1 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/UpdateExtension.json @@ -9,7 +9,7 @@ "clusterName": "clusterName1", "extensionInstance": { "properties": { - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "releaseTrain": "Stable" } } From a8dededbe9639ec9be5e57e109ba804cf9371170 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 17:20:33 -0700 Subject: [PATCH 41/62] Update Enum definitions --- .../kubernetesconfiguration.json | 96 ++++++++----------- 1 file changed, 42 insertions(+), 54 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 543a1c0535f6..a5820967196c 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -425,6 +425,42 @@ "type": "string" } }, + "OperatorTypeDefinition": { + "description": "Type of the operator", + "type": "string", + "enum": [ + "Flux" + ], + "x-ms-enum": { + "name": "OperatorType", + "modelAsString": true + } + }, + "OperatorScopeDefinition": { + "description": "Scope at which the operator will be installed.", + "type": "string", + "enum": [ + "cluster", + "namespace" + ], + "default": "cluster", + "x-ms-enum": { + "name": "OperatorScopeType", + "modelAsString": true + } + }, + "EnableHelmOperatorDefinition": { + "description": "Option to enable Helm Operator for this git configuration.", + "type": "boolean", + "enum": [ + "true", + "false" + ], + "x-ms-enum": { + "name": "EnableHelmOperatorType", + "modelAsString": true + } + }, "SourceControlConfiguration": { "description": "The SourceControl Configuration object returned in Get & Put response.", "properties": { @@ -448,14 +484,7 @@ }, "operatorType": { "description": "Type of the operator", - "type": "string", - "enum": [ - "Flux" - ], - "x-ms-enum": { - "name": "OperatorType", - "modelAsString": true - } + "$ref": "#/definitions/OperatorTypeDefinition" }, "operatorParams": { "description": "Any Parameters for the Operator instance in string format.", @@ -463,16 +492,7 @@ }, "operatorScope": { "description": "Scope at which the operator will be installed.", - "type": "string", - "enum": [ - "cluster", - "namespace" - ], - "default": "cluster", - "x-ms-enum": { - "name": "OperatorScopeType", - "modelAsString": true - } + "$ref": "#/definitions/OperatorScopeDefinition" }, "repositoryPublicKey": { "description": "Public Key associated with this SourceControl configuration (either generated within the cluster or provided by the user).", @@ -481,15 +501,7 @@ }, "enableHelmOperator": { "description": "Option to enable Helm Operator for this git configuration.", - "type": "string", - "enum": [ - "true", - "false" - ], - "x-ms-enum": { - "name": "enableHelmOperatorType", - "modelAsString": true - } + "$ref": "#/definitions/EnableHelmOperatorDefinition" }, "helmOperatorProperties": { "description": "Properties for Helm operator.", @@ -550,14 +562,7 @@ }, "operatorType": { "description": "Type of the operator", - "type": "string", - "enum": [ - "Flux" - ], - "x-ms-enum": { - "name": "operatorType", - "modelAsString": true - } + "$ref": "#/definitions/OperatorTypeDefinition" }, "operatorParams": { "description": "Any Parameters for the Operator instance in string format.", @@ -570,16 +575,7 @@ }, "operatorScope": { "description": "Scope at which the operator will be installed.", - "type": "string", - "enum": [ - "cluster", - "namespace" - ], - "default": "cluster", - "x-ms-enum": { - "name": "operatorScopeType", - "modelAsString": true - } + "$ref": "#/definitions/OperatorScopeDefinition" }, "repositoryPublicKey": { "description": "Public Key associated with this SourceControl configuration (either generated within the cluster or provided by the user).", @@ -588,15 +584,7 @@ }, "enableHelmOperator": { "description": "Option to enable Helm Operator for this git configuration.", - "type": "string", - "enum": [ - "true", - "false" - ], - "x-ms-enum": { - "name": "enableHelmOperatorType", - "modelAsString": true - } + "$ref": "#/definitions/EnableHelmOperatorDefinition" }, "helmOperatorProperties": { "description": "Properties for Helm operator.", From 7c4aa7e50b6b650900ae66588e6ca7ecfabd6c32 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 17:24:54 -0700 Subject: [PATCH 42/62] Fix examples --- .../examples/CreateSourceControlConfiguration.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json index c83f0f250dd6..f07170714bea 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json @@ -18,7 +18,7 @@ "configurationProtectedSettings": { "protectedSetting1Key": "protectedSetting1Value" }, - "enableHelmOperator": "true", + "enableHelmOperator": true, "helmOperatorProperties": { "chartVersion": "0.3.0", "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" @@ -41,7 +41,7 @@ "operatorType": "Flux", "operatorScope": "namespace", "operatorParams": "--git-email=xyzgituser@users.srs.github.com", - "enableHelmOperator": "true", + "enableHelmOperator": true, "helmOperatorProperties": { "chartVersion": "0.3.0", "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" @@ -71,7 +71,7 @@ "operatorType": "Flux", "operatorScope": "namespace", "operatorParams": "--git-email=xyzgituser@users.srs.github.com", - "enableHelmOperator": "true", + "enableHelmOperator": true, "helmOperatorProperties": { "chartVersion": "0.3.0", "chartValues": "--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system" From 9a39f4acfc84df366c3c2792301d32c1c6cc8518 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 17:43:39 -0700 Subject: [PATCH 43/62] Remove whitespaces --- .../preview/2020-07-01-preview/kubernetesconfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index a5820967196c..46e7ae7553c2 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -434,7 +434,7 @@ "x-ms-enum": { "name": "OperatorType", "modelAsString": true - } + } }, "OperatorScopeDefinition": { "description": "Scope at which the operator will be installed.", From 669a3676de97cf248440c3d78a35a17e2e0990f6 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 3 Aug 2020 18:42:20 -0700 Subject: [PATCH 44/62] Added Created & LastModified to config. --- .../examples/CreateSourceControlConfiguration.json | 12 ++++++++---- .../examples/GetSourceControlConfiguration.json | 6 ++++-- .../2020-07-01-preview/kubernetesconfiguration.json | 10 ++++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json index f07170714bea..cb4b8742f6d3 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json @@ -50,10 +50,12 @@ "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Pending", - "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "lastConfigApplied": "2020-06-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" - } + }, + "creationTime": "2020-06-08T05:10:57.027Z", + "lastModifiedTime": "2020-06-08T05:10:57.027Z" } } }, @@ -80,10 +82,12 @@ "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Pending", - "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "lastConfigApplied": "2020-06-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" - } + }, + "creationTime": "2020-06-08T05:10:57.027Z", + "lastModifiedTime": "2020-06-08T05:10:57.027Z" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json index fa02e958332b..32575dd36d02 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json @@ -31,10 +31,12 @@ "provisioningState": "Succeeded", "complianceStatus": { "complianceState": "Pending", - "lastConfigApplied": "2019-09-10T05:10:57.027Z", + "lastConfigApplied": "2020-06-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" - } + }, + "creationTime": "2020-06-08T05:10:57.027Z", + "lastModifiedTime": "2020-06-08T05:10:57.027Z" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 46e7ae7553c2..27ef821db721 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -529,6 +529,16 @@ "description": "Compliance Status of the Configuration", "readOnly": true, "$ref": "#/definitions/ComplianceStatus" + }, + "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 } } } From 3d15cbc22b6a8437eb93d21a0a3247ed37838ae3 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 5 Aug 2020 07:44:56 -0700 Subject: [PATCH 45/62] Fix list example --- .../preview/2020-07-01-preview/examples/ListExtensions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json index b94742788aac..91169c54714e 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/ListExtensions.json @@ -38,6 +38,7 @@ "properties": { "extensionType": "Microsoft.RecoveryServices/recoveryVault", "autoUpgradeMinorVersion": false, + "releaseTrain": "Stable", "version": "1.0.1", "scope": { "cluster": { From 6070e69d72c42d218df11e42d91f778fb4920c7c Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Wed, 5 Aug 2020 09:38:04 -0700 Subject: [PATCH 46/62] Add customLocationSettings --- .../2020-07-01-preview/examples/GetExtension.json | 15 +++++++++++++++ .../preview/2020-07-01-preview/extensions.json | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 0bee4dfe5a61..83744f901b35 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -30,6 +30,21 @@ "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", "omsagent.env.clusterName": "clusterName1" }, + "customLocationSettings": { + "RPAppId" : "000-000-000-0000", + "ClusterRole": "Rolename", + "EnabledResourceTypes": [{ + "ApiVersion": "2020-08-01-preview", + "ResourceType": "virtualMachines", + "ResourceProviderNamespace": "Microsoft.Compute", + "ResourceMapping": { + "Version": "v1", + "Group": "stable.example.com", + "Kind": "CronTab", + "Name": "crontabs" + } + }] + }, "installState": "Pending", "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 729e755f2032..75681507a71a 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -386,6 +386,12 @@ "type": "string", "default": "Stable" }, + "CustomLocationSettings": { + "description": "Settings for CustomLocation enabled extensions (only)", + "additionalProperties": { + "type": "string" + } + }, "ScopeCluster": { "description": "Specifies that the scope of the extensionInstance is Cluster", "type": "object", @@ -506,6 +512,12 @@ "type": "object", "$ref": "#/definitions/ConfigurationSettings" }, + "customLocationSettings": { + "description": "Settings for CustomLocation enabled extension instances (only).", + "type": "object", + "$ref": "#/definitions/CustomLocationSettings", + "readonly": true + }, "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", From ade14ff3a62648ab769ceb80fa09ab6b7c2b44af Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Thu, 6 Aug 2020 14:12:51 -0700 Subject: [PATCH 47/62] Change type of additionalProperties of CustomLocationSettings --- .../2020-07-01-preview/examples/GetExtension.json | 14 ++++++++------ .../preview/2020-07-01-preview/extensions.json | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 83744f901b35..1c43b6243497 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -33,17 +33,19 @@ "customLocationSettings": { "RPAppId" : "000-000-000-0000", "ClusterRole": "Rolename", - "EnabledResourceTypes": [{ + "EnabledResourceTypes": [ + { "ApiVersion": "2020-08-01-preview", "ResourceType": "virtualMachines", "ResourceProviderNamespace": "Microsoft.Compute", "ResourceMapping": { - "Version": "v1", - "Group": "stable.example.com", - "Kind": "CronTab", - "Name": "crontabs" + "Version": "v1", + "Group": "stable.example.com", + "Kind": "CronTab", + "Name": "crontabs" } - }] + } + ] }, "installState": "Pending", "statuses": [], diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 75681507a71a..dae6b86dde5f 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -387,9 +387,10 @@ "default": "Stable" }, "CustomLocationSettings": { + "type": "object", "description": "Settings for CustomLocation enabled extensions (only)", "additionalProperties": { - "type": "string" + "type": "object" } }, "ScopeCluster": { From 4a26bf1add96e86c1428462df3a037356f3f4f33 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Thu, 6 Aug 2020 14:30:51 -0700 Subject: [PATCH 48/62] Fix Prettier & LintDiff errors --- .../preview/2020-07-01-preview/examples/GetExtension.json | 2 +- .../preview/2020-07-01-preview/extensions.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 1c43b6243497..2f0e1ad61f71 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -31,7 +31,7 @@ "omsagent.env.clusterName": "clusterName1" }, "customLocationSettings": { - "RPAppId" : "000-000-000-0000", + "RPAppId": "000-000-000-0000", "ClusterRole": "Rolename", "EnabledResourceTypes": [ { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index dae6b86dde5f..d87dbfa8b2bc 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -516,8 +516,7 @@ "customLocationSettings": { "description": "Settings for CustomLocation enabled extension instances (only).", "type": "object", - "$ref": "#/definitions/CustomLocationSettings", - "readonly": true + "$ref": "#/definitions/CustomLocationSettings" }, "installState": { "type": "string", From a9c4b6127a4890e7e24f9f484b63a171d1aaf74d Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 10 Aug 2020 15:41:21 -0700 Subject: [PATCH 49/62] Remove customLocationSettings --- .../examples/GetExtension.json | 17 ----------------- .../preview/2020-07-01-preview/extensions.json | 12 ------------ 2 files changed, 29 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json index 2f0e1ad61f71..0bee4dfe5a61 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetExtension.json @@ -30,23 +30,6 @@ "omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b", "omsagent.env.clusterName": "clusterName1" }, - "customLocationSettings": { - "RPAppId": "000-000-000-0000", - "ClusterRole": "Rolename", - "EnabledResourceTypes": [ - { - "ApiVersion": "2020-08-01-preview", - "ResourceType": "virtualMachines", - "ResourceProviderNamespace": "Microsoft.Compute", - "ResourceMapping": { - "Version": "v1", - "Group": "stable.example.com", - "Kind": "CronTab", - "Name": "crontabs" - } - } - ] - }, "installState": "Pending", "statuses": [], "creationTime": "2020-06-08T05:10:57.027Z", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index d87dbfa8b2bc..729e755f2032 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -386,13 +386,6 @@ "type": "string", "default": "Stable" }, - "CustomLocationSettings": { - "type": "object", - "description": "Settings for CustomLocation enabled extensions (only)", - "additionalProperties": { - "type": "object" - } - }, "ScopeCluster": { "description": "Specifies that the scope of the extensionInstance is Cluster", "type": "object", @@ -513,11 +506,6 @@ "type": "object", "$ref": "#/definitions/ConfigurationSettings" }, - "customLocationSettings": { - "description": "Settings for CustomLocation enabled extension instances (only).", - "type": "object", - "$ref": "#/definitions/CustomLocationSettings" - }, "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", From 8d6235f2d8592e1d67ecf120199fc336768e0e41 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Mon, 10 Aug 2020 17:14:49 -0700 Subject: [PATCH 50/62] Fix Error object for List --- .../preview/2020-07-01-preview/extensions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 729e755f2032..b847e91e77fa 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -644,11 +644,11 @@ "description": "DateLiteral (per ISO8601) noting the time of last status from the agent.", "readOnly": true }, - "error": { + "errorInfo": { "type": "object", - "description": "Error information from the Agent for errors during installation.", + "description": "Error information from the Agent - e.g. errors during installation.", "readOnly": true, - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorDefinition" } } } From bdc2d880473a600ccc03b2806aabce463fceef8e Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Tue, 11 Aug 2020 14:55:54 -0700 Subject: [PATCH 51/62] Add Extension Identity --- .../2020-07-01-preview/extensions.json | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index b847e91e77fa..e975ecf04a73 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -473,6 +473,33 @@ } } }, + "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 configuraiton.", + "enum": [ + "SystemAssigned", + "None" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + } + }, + "description": "Identity for the managed cluster." + }, "ExtensionInstance": { "description": "The Extension Instance object.", "properties": { @@ -540,6 +567,10 @@ "$ref": "#/definitions/ErrorDefinition" } } + }, + "identity": { + "$ref": "#/definitions/ConfigurationIdentity", + "description": "The identity of the configuration." } }, "allOf": [ @@ -587,6 +618,10 @@ "$ref": "#/definitions/ExtensionProtectedSettings" } } + }, + "identity": { + "$ref": "#/definitions/ConfigurationIdentity", + "description": "The identity of the configuration." } }, "allOf": [ @@ -651,6 +686,10 @@ "$ref": "#/definitions/ErrorDefinition" } } + }, + "identity": { + "$ref": "#/definitions/ConfigurationIdentity", + "description": "The identity of the configuration." } }, "allOf": [ From dee3d5190508ed491ca59e8f8c336a7b667b3fb0 Mon Sep 17 00:00:00 2001 From: NarayanThiru <36019292+NarayanThiru@users.noreply.github.com> Date: Tue, 11 Aug 2020 16:29:22 -0700 Subject: [PATCH 52/62] Fix spelling error --- .../preview/2020-07-01-preview/extensions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index e975ecf04a73..70af31f97292 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -487,7 +487,7 @@ }, "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 configuraiton.", + "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" From 54105e8ca7c1c1203f2b2a7259a9a564f03d8d3d Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Tue, 23 Feb 2021 13:59:11 -0800 Subject: [PATCH 53/62] update 2020-07-01=preview swagger --- .../2020-07-01-preview/extensions.json | 96 +++++------ .../kubernetesconfiguration.json | 157 ++++++++---------- 2 files changed, 118 insertions(+), 135 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 70af31f97292..1382be8b72a2 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -74,7 +74,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ExtensionInstanceForCreate" + "$ref": "#/definitions/ExtensionInstance" }, "description": "Properties necessary to Create an Extension Instance." } @@ -308,6 +308,44 @@ } }, "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", @@ -326,6 +364,10 @@ "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 @@ -532,7 +574,12 @@ "description": "Configuration settings, as name-value pairs for configuring this instance of the extension.", "type": "object", "$ref": "#/definitions/ConfigurationSettings" - }, + }, + "configurationProtectedSettings": { + "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", + "type": "object", + "$ref": "#/definitions/ExtensionProtectedSettings" + } "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", @@ -579,51 +626,6 @@ } ] }, - "ExtensionInstanceForCreate": { - "description": "Object to create a new Extension Instance.", - "properties": { - "properties": { - "type": "object", - "x-ms-client-flatten": true, - "description": "Properties of an Extension Instance 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." - }, - "autoUpgradeMinorVersion": { - "description": "Flag to note if this instance participates in auto upgrade of minor version, 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 of the extension for this extension instance, if it is 'pinned' to a specific version. autoUpgradeMinorVersion must be 'false'.", - "type": "string" - }, - "scope": { - "description": "Scope at which the extension instance is installed.", - "$ref": "#/definitions/Scope" - }, - "configurationSettings": { - "description": "Configuration settings, as name-value pairs for configuring this instance of the extension.", - "type": "object", - "$ref": "#/definitions/ConfigurationSettings" - }, - "configurationProtectedSettings": { - "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", - "type": "object", - "$ref": "#/definitions/ExtensionProtectedSettings" - } - } - }, - "identity": { - "$ref": "#/definitions/ConfigurationIdentity", - "description": "The identity of the configuration." - } - }, "allOf": [ { "$ref": "#/definitions/ProxyResource" diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 27ef821db721..3366088a0037 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -122,7 +122,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/SourceControlConfigurationForCreate" + "$ref": "#/definitions/SourceControlConfiguration" }, "description": "Properties necessary to Create KubernetesConfiguration." } @@ -273,6 +273,12 @@ "schema": { "$ref": "#/definitions/ResourceProviderOperationList" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } } }, "x-ms-pageable": { @@ -282,6 +288,44 @@ } }, "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", @@ -300,6 +344,10 @@ "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 @@ -449,22 +497,10 @@ "modelAsString": true } }, - "EnableHelmOperatorDefinition": { - "description": "Option to enable Helm Operator for this git configuration.", - "type": "boolean", - "enum": [ - "true", - "false" - ], - "x-ms-enum": { - "name": "EnableHelmOperatorType", - "modelAsString": true - } - }, "SourceControlConfiguration": { "description": "The SourceControl Configuration object returned in Get & Put response.", "properties": { - "properties": { + "properties": { "type": "object", "x-ms-client-flatten": true, "description": "Properties to create a Source Control Configuration resource", @@ -490,6 +526,11 @@ "description": "Any Parameters for the Operator instance in string format.", "type": "string" }, + "configurationProtectedSettings": { + "description": "Name-value pairs of protected configuration settings for the configuration", + "type": "object", + "$ref": "#/definitions/ConfigurationProtectedSettings" + }, "operatorScope": { "description": "Scope at which the operator will be installed.", "$ref": "#/definitions/OperatorScopeDefinition" @@ -499,15 +540,19 @@ "type": "string", "readOnly": true }, + "sshKnownHostsContents": { + "description": "Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances", + "type": "string" + }, "enableHelmOperator": { "description": "Option to enable Helm Operator for this git configuration.", - "$ref": "#/definitions/EnableHelmOperatorDefinition" + "type": "boolean" }, "helmOperatorProperties": { "description": "Properties for Helm operator.", "type": "object", "$ref": "#/definitions/HelmOperatorProperties" - }, + }, "provisioningState": { "type": "string", "description": "The provisioning state of the resource provider.", @@ -529,79 +574,9 @@ "description": "Compliance Status of the Configuration", "readOnly": true, "$ref": "#/definitions/ComplianceStatus" - }, - "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 - } - } - } - }, - "allOf": [ - { - "$ref": "#/definitions/ProxyResource" - } - ] - }, - "SourceControlConfigurationForCreate": { - "description": "The SourceControl Configuration object to create a new configuration.", - "properties": { - "properties": { - "type": "object", - "x-ms-client-flatten": true, - "description": "Properties to create a Source Control Configuration resource", - "properties": { - "repositoryUrl": { - "type": "string", - "description": "Url of the SourceControl Repository." - }, - "operatorNamespace": { - "description": "The namespace to which this operator is installed to. Maximum of 253 lower case alphanumeric characters, hyphen and period only.", - "type": "string", - "default": "default" - }, - "operatorInstanceName": { - "description": "Instance name of the operator - identifying the specific configuration.", - "type": "string" - }, - "operatorType": { - "description": "Type of the operator", - "$ref": "#/definitions/OperatorTypeDefinition" - }, - "operatorParams": { - "description": "Any Parameters for the Operator instance in string format.", - "type": "string" - }, - "configurationProtectedSettings": { - "description": "Name-value pairs of protected configuration settings for the configuration", - "type": "object", - "$ref": "#/definitions/ConfigurationProtectedSettings" - }, - "operatorScope": { - "description": "Scope at which the operator will be installed.", - "$ref": "#/definitions/OperatorScopeDefinition" - }, - "repositoryPublicKey": { - "description": "Public Key associated with this SourceControl configuration (either generated within the cluster or provided by the user).", - "type": "string", - "readOnly": true - }, - "enableHelmOperator": { - "description": "Option to enable Helm Operator for this git configuration.", - "$ref": "#/definitions/EnableHelmOperatorDefinition" - }, - "helmOperatorProperties": { - "description": "Properties for Helm operator.", - "type": "object", - "$ref": "#/definitions/HelmOperatorProperties" + } - } + } } }, "allOf": [ @@ -656,6 +631,12 @@ "type": "string" } } + }, + "isDataAction": { + "description": "The flag that indicates whether the operation applies to data plane.", + "type": "boolean", + "readOnly": true + } } }, From 50a26af643c22000fc1b55be1842bf7cb9f8c9e3 Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Tue, 23 Feb 2021 15:24:00 -0800 Subject: [PATCH 54/62] fix syntax errors --- .../examples/GetSourceControlConfiguration.json | 4 +--- .../preview/2020-07-01-preview/extensions.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json index 32575dd36d02..e5892c521c4d 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/GetSourceControlConfiguration.json @@ -34,9 +34,7 @@ "lastConfigApplied": "2020-06-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" - }, - "creationTime": "2020-06-08T05:10:57.027Z", - "lastModifiedTime": "2020-06-08T05:10:57.027Z" + } } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 1382be8b72a2..039ea8791346 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -579,7 +579,7 @@ "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", "type": "object", "$ref": "#/definitions/ExtensionProtectedSettings" - } + }, "installState": { "type": "string", "description": "Status of installation of this instance of the extension.", From 10012016be10545d2d202069cc7f7817038fe1bd Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Tue, 23 Feb 2021 16:05:23 -0800 Subject: [PATCH 55/62] update 2020-07-01=preview swagger --- .../preview/2020-07-01-preview/extensions.json | 8 +------- .../kubernetesconfiguration.json | 16 +++++++--------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 039ea8791346..4f1a868d42df 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -574,7 +574,7 @@ "description": "Configuration settings, as name-value pairs for configuring this instance of the extension.", "type": "object", "$ref": "#/definitions/ConfigurationSettings" - }, + }, "configurationProtectedSettings": { "description": "Configuration settings that are sensitive, as name-value pairs for configuring this instance of the extension.", "type": "object", @@ -625,12 +625,6 @@ "$ref": "#/definitions/ProxyResource" } ] - }, - "allOf": [ - { - "$ref": "#/definitions/ProxyResource" - } - ] }, "ExtensionInstanceForList": { "description": "The Extension Instance object.", diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json index 3366088a0037..8f90d1edffc3 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/kubernetesconfiguration.json @@ -273,7 +273,7 @@ "schema": { "$ref": "#/definitions/ResourceProviderOperationList" } - }, + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -288,7 +288,7 @@ } }, "definitions": { - "SystemData": { + "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": { @@ -344,7 +344,7 @@ "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" @@ -500,7 +500,7 @@ "SourceControlConfiguration": { "description": "The SourceControl Configuration object returned in Get & Put response.", "properties": { - "properties": { + "properties": { "type": "object", "x-ms-client-flatten": true, "description": "Properties to create a Source Control Configuration resource", @@ -552,7 +552,7 @@ "description": "Properties for Helm operator.", "type": "object", "$ref": "#/definitions/HelmOperatorProperties" - }, + }, "provisioningState": { "type": "string", "description": "The provisioning state of the resource provider.", @@ -574,9 +574,8 @@ "description": "Compliance Status of the Configuration", "readOnly": true, "$ref": "#/definitions/ComplianceStatus" - } - } + } } }, "allOf": [ @@ -631,12 +630,11 @@ "type": "string" } } - }, + }, "isDataAction": { "description": "The flag that indicates whether the operation applies to data plane.", "type": "boolean", "readOnly": true - } } }, From 2b180374950694356709a44e15cae4b2237260fc Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Tue, 23 Feb 2021 16:14:43 -0800 Subject: [PATCH 56/62] update 2020-07-01=preview swagger --- .../examples/CreateSourceControlConfiguration.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json index cb4b8742f6d3..ca086cc2aec5 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/examples/CreateSourceControlConfiguration.json @@ -53,9 +53,7 @@ "lastConfigApplied": "2020-06-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" - }, - "creationTime": "2020-06-08T05:10:57.027Z", - "lastModifiedTime": "2020-06-08T05:10:57.027Z" + } } } }, @@ -85,9 +83,7 @@ "lastConfigApplied": "2020-06-08T05:25:32.122Z", "message": "Configuration successfully created", "messageLevel": "Info" - }, - "creationTime": "2020-06-08T05:10:57.027Z", - "lastModifiedTime": "2020-06-08T05:10:57.027Z" + } } } } From d699edf11ba643389e465a0f35a423c6be020fd2 Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Tue, 23 Feb 2021 16:29:14 -0800 Subject: [PATCH 57/62] update 2020-07-01=preview swagger --- .../2020-07-01-preview/extensions.json | 70 +------------------ 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 4f1a868d42df..4ca72b8680aa 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -626,74 +626,6 @@ } ] }, - "ExtensionInstanceForList": { - "description": "The Extension Instance object.", - "properties": { - "properties": { - "type": "object", - "x-ms-client-flatten": true, - "description": "Properties of an Extension Instance resource", - "readOnly": true, - "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." - }, - "autoUpgradeMinorVersion": { - "description": "Flag to note if this instance participates in auto upgrade of minor version, 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 of the extension for this extension instance, if it is 'pinned' to a specific version.", - "type": "string" - }, - "scope": { - "description": "Scope at which the extension instance is installed.", - "$ref": "#/definitions/Scope" - }, - "installState": { - "type": "string", - "description": "Status of installation of this instance of the extension.", - "$ref": "#/definitions/InstallStateDefinition" - }, - "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.", - "readOnly": true, - "$ref": "#/definitions/ErrorDefinition" - } - } - }, - "identity": { - "$ref": "#/definitions/ConfigurationIdentity", - "description": "The identity of the configuration." - } - }, - "allOf": [ - { - "$ref": "#/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.", "properties": { @@ -701,7 +633,7 @@ "type": "array", "readOnly": true, "items": { - "$ref": "#/definitions/ExtensionInstanceForList" + "$ref": "#/definitions/ExtensionInstance" }, "description": "List of Extension Instances within a Kubernetes cluster." }, From 201ff1ee8a1ca97795ca92a3adde4d8063bf3673 Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Thu, 25 Feb 2021 19:32:57 -0800 Subject: [PATCH 58/62] fixing identity property to include inside properties --- .../kubernetesconfiguration/resource-manager/readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index a79ff16b87d9..7b5730c414f8 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -69,6 +69,16 @@ input-file: - Microsoft.KubernetesConfiguration/preview/2019-11-01-preview/kubernetesconfiguration.json ``` +## Suppression + +``` yaml +directive: + - suppress: TopLevelResourcesListBySubscription + from: extensions.json + where: $.definitions + reason: 'Microsoft.KubernetesConfiguration is a proxy resource provider under Microsoft.Kubernetes' +``` + --- # Code Generation From 638afcbb45fcce974fecd66a97d93fa0a7706e50 Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Thu, 25 Feb 2021 19:40:41 -0800 Subject: [PATCH 59/62] fixing identity property to include inside properties --- .../preview/2020-07-01-preview/extensions.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index 4ca72b8680aa..bd9351fdb840 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -612,13 +612,13 @@ "description": "Error information from the Agent - e.g. errors during installation.", "readOnly": true, "$ref": "#/definitions/ErrorDefinition" + }, + "identity": { + "$ref": "#/definitions/ConfigurationIdentity", + "description": "The identity of the configuration." } } - }, - "identity": { - "$ref": "#/definitions/ConfigurationIdentity", - "description": "The identity of the configuration." - } + } }, "allOf": [ { From 4fcfae056f424070e1146b2ca9bccfa6389b4101 Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Thu, 25 Feb 2021 19:49:24 -0800 Subject: [PATCH 60/62] fixing identity property to include inside properties --- .../preview/2020-07-01-preview/extensions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json index bd9351fdb840..923f9d85d7f3 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2020-07-01-preview/extensions.json @@ -613,12 +613,12 @@ "readOnly": true, "$ref": "#/definitions/ErrorDefinition" }, - "identity": { + "identity": { "$ref": "#/definitions/ConfigurationIdentity", "description": "The identity of the configuration." } } - } + } }, "allOf": [ { From 98325039dca8e1a434185b12b777c9c3886fc507 Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Thu, 25 Feb 2021 19:53:09 -0800 Subject: [PATCH 61/62] fixing identity property to include inside properties --- specification/kubernetesconfiguration/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index 7b5730c414f8..ee531d011abc 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -75,7 +75,6 @@ input-file: directive: - suppress: TopLevelResourcesListBySubscription from: extensions.json - where: $.definitions reason: 'Microsoft.KubernetesConfiguration is a proxy resource provider under Microsoft.Kubernetes' ``` From 51d9eb5893f9c49fb56b460a513a76106f39525a Mon Sep 17 00:00:00 2001 From: Safeer Mohammed Date: Fri, 26 Feb 2021 10:03:27 -0800 Subject: [PATCH 62/62] review comments --- .../kubernetesconfiguration/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index ee531d011abc..0fb157e0437c 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -22,7 +22,7 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor ### Basic Information -These are the global settings for the kubernetesconfiguration. +These are the global settings for the KubernetesConfiguration. ``` yaml title: SourceControlConfigurationClient