Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.VirtualMachineImages to …
Browse files Browse the repository at this point in the history
…add version preview/2019-05-01-preview (Azure#5513)

* Updates API version in new specs and examples

* Adds base for updating Microsoft.VirtualMachineImages from version preview/2019-02-01-preview to version 2019-05-01-preview

* Updates readme

* Add ManagedIdentity, File customizer, fix bugs

* Fix examples

Initial 2019-04-30 check in

Add/update/fix fields

Add clusterVersion

Update readme.md

Update CODEOWNERS (Azure#5421)

* Update CODEOWNERS

* Update CODEOWNERS

Update package.json (Azure#5555)

Update CODEOWNERS (Azure#5421)

* Update CODEOWNERS

* Update CODEOWNERS

Update package.json (Azure#5555)
  • Loading branch information
paulmey authored and amanohar committed Apr 5, 2019
1 parent 65f98d7 commit 0f1efaa
Show file tree
Hide file tree
Showing 26 changed files with 3,242 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/specification/eventgrid/ @kalyanaj
/specification/eventhub/ @v-ajnava
/specification/features/ @stankovski
/specification/graphrbac/ @stankovski
/specification/graphrbac/ @lmazuel @yugangw-msft @amarzavery
/specification/hdinsight/ @pulkittomar @wawon-msft
/specification/insights/ @gucalder
/specification/intune/ @vrmurthy01
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"js-yaml": "^3.13.0",
"json-schema-ref-parser": "^3.1.2",
"mocha": "*",
"oav": "^0.14.8",
"oav": "^0.15.3",
"request": "^2.61.0",
"request-promise-native": "^1.0.5",
"ts-node": "^8.0.3",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
{
"parameters": {
"api-version": "2019-04-30",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"location": "location1",
"tags": {
"tier": "production",
"archv2": ""
},
"properties": {
"openShiftVersion": "v3.11",
"networkProfile": {
"vnetCidr": "10.0.0.0/8"
},
"masterPoolProfile": {
"name": "master",
"count": 3,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
},
"agentPoolProfiles": [
{
"name": "infra",
"role": "infra",
"count": 2,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
},
{
"name": "compute",
"role": "compute",
"count": 4,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
}
],
"routerProfiles": [
{
"name": "default"
}
],
"authProfile": {
"identityProviders": [
{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"secret": "secret",
"tenantId": "tenantId",
"customerAdminGroupId": "customerAdminGroupId"
}
}
]
}
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/OpenShiftManagedClusters",
"properties": {
"provisioningState": "Updating",
"openShiftVersion": "v3.11",
"clusterVersion": "osa.1",
"fqdn": "df9337748a4b.location1.cloudapp.azure.com",
"publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io",
"networkProfile": {
"vnetCidr": "10.0.0.0/8"
},
"masterPoolProfile": {
"count": 3,
"vmSize": "Standard_D4s_v3",
"subnetCidr": "10.0.0.0/24"
},
"agentPoolProfiles": [
{
"name": "infra",
"role": "infra",
"count": 2,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
},
{
"name": "compute",
"role": "compute",
"count": 4,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
}
],
"routerProfiles": [
{
"name": "default",
"fqdn": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com",
"publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io"
}
],
"authProfile": {
"identityProviders": [
{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"tenantId": "tenantId",
"customerAdminGroupId": "customerAdminGroupId"
}
}
]
}
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/OpenShiftManagedClusters",
"properties": {
"provisioningState": "Creating",
"openShiftVersion": "v3.11",
"clusterVersion": "osa.1",
"fqdn": "df9337748a4b.location1.cloudapp.azure.com",
"networkProfile": {
"vnetCidr": "10.0.0.0/8"
},
"masterPoolProfile": {
"name": "master",
"count": 3,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
},
"agentPoolProfiles": [
{
"name": "infra",
"role": "infra",
"count": 2,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
},
{
"name": "compute",
"role": "compute",
"count": 4,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
}
],
"routerProfiles": [
{
"name": "default"
}
],
"authProfile": {
"identityProviders": [
{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"tenantId": "tenantId",
"customerAdminGroupId": "customerAdminGroupId"
}
}
]
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parameters": {
"api-version": "2019-04-30",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"responses": {
"202": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"parameters": {
"api-version": "2019-04-30",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/OpenShiftManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"openShiftVersion": "v3.11",
"clusterVersion": "osa.1",
"fqdn": "df9337748a4b.location1.cloudapp.azure.com",
"publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io",
"networkProfile": {
"vnetCidr": "10.0.0.0/8"
},
"masterPoolProfile": {
"count": 3,
"vmSize": "Standard_D4s_v3",
"subnetCidr": "10.0.0.0/24"
},
"agentPoolProfiles": [
{
"name": "infra",
"role": "infra",
"count": 2,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
},
{
"name": "compute",
"role": "compute",
"count": 4,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
}
],
"routerProfiles": [
{
"name": "default",
"fqdn": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com",
"publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io"
}
],
"authProfile": {
"identityProviders": [
{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"tenantId": "tenantId",
"customerAdminGroupId": "customerAdminGroupId"
}
}
]
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"parameters": {
"api-version": "2019-04-30",
"subscriptionId": "subid1"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid1/providers/Microsoft.ContainerService/openShiftManagedClusters",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/OpenShiftManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"openShiftVersion": "v3.11",
"clusterVersion": "osa.1",
"fqdn": "df9337748a4b.location1.cloudapp.azure.com",
"publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io",
"networkProfile": {
"vnetCidr": "10.0.0.0/8"
},
"masterPoolProfile": {
"count": 3,
"vmSize": "Standard_D4s_v3",
"subnetCidr": "10.0.0.0/24"
},
"agentPoolProfiles": [
{
"name": "infra",
"role": "infra",
"count": 2,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
},
{
"name": "compute",
"role": "compute",
"count": 4,
"vmSize": "Standard_D4s_v3",
"osType": "Linux",
"subnetCidr": "10.0.0.0/24"
}
],
"routerProfiles": [
{
"name": "default",
"fqdn": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com",
"publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io"
}
],
"authProfile": {
"identityProviders": [
{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"tenantId": "tenantId",
"customerAdminGroupId": "customerAdminGroupId"
}
}
]
}
}
}
]
}
}
}
}

0 comments on commit 0f1efaa

Please sign in to comment.