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.

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

[AutoPR containerservice/resource-manager] Renaming containerservice directory for downstream consistency #968

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/@azure/arm-containerservice/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Microsoft
Copyright (c) 2019 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
20 changes: 8 additions & 12 deletions packages/@azure/arm-containerservice/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ This package contains an isomorphic SDK for ContainerServiceClient.

### How to Install

```
```bash
npm install @azure/arm-containerservice
```

### How to use

#### nodejs - Authentication, client creation and get openShiftManagedClusters as an example written in TypeScript.
#### nodejs - Authentication, client creation and list openShiftManagedClusters as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

```
```bash
npm install @azure/ms-rest-nodeauth
```

##### Sample code

```ts
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
Expand All @@ -34,9 +34,7 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new ContainerServiceClient(creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const resourceName = "testresourceName";
client.openShiftManagedClusters.get(resourceGroupName, resourceName).then((result) => {
client.openShiftManagedClusters.list().then((result) => {
console.log("The result is:");
console.log(result);
});
Expand All @@ -45,11 +43,11 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
});
```

#### browser - Authentication, client creation and get openShiftManagedClusters as an example written in JavaScript.
#### browser - Authentication, client creation and list openShiftManagedClusters as an example written in JavaScript.

##### Install @azure/ms-rest-browserauth

```
```bash
npm install @azure/ms-rest-browserauth
```

Expand Down Expand Up @@ -79,9 +77,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
authManager.login();
}
const client = new Azure.ArmContainerservice.ContainerServiceClient(res.creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const resourceName = "testresourceName";
client.openShiftManagedClusters.get(resourceGroupName, resourceName).then((result) => {
client.openShiftManagedClusters.list().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand Down
156 changes: 138 additions & 18 deletions packages/@azure/arm-containerservice/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export interface OpenShiftRouterProfile {
*/
name?: string;
/**
* @member {string} [publicSubdomain] DNS subdomain for openshift router.
* @member {string} [publicSubdomain] DNS subdomain for OpenShift router.
*/
publicSubdomain?: string;
/**
Expand Down Expand Up @@ -134,12 +134,22 @@ export interface OpenShiftManagedClusterMasterPoolProfile {
name?: string;
/**
* @member {number} count Number of masters (VMs) to host docker containers.
* The default value is 3. Default value: 3 .
* The default value is 3.
*/
count: number;
/**
* @member {OpenShiftContainerServiceVMSize} vmSize Size of agent VMs.
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3',
* 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3',
* 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2',
* 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
* 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s',
* 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
* 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3',
* 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
* 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2',
* 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s',
* 'Standard_L32s'
*/
vmSize: OpenShiftContainerServiceVMSize;
/**
Expand Down Expand Up @@ -168,13 +178,21 @@ export interface OpenShiftManagedClusterAgentPoolProfile {
name: string;
/**
* @member {number} count Number of agents (VMs) to host docker containers.
* Allowed values must be in the range of 1 to 5 (inclusive). The default
* value is 2. . Default value: 2 .
*/
count: number;
/**
* @member {OpenShiftContainerServiceVMSize} vmSize Size of agent VMs.
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3',
* 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3',
* 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2',
* 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
* 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s',
* 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
* 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3',
* 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
* 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2',
* 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s',
* 'Standard_L32s'
*/
vmSize: OpenShiftContainerServiceVMSize;
/**
Expand Down Expand Up @@ -510,7 +528,7 @@ export interface ContainerServiceMasterProfile {
*/
osDiskSizeGB?: number;
/**
* @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
* @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
* identifier.
*/
vnetSubnetID?: string;
Expand All @@ -528,7 +546,7 @@ export interface ContainerServiceMasterProfile {
*/
storageProfile?: ContainerServiceStorageProfileTypes;
/**
* @member {string} [fqdn] FDQN for the master pool.
* @member {string} [fqdn] FQDN for the master pool.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
Expand Down Expand Up @@ -621,7 +639,7 @@ export interface ContainerServiceAgentPoolProfile {
*/
dnsPrefix?: string;
/**
* @member {string} [fqdn] FDQN for the agent pool.
* @member {string} [fqdn] FQDN for the agent pool.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
Expand All @@ -641,7 +659,7 @@ export interface ContainerServiceAgentPoolProfile {
*/
storageProfile?: ContainerServiceStorageProfileTypes;
/**
* @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
* @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
* identifier.
*/
vnetSubnetID?: string;
Expand Down Expand Up @@ -961,7 +979,7 @@ export interface ManagedClusterAgentPoolProfile {
*/
osDiskSizeGB?: number;
/**
* @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
* @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
* identifier.
*/
vnetSubnetID?: string;
Expand All @@ -988,8 +1006,8 @@ export interface ManagedClusterAgentPoolProfile {
*/
enableAutoScaling?: boolean;
/**
* @member {AgentPoolType} [type] AgentPoolType represents types of
* agentpool. Possible values include: 'VirtualMachineScaleSets',
* @member {AgentPoolType} [type] AgentPoolType represents types of an agent
* pool. Possible values include: 'VirtualMachineScaleSets',
* 'AvailabilitySet'
*/
type?: AgentPoolType;
Expand Down Expand Up @@ -1108,7 +1126,7 @@ export interface ManagedCluster extends Resource {
*/
dnsPrefix?: string;
/**
* @member {string} [fqdn] FDQN for the master pool.
* @member {string} [fqdn] FQDN for the master pool.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
Expand Down Expand Up @@ -1286,8 +1304,10 @@ export interface CredentialResult {
*/
export interface CredentialResults {
/**
* @member {CredentialResult[]} [kubeconfigs] **NOTE: This property will not
* be serialized. It can only be populated by the server.**
* @member {CredentialResult[]} [kubeconfigs] Base64-encoded Kubernetes
* configuration file.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
readonly kubeconfigs?: CredentialResult[];
}
Expand Down Expand Up @@ -1382,6 +1402,23 @@ export interface ContainerServiceClientOptions extends AzureServiceClientOptions
}


/**
* @interface
* An interface representing the OpenShiftManagedClusterListResult.
* The response from the List OpenShift Managed Clusters operation.
*
* @extends Array<OpenShiftManagedCluster>
*/
export interface OpenShiftManagedClusterListResult extends Array<OpenShiftManagedCluster> {
/**
* @member {string} [nextLink] The URL to get the next set of OpenShift
* managed cluster results.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
readonly nextLink?: string;
}

/**
* @interface
* An interface representing the ContainerServiceListResult.
Expand Down Expand Up @@ -1436,11 +1473,18 @@ export type OSType = 'Linux' | 'Windows';

/**
* Defines values for OpenShiftContainerServiceVMSize.
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
* 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2',
* 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
* 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3',
* 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3',
* 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
* 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s',
* 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'
* @readonly
* @enum {string}
*/
export type OpenShiftContainerServiceVMSize = 'Standard_D2s_v3' | 'Standard_D4s_v3';
export type OpenShiftContainerServiceVMSize = 'Standard_D2s_v3' | 'Standard_D4s_v3' | 'Standard_D8s_v3' | 'Standard_D16s_v3' | 'Standard_D32s_v3' | 'Standard_D64s_v3' | 'Standard_DS4_v2' | 'Standard_DS5_v2' | 'Standard_F8s_v2' | 'Standard_F16s_v2' | 'Standard_F32s_v2' | 'Standard_F64s_v2' | 'Standard_F72s_v2' | 'Standard_F8s' | 'Standard_F16s' | 'Standard_E4s_v3' | 'Standard_E8s_v3' | 'Standard_E16s_v3' | 'Standard_E20s_v3' | 'Standard_E32s_v3' | 'Standard_E64s_v3' | 'Standard_GS2' | 'Standard_GS3' | 'Standard_GS4' | 'Standard_GS5' | 'Standard_DS12_v2' | 'Standard_DS13_v2' | 'Standard_DS14_v2' | 'Standard_DS15_v2' | 'Standard_L4s' | 'Standard_L8s' | 'Standard_L16s' | 'Standard_L32s';

/**
* Defines values for OpenShiftAgentPoolProfileRole.
Expand Down Expand Up @@ -1535,6 +1579,44 @@ export type NetworkPlugin = 'azure' | 'kubenet';
*/
export type NetworkPolicy = 'calico';

/**
* Contains response data for the list operation.
*/
export type OpenShiftManagedClustersListResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the listByResourceGroup operation.
*/
export type OpenShiftManagedClustersListByResourceGroupResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the get operation.
*/
Expand Down Expand Up @@ -1630,6 +1712,44 @@ export type OpenShiftManagedClustersBeginUpdateTagsResponse = OpenShiftManagedCl
};
};

/**
* Contains response data for the listNext operation.
*/
export type OpenShiftManagedClustersListNextResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the listByResourceGroupNext operation.
*/
export type OpenShiftManagedClustersListByResourceGroupNextResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the list operation.
*/
Expand Down
Loading