Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Container Service - Add OpenShift support #3712

Merged
merged 28 commits into from
Oct 15, 2018
Merged

Container Service - Add OpenShift support #3712

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fdda83f
add openshift support
julienstroheker Aug 23, 2018
30e98cc
update python sdk version
julienstroheker Aug 23, 2018
857efa1
including others definitions
julienstroheker Aug 23, 2018
900ca4e
bump default version
julienstroheker Aug 23, 2018
4455057
remove operation duplicate
julienstroheker Aug 23, 2018
c7bdb06
Update the model
julienstroheker Sep 4, 2018
60b6d7a
update OpenShift API
julienstroheker Sep 7, 2018
67b876b
typo and update model
julienstroheker Sep 7, 2018
320a8eb
add ClusterAuthProfile definition
julienstroheker Sep 7, 2018
7b99cf0
change params name
julienstroheker Sep 8, 2018
f730c88
Clean and update osa deifinitions
julienstroheker Sep 20, 2018
9bbc8d7
Add PATCH route and update examples
julienstroheker Sep 24, 2018
c2a8c57
Update examples
julienstroheker Sep 24, 2018
5fec66c
Add golang package
julienstroheker Sep 25, 2018
32ce1d9
Apply review
julienstroheker Sep 25, 2018
1dae12f
Update Vnet Integration + Examples
julienstroheker Oct 1, 2018
8043740
Caps / no Caps
julienstroheker Oct 2, 2018
2ea238b
Add default response
julienstroheker Oct 3, 2018
0d9c415
adding the schema for the default response
julienstroheker Oct 10, 2018
f940276
Merge branch 'master' into containerservice-openshift
julienstroheker Oct 10, 2018
06f0477
Add Go Package
julienstroheker Oct 10, 2018
2f9a701
Bump Python version
julienstroheker Oct 10, 2018
a3e455b
Enum kind of OpenShiftManagedClusterServiceAADIdentityProvider
julienstroheker Oct 11, 2018
1654a19
Add Kind as required
julienstroheker Oct 11, 2018
4e40c60
Adding OpenShiftManagedClusterBaseIdentityProvider and rename properties
julienstroheker Oct 12, 2018
f85fed8
Sync Python version
julienstroheker Oct 12, 2018
9a7d174
Bump Python version
julienstroheker Oct 12, 2018
fe1e5ab
Merge branch 'master' into containerservice-openshift
julienstroheker Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 185 additions & 0 deletions ...nerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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