Skip to content

Commit

Permalink
Dev kubernetesconfiguration microsoft.kubernetes configuration 2021 0…
Browse files Browse the repository at this point in the history 
…5 01 preview (Azure#14302)

* Adds base for updating Microsoft.KubernetesConfiguration from version preview/2020-07-01-preview to version 2021-05-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add Extensions Async API and other fixes (Azure#13709)

* Add Extensions Async API and other fixes

* Re-add missed out changes

* Fix validation errors, remove UpdateExtension.json

* Update Readme.md

* Add back files removed accidentally

* Revert accidental changes & fix readme.md

* Remove SourceControlConfig from this api version

* Fix Readme.md error for go package

* Fix Go readme issues

* Fix Go readme issues - revert accidental change

* Fix Go readme issues

* Add kubernetesconfiguration GA version to this version Tag for SDK

* Fix Operations api descriptions

* Fix spelling mistakes

* Update ApiVersionParameter reference in kubernetesconfiguration

* Fix review suggestions

* Add SourceControlConfiguration resourceType to this api-version

* Updated readme files for the added SourceControlConfiguration resource type

* Fix readme files to revert to previous + additions for new api-version

* Consolidated common definitions to avoid duplication errors

* Rename definitions folder - fix Avocado error

* Consolidated common definitions reference

* Fix definitions.json

* Fix go readme

* Revert "Add Extensions Async API and other fixes (Azure#13709)" (Azure#13972)

This reverts commit b78af6e.

* Dev kubernetesconfiguration microsoft.kubernetes configuration 2021 05 01 preview (Azure#13992)

* Add Extensions Async API and other fixes

* Re-add missed out changes

* Fix validation errors, remove UpdateExtension.json

* Update Readme.md

* Add back files removed accidentally

* Revert accidental changes & fix readme.md

* Remove SourceControlConfig from this api version

* Fix Readme.md error for go package

* Fix Go readme issues

* Fix Go readme issues - revert accidental change

* Fix Go readme issues

* Add kubernetesconfiguration GA version to this version Tag for SDK

* Fix Operations api descriptions

* Fix spelling mistakes

* Update ApiVersionParameter reference in kubernetesconfiguration

* Fix review suggestions

* Add SourceControlConfiguration resourceType to this api-version

* Updated readme files for the added SourceControlConfiguration resource type

* Fix readme files to revert to previous + additions for new api-version

* Consolidated common definitions to avoid duplication errors

* Rename definitions folder - fix Avocado error

* Consolidated common definitions reference

* Fix definitions.json

* Fix go readme

* Remove extensions resource in the route of ListAsyncOperations at Cluster scope

* Remove extension parameter in the spec

* Remove extension parameter from route of ListAsycOperations

* Add Origin property to Available Operations response body

* Make Identity property nullable

* Add Get, List Extension Types (Azure#13562)

* Add Get, List Extension Types

* style check fixes

* - update spec
- rename and update example files
- fix validation errors

* fix examples

* - update readme.md
- generate example files with oav
- try to fix some new validation errors

* more validation fixes

* add ExtensionTypeVersion_List

* - update readme for SDKs
- update examples

* fix typo and linting

* rename ExtensionTypeVersions_List

* - address comments
- update list extension versions based on location

* fix list versions route

* fix tag and unused parameters in spec file

* fix autorest validatoin errors

* udpate readme

* update readme

* try to fix sdk validation warnings

* - prettier fix
- revert changes to types.json

* fix pageable missing itemName

Co-authored-by: Carlo Cardella <carloc@microsoft.com>
Co-authored-by: chunyu3 <chunyu@microsoft.com>
  • Loading branch information
@NarayanThiru @carlocardella
@chunyu3 @mkarmark
3 people authored and mkarmark committed Jul 20, 2021
1 parent df8c611 commit 13e436c
Show file tree
Hide file tree
Showing 24 changed files with 2,616 additions and 28 deletions.
62 changes: 62 additions & 0 deletions ...urce-manager/Microsoft.KubernetesConfiguration/common/2021-05-01-preview/definitions.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"swagger": "2.0",
"info": {
"version": "2021-05-01-preview",
"title": "Common types and definitions",
"description": "Definitions and parameters common for all resource types of KubernetesConfiguration RP"
},
"security": [
{
"azure_auth": [
"user_impersonation"
]
}
],
"securityDefinitions": {
"azure_auth": {
"type": "oauth2",
"authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
"flow": "implicit",
"description": "Azure Active Directory OAuth2 Flow",
"scopes": {
"user_impersonation": "impersonate your user account"
}
}
},
"paths": {},
"definitions": {},
"parameters": {
"ClusterRpParameter": {
"name": "clusterRp",
"in": "path",
"required": true,
"type": "string",
"enum": [
"Microsoft.ContainerService",
"Microsoft.Kubernetes"
],
"description": "The Kubernetes cluster RP - either Microsoft.ContainerService (for AKS clusters) or Microsoft.Kubernetes (for OnPrem K8S clusters).",
"x-ms-parameter-location": "method"
},
"ClusterResourceNameParameter": {
"name": "clusterResourceName",
"in": "path",
"required": true,
"type": "string",
"enum": [
"managedClusters",
"connectedClusters"
],
"description": "The Kubernetes cluster resource name - either managedClusters (for AKS clusters) or connectedClusters (for OnPrem K8S clusters).",
"x-ms-parameter-location": "method"
},
"ClusterNameParameter": {
"name": "clusterName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the kubernetes cluster.",
"x-ms-parameter-location": "method"
}
}
}
43 changes: 43 additions & 0 deletions ...KubernetesConfiguration/preview/2021-05-01-preview/examples/ClusterExtensionType_Get.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parameters": {
"subscriptionId": "aaaaaaaaaa",
"resourceGroupName": "rgextensionTypes",
"clusterRp": "Microsoft.ContainerService",
"clusterType": "managedClusters",
"clusterName": "aaaaaaaaaaaaaaaaaaaaa",
"api-version": "2021-05-01-preview",
"extensionTypeName": "aaaaaa"
},
"responses": {
"200": {
"body": {
"properties": {
"releaseTrains": [
"aaaaaaaaaaaaaaaaaaaaaa"
],
"clusterTypes": "connectedClusters",
"supportedScopes": {
"defaultScope": "aaaaaaaaaaa",
"clusterScopeSettings": {
"properties": {
"allowMultipleInstances": true,
"defaultReleaseNamespace": "aaaaaaaaaaaaaaaaaaaaaaa"
},
"id": "aaaaaaaaaaaaaaaa",
"name": "aaaaaaaaaa",
"type": "aaaaaaaaaaaaaaaaaaa"
}
}
},
"systemData": {
"createdBy": "aaaaaaaa",
"createdByType": "User",
"createdAt": "2021-04-14T22:44:27.144Z",
"lastModifiedBy": "aaaaaaaaa",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-04-14T22:44:27.144Z"
}
}
}
}
}
46 changes: 46 additions & 0 deletions ...bernetesConfiguration/preview/2021-05-01-preview/examples/ClusterExtensionTypes_List.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"parameters": {
"subscriptionId": "aaaaaaaaaa",
"resourceGroupName": "rgextensionTypes",
"clusterRp": "Microsoft.ContainerService",
"clusterName": "aaaaaaaaaaaaaaaaaaaaa",
"api-version": "2021-05-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"properties": {
"releaseTrains": [
"aaaaaaaaaaaaaaaaaaaaaa"
],
"clusterTypes": "connectedClusters",
"supportedScopes": {
"defaultScope": "aaaaaaaaaaa",
"clusterScopeSettings": {
"properties": {
"allowMultipleInstances": true,
"defaultReleaseNamespace": "aaaaaaaaaaaaaaaaaaaaaaa"
},
"id": "aaaaaaaaaaaaaaaa",
"name": "aaaaaaaaaa",
"type": "aaaaaaaaaaaaaaaaaaa"
}
}
},
"systemData": {
"createdBy": "aaaaaaaa",
"createdByType": "User",
"createdAt": "2021-04-14T22:44:27.144Z",
"lastModifiedBy": "aaaaaaaaa",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-04-14T22:44:27.144Z"
}
}
],
"nextLink": "aaaaaaaaaaaaaaaaaaaaa"
}
}
}
}
106 changes: 106 additions & 0 deletions ...icrosoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/CreateExtension.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
{
"parameters": {
"subscriptionId": "subId1",
"resourceGroupName": "rg1",
"clusterRp": "Microsoft.Kubernetes",
"clusterResourceName": "connectedClusters",
"extensionName": "ClusterMonitor",
"api-version": "2021-05-01-preview",
"clusterName": "clusterName1",
"extension": {
"properties": {
"extensionType": "azuremonitor-containers",
"autoUpgradeMinorVersion": true,
"releaseTrain": "Preview",
"scope": {
"cluster": {
"releaseNamespace": "kube-system"
}
},
"configurationSettings": {
"omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b",
"omsagent.env.clusterName": "clusterName1"
},
"configurationProtectedSettings": {
"omsagent.secret.key": "secretKeyValue01"
}
}
}
},
"responses": {
"201": {
"headers": {
"Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}",
"x-ms-async-operation-timeout": "PT48H"
},
"description": "Details of the Kubernetes Extension's current status.",
"body": {
"id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor",
"type": "Microsoft.KubernetesConfiguration/extensions",
"name": "ClusterMonitor",
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2021-05-08T05:10:57.027Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2021-05-08T05:10:57.027Z"
},
"properties": {
"extensionType": "azuremonitor-containers",
"autoUpgradeMinorVersion": true,
"releaseTrain": "Preview",
"version": "0.1.4",
"scope": {
"cluster": {
"releaseNamespace": "kube-system"
}
},
"configurationSettings": {
"omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b",
"omsagent.env.clusterName": "clusterName1"
},
"provisioningState": "Creating",
"statuses": []
}
}
},
"200": {
"headers": {
"Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}",
"x-ms-async-operation-timeout": "PT48H"
},
"description": "Details of the Kubernetes Extension's current status.",
"body": {
"id": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor",
"type": "Microsoft.KubernetesConfiguration/extensions",
"name": "ClusterMonitor",
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2021-05-08T05:10:57.027Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2021-05-08T05:10:57.027Z"
},
"properties": {
"extensionType": "azuremonitor-containers",
"autoUpgradeMinorVersion": true,
"releaseTrain": "Preview",
"version": "0.1.4",
"scope": {
"cluster": {
"releaseNamespace": "kube-system"
}
},
"configurationSettings": {
"omsagent.secret.wsid": "a38cef99-5a89-52ed-b6db-22095c23664b",
"omsagent.env.clusterName": "clusterName1"
},
"provisioningState": "Creating",
"statuses": []
}
}
}
}
}
110 changes: 110 additions & 0 deletions ...esConfiguration/preview/2021-05-01-preview/examples/CreateSourceControlConfiguration.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
{
"parameters": {
"subscriptionId": "subId1",
"resourceGroupName": "rg1",
"clusterRp": "Microsoft.Kubernetes",
"clusterResourceName": "connectedClusters",
"sourceControlConfigurationName": "SRS_GitHubConfig",
"api-version": "2021-05-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",
"configurationProtectedSettings": {
"protectedSetting1Key": "protectedSetting1Value"
},
"enableHelmOperator": true,
"sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=",
"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",
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-09-08T05:10:57.027Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-09-08T05:10:57.027Z"
},
"properties": {
"repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started",
"operatorNamespace": "SRS_Namespace",
"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",
"sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=",
"provisioningState": "Succeeded",
"complianceStatus": {
"complianceState": "Pending",
"lastConfigApplied": "2020-09-08T05:25:32.122Z",
"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",
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-09-08T05:10:57.027Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-09-08T05:10:57.027Z"
},
"properties": {
"repositoryUrl": "git@github.com:k8sdeveloper425/flux-get-started",
"operatorNamespace": "SRS_Namespace",
"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",
"sshKnownHostsContents": "c3NoLmRldi5henVyZS5jb20gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDN0hyMW9UV3FOcU9sekdKT2ZHSjROYWtWeUl6ZjFyWFlkNGQ3d282akJsa0x2Q0E0b2RCbEwwbURVeVowL1FVZlRUcWV1K3RtMjJnT3N2K1ZyVlRNazZ2d1JVNzVnWS95OXV0NU1iM2JSNUJWNThkS1h5cTlBOVVlQjVDYWtlaG41WmdtNngxbUtvVnlmK0ZGbjI2aVlxWEpSZ3pJWlpjWjVWNmhyRTBRZzM5a1ptNGF6NDhvMEFVYmY2U3A0U0xkdm51TWEyc1ZOd0hCYm9TN0VKa201N1hRUFZVMy9RcHlOTEhiV0Rkend0cmxTK2V6MzBTM0FkWWhMS0VPeEFHOHdlT255cnRMSkFVZW45bVRrb2w4b0lJMWVkZjdtV1diV1ZmMG5CbWx5MjErblpjbUNUSVNRQnRkY3lQYUVubzdmRlFNREQyNi9zMGxmS29iNEt3OEg=",
"provisioningState": "Succeeded",
"complianceStatus": {
"complianceState": "Pending",
"lastConfigApplied": "2020-09-08T05:25:32.122Z",
"message": "Configuration successfully created",
"messageLevel": "Info"
}
}
}
}
}
}
22 changes: 22 additions & 0 deletions ...icrosoft.KubernetesConfiguration/preview/2021-05-01-preview/examples/DeleteExtension.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"subscriptionId": "subId1",
"resourceGroupName": "rg1",
"clusterRp": "Microsoft.Kubernetes",
"clusterResourceName": "connectedClusters",
"extensionName": "ClusterMonitor",
"api-version": "2021-05-01-preview",
"clusterName": "clusterName1"
},
"responses": {
"202": {
"headers": {
"Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}",
"x-ms-async-operation-timeout": "PT1H"
},
"description": "Details of the Kubernetes Extension's current status."
},
"200": {},
"204": {}
}
}
Loading

0 comments on commit 13e436c

Please sign in to comment.