Skip to content

Commit

Permalink
Container Service - Add OpenShift support (#3712)
Browse files Browse the repository at this point in the history 
* add openshift support

* update python sdk version

* including others definitions

* bump default version

* remove operation duplicate

* Update the model

* update OpenShift API

* typo and update model

* add ClusterAuthProfile definition

* change params name

* Clean and update osa deifinitions

* Add PATCH route and update examples

* Update examples

* Add golang package

* Apply review

* Update Vnet Integration + Examples

* Caps / no Caps

* Add default response

* adding the schema for the default response

* Add Go Package

* Bump Python version

* Enum kind of OpenShiftManagedClusterServiceAADIdentityProvider

* Add Kind as required

* Adding OpenShiftManagedClusterBaseIdentityProvider and rename properties

* Sync Python version

* Bump Python version
  • Loading branch information
@julienstroheker @annatisch
julienstroheker authored and annatisch committed Oct 15, 2018
1 parent baa8141 commit d37ec27
Show file tree
Hide file tree
Showing 7 changed files with 1,034 additions and 3 deletions.
185 changes: 185 additions & 0 deletions ...nerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
{
"parameters": {
"api-version": "2018-09-30-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"location": "location1",
"tags": {
"tier": "production",
"archv2": ""
},
"properties": {
"openShiftVersion": "v3.10",
"fqdn": "clustername1.location1.cloudapp.azure.com",
"networkProfile":{
"vnetCidr":"10.0.0.0/8"
},
"masterPoolProfile": {
"name": "master",
"count": 3,
"vmSize": "Standard_D2s_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"
}
}]
}
}
}
},
"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.10",
"fqdn": "clustername1.location1.cloudapp.azure.com",
"networkProfile":{
"vnetCidr":"10.0.0.0/8"
},
"masterPoolProfile": {
"count": 3,
"vmSize": "Standard_D2s_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": "2925bdf9337748f4bd3b.location1.cloudapp.azure.com",
"publicSubdomain": "bc309ee87c164153871c.location1.int.aksapp.io"
}
],
"authProfile": {
"identityProviders": [{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"tenantId": "tenantId"
}
}]
}
}
}
},
"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.10",
"fqdn": "clustername1.location1.cloudapp.azure.com",
"networkProfile":{
"vnetCidr":"10.0.0.0/8"
},
"masterPoolProfile": {
"name": "master",
"count": 3,
"vmSize": "Standard_D2s_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"
}
}]
}
}
}
}
}
}
12 changes: 12 additions & 0 deletions ....ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parameters": {
"api-version": "2018-09-30-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"responses": {
"202": {},
"204": {}
}
}
71 changes: 71 additions & 0 deletions ...oft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"parameters": {
"api-version": "2018-09-30-preview",
"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.10",
"fqdn": "clustername1.location1.cloudapp.azure.com",
"networkProfile":{
"vnetCidr":"10.0.0.0/8"
},
"masterPoolProfile": {
"count": 3,
"vmSize": "Standard_D2s_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": [
{
"fqdn": "dce5faa189c841b99f8a.location1.cloudapp.azure.com",
"name": "default",
"publicSubdomain": "b788fade68d345da9b77.location1.int.aksapp.io"
}
],
"authProfile": {
"identityProviders": [
{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"tenantId": "tenantId"
}
}]
}
}
}
}
}
}
76 changes: 76 additions & 0 deletions ...tainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"parameters": {
"api-version": "2018-09-30-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"tags": {
"tier": "testing",
"archv3": ""
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv3": "",
"tier": "testing"
},
"type": "Microsoft.ContainerService/OpenShiftManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"openShiftVersion": "v3.10",
"fqdn": "clustername1.location1.cloudapp.azure.com",
"networkProfile":{
"vnetCidr":"10.0.0.0/8"
},
"masterPoolProfile": {
"count": 3,
"vmSize": "Standard_D2s_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": "2925bdf9337748f4bd3b.location1.cloudapp.azure.com",
"publicSubdomain": "bc309ee87c164153871c.location1.int.aksapp.io"
}
],
"authProfile": {
"identityProviders": [{
"name": "Azure AD",
"provider": {
"kind": "AADIdentityProvider",
"clientId": "clientId",
"tenantId": "tenantId"
}
}]
}
}
}
}
}
}
Loading

0 comments on commit d37ec27

Please sign in to comment.