Skip to content

Commit 19c4786

Browse files
jagpreetstamberjagpreetstamber
authored
Merge pull request Azure#8 from nikkomiu/bugfix/validation-errors
Bugfix/validation errors
2 parents efbafc7 + b289a32 commit 19c4786

9 files changed

Lines changed: 63 additions & 40 deletions

File tree

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionType.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"clusterName": "my-cluster",
88
"extensionTypeName": "my-extension-type",
99
"releaseTrain": "stable",
10-
"api-version": "2023-05-01"
10+
"api-version": "2023-05-01-preview"
1111
},
1212
"responses": {
1313
"200": {
@@ -33,8 +33,13 @@
3333
"supportedScopes": {
3434
"defaultScope": "cluster",
3535
"clusterScopeSettings": {
36-
"allowMultipleInstances": true,
37-
"defaultReleaseNamespace": "kube-system"
36+
"properties": {
37+
"allowMultipleInstances": true,
38+
"defaultReleaseNamespace": "kube-system"
39+
},
40+
"id": "aaaaaaaaaaaaaaaaaa",
41+
"name": "bbbbbbbbbbbbb",
42+
"type": "ccccccccccccccccccccccccc"
3843
}
3944
}
4045
}

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeByLocation.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"location": "westus2",
55
"extensionTypeName": "extensionType1",
66
"releaseTrain": "stable",
7-
"api-version": "2023-05-01"
7+
"api-version": "2023-05-01-preview"
88
},
99
"responses": {
1010
"200": {
@@ -30,8 +30,13 @@
3030
"supportedScopes": {
3131
"defaultScope": "cluster",
3232
"clusterScopeSettings": {
33-
"allowMultipleInstances": true,
34-
"defaultReleaseNamespace": "kube-system"
33+
"properties": {
34+
"allowMultipleInstances": true,
35+
"defaultReleaseNamespace": "kube-system"
36+
},
37+
"id": "aaaaaaaaaaaaaaaaaa",
38+
"name": "bbbbbbbbbbbbb",
39+
"type": "ccccccccccccccccccccccccc"
3540
}
3641
}
3742
}

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeVersion.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
"clusterResourceName": "connectedClusters",
77
"clusterName": "my-cluster",
88
"extensionTypeName": "my-extension-type",
9+
"versionNumber": "v1.3.2",
910
"releaseTrain": "stable",
10-
"api-version": "2023-05-01"
11+
"api-version": "2023-05-01-preview"
1112
},
1213
"responses": {
1314
"200": {

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/GetExtensionTypeVersionByLocation.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"parameters": {
3-
"subcriptionId": "subId1",
3+
"subscriptionId": "subId1",
44
"location": "westus",
55
"extensionTypeName": "extensionType1",
66
"versionNumber": "1.20.0",
77
"releaseTrain": "stable",
88
"clusterType": "connectedCluster",
9-
"api-version": "2023-05-01"
9+
"api-version": "2023-05-01-preview"
1010
},
1111
"responses": {
1212
"200": {

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypeVersions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"releaseTrain": "stable",
1010
"majorVersion": "2",
1111
"showLatest": true,
12-
"api-version": "2023-05-01"
12+
"api-version": "2023-05-01-preview"
1313
},
1414
"responses": {
1515
"200": {

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypeVersionsByLocation.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"parameters": {
3-
"subcriptionId": "subId1",
3+
"subscriptionId": "subId1",
44
"location": "westus",
55
"extensionTypeName": "extensionType1",
66
"releaseTrain": "stable",
77
"clusterType": "connectedCluster",
88
"majorVersion": "2",
99
"showLatest": true,
10-
"api-version": "2023-05-01"
10+
"api-version": "2023-05-01-preview"
1111
},
1212
"responses": {
1313
"200": {

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypes.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"parameters": {
33
"subscriptionId": "subId1",
44
"resourceGroupName": "rg1",
5-
"clusterRP": "Microsoft.Kubernetes",
5+
"clusterRp": "Microsoft.Kubernetes",
66
"clusterResourceName": "connectedClusters",
77
"clusterName": "my-cluster",
88
"publisherId": "myPublisherId",
99
"offerId": "myOfferId",
1010
"planId": "myPlanId",
1111
"releaseTrain": "stable",
12-
"api-version": "2023-05-01"
12+
"api-version": "2023-05-01-preview"
1313
},
1414
"responses": {
1515
"200": {

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/examples/ListExtensionTypesByLocation.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"planId": "myPlanId",
88
"clusterType": "connectedCluster",
99
"releaseTrain": "stable",
10-
"api-version": "2023-05-01"
10+
"api-version": "2023-05-01-preview"
1111
},
1212
"responses": {
1313
"200": {

‎specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2023-05-01-preview/extensionTypes.json‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
}
108108
}
109109
},
110-
"x-ms-pagable": {
110+
"x-ms-pageable": {
111111
"nextLinkName": "nextLink"
112112
}
113113
}
@@ -162,7 +162,7 @@
162162
}
163163
}
164164
},
165-
"/subcriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions": {
165+
"/subscriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions": {
166166
"get": {
167167
"tags": [
168168
"ExtensionTypes",
@@ -232,11 +232,11 @@
232232
}
233233
}
234234
},
235-
"x-ms-pagable": {
235+
"x-ms-pageable": {
236236
"nextLinkName": "nextLink"
237237
}
238238
},
239-
"/subcriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
239+
"/subscriptions/{subscriptionId}/providers/Microsoft.KubernetesConfiguration/locations/{location}/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
240240
"get": {
241241
"tags": [
242242
"ExtensionTypes",
@@ -296,7 +296,7 @@
296296
}
297297
}
298298
},
299-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes": {
299+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes": {
300300
"get": {
301301
"tags": [
302302
"ExtensionTypes",
@@ -373,7 +373,7 @@
373373
}
374374
}
375375
},
376-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}": {
376+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}": {
377377
"get": {
378378
"tags": [
379379
"ExtensionTypes",
@@ -432,7 +432,7 @@
432432
}
433433
}
434434
},
435-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions": {
435+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions": {
436436
"get": {
437437
"tags": [
438438
"ExtensionTypes",
@@ -504,11 +504,11 @@
504504
}
505505
}
506506
},
507-
"x-ms-pagable": {
507+
"x-ms-pageable": {
508508
"nextLinkName": "nextLink"
509509
}
510510
},
511-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRP}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
511+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensionTypes/{extensionTypeName}/versions/{versionNumber}": {
512512
"get": {
513513
"tags": [
514514
"ExtensionTypes",
@@ -629,21 +629,7 @@
629629
"type": "string"
630630
},
631631
"clusterScopeSettings": {
632-
"type": "object",
633-
"properties": {
634-
"properties": {
635-
"type": "object"
636-
},
637-
"id": {
638-
"type": "string"
639-
},
640-
"name": {
641-
"type": "string"
642-
},
643-
"type": {
644-
"type": "string"
645-
}
646-
}
632+
"$ref": "#/definitions/ClusterScopeSettings"
647633
}
648634
}
649635
}
@@ -656,6 +642,32 @@
656642
}
657643
]
658644
},
645+
"ClusterScopeSettings": {
646+
"type": "object",
647+
"description": "Extension scope settings",
648+
"properties": {
649+
"properties": {
650+
"type": "object",
651+
"x-ms-client-flatten": true,
652+
"description": "Extension scope settings",
653+
"properties": {
654+
"allowMultipleInstances": {
655+
"type": "boolean",
656+
"description": "Describes if multiple instances of the extension are allowed"
657+
},
658+
"defaultReleaseNamespace": {
659+
"type": "string",
660+
"description": "Default extension release namespace"
661+
}
662+
}
663+
}
664+
},
665+
"allOf": [
666+
{
667+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
668+
}
669+
]
670+
},
659671
"ExtensionTypeVersionForReleaseTrain": {
660672
"description": "The Extension Type Version object.",
661673
"type": "object",
@@ -689,7 +701,7 @@
689701
"type": "array",
690702
"description": "A list of supported cluster types for this version of the Extension Type",
691703
"items": {
692-
"description": "The indivual cluster type that is supported by this extension",
704+
"description": "The individual cluster type that is supported by this extension",
693705
"type": "string"
694706
}
695707
}

0 commit comments

Comments
 (0)
⚡