Skip to content

Commit

Permalink
systemData
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjudeikis
mjudeikis committed Jan 4, 2021
1 parent 0f0f841 commit 14f0fee
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 23 deletions.
15 changes: 15 additions & 0 deletions ...tOpenShift/preview/2021-01-31-preview/examples/OpenShiftClusters_ListAdminKubeconfig.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"parameters": {
"api-version": "2021-01-31-preview",
"subscriptionId": "subscriptionId",
"resourceGroupName": "resourceGroup",
"resourceName": "resourceName"
},
"responses": {
"200": {
"body": {
"kubeconfig": "e319"
}
}
}
}
145 changes: 123 additions & 22 deletions ...esource-manager/Microsoft.RedHatOpenShift/preview/2021-01-31-preview/redhatopenshift.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"operationId": "Operations_List",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -63,10 +63,10 @@
"operationId": "OpenShiftClusters_List",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -103,13 +103,13 @@
"operationId": "OpenShiftClusters_ListByResourceGroup",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
}
],
"responses": {
Expand Down Expand Up @@ -146,13 +146,13 @@
"operationId": "OpenShiftClusters_Get",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "resourceName",
Expand Down Expand Up @@ -191,13 +191,13 @@
"operationId": "OpenShiftClusters_CreateOrUpdate",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "resourceName",
Expand Down Expand Up @@ -252,13 +252,13 @@
"operationId": "OpenShiftClusters_Delete",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "resourceName",
Expand Down Expand Up @@ -298,13 +298,13 @@
"operationId": "OpenShiftClusters_Update",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "resourceName",
Expand Down Expand Up @@ -351,6 +351,53 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/openShiftClusters/{resourceName}/listAdminCredentials": {
"post": {
"tags": [
"OpenShiftClusters"
],
"summary": "Lists admin kubeconfig of an OpenShift cluster with the specified subscription, resource group and resource name.",
"description": "The operation returns the admin kubeconfig.",
"operationId": "OpenShiftClusters_ListAdminKubeconfig",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "resourceName",
"in": "path",
"description": "The name of the OpenShift cluster resource.",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/OpenShiftClusterAdminKubeconfig"
}
},
"default": {
"description": "Error response describing why the operation failed. If the resource doesn't exist, 404 (Not Found) is returned. If any of the input parameters is wrong, 400 (Bad Request) is returned.",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
},
"x-ms-examples": {
"Lists admin kubeconfig of an OpenShift cluster with the specified subscription, resource group and resource name.": {
"$ref": "./examples/OpenShiftClusters_ListAdminKubeconfig.json"
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/openShiftClusters/{resourceName}/listCredentials": {
"post": {
"tags": [
Expand All @@ -361,13 +408,13 @@
"operationId": "OpenShiftClusters_ListCredentials",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "resourceName",
Expand Down Expand Up @@ -501,6 +548,14 @@
}
}
},
"EncryptionAtHost": {
"description": "EncryptionAtHost constants.",
"enum": [
"Disabled",
"Enabled"
],
"type": "string"
},
"IngressProfile": {
"description": "IngressProfile represents an ingress profile.",
"properties": {
Expand Down Expand Up @@ -528,6 +583,14 @@
"subnetId": {
"description": "The Azure resource ID of the master subnet.",
"type": "string"
},
"encryptionAtHost": {
"$ref": "#/definitions/EncryptionAtHost",
"description": "Whether master virtual machines are encrypted at host."
},
"diskEncryptionSetId": {
"description": "The resource ID of an associated DiskEncryptionSet, if applicable.",
"type": "string"
}
}
},
Expand All @@ -541,21 +604,39 @@
"serviceCidr": {
"description": "The CIDR used for OpenShift/Kubernetes Services.",
"type": "string"
},
"sdnProvider": {
"$ref": "#/definitions/SDNProvider",
"description": "The SDN plugin used in the cluster."
}
}
},
"OpenShiftCluster": {
"description": "OpenShiftCluster represents an Azure Red Hat OpenShift cluster.",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
}
],
"properties": {
"properties": {
"$ref": "#/definitions/OpenShiftClusterProperties",
"description": "The cluster properties.",
"x-ms-client-flatten": true
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"description": "The system meta data relating to this resource.",
"readOnly": true
}
}
},
"OpenShiftClusterAdminKubeconfig": {
"description": "OpenShiftClusterAdminKubeconfig represents an OpenShift cluster's admin kubeconfig.",
"properties": {
"kubeconfig": {
"description": "The base64-encoded kubeconfig file.",
"type": "string"
}
}
},
Expand Down Expand Up @@ -694,6 +775,18 @@
],
"type": "string"
},
"SDNProvider": {
"description": "SDNProvider constants.",
"enum": [
"OVNKubernetes",
"OpenShiftSDN"
],
"type": "string",
"x-ms-enum": {
"name": "SDNProvider",
"modelAsString": true
}
},
"ServicePrincipalProfile": {
"description": "ServicePrincipalProfile represents a service principal profile.",
"properties": {
Expand Down Expand Up @@ -771,6 +864,14 @@
"count": {
"description": "The number of worker VMs.",
"type": "integer"
},
"encryptionAtHost": {
"$ref": "#/definitions/EncryptionAtHost",
"description": "Whether master virtual machines are encrypted at host."
},
"diskEncryptionSetId": {
"description": "The resource ID of an associated DiskEncryptionSet, if applicable.",
"type": "string"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion specification/redhatopenshift/resource-manager/readme.go.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ These settings apply only when `--tag=package-2021-01-31-preview --go` is specif
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag) == 'package-2021-01-31-preview' && $(go)
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-01-31-preview/$(namespace)
output-folder: $(go-sdk-folder)/services/preview/mgmt/2021-01-31-preview/$(namespace)
```

0 comments on commit 14f0fee

Please sign in to comment.