Skip to content
Closed
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 sdk/containerservice/arm-containerservice/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 Microsoft
Copyright (c) 2020 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
2 changes: 1 addition & 1 deletion sdk/containerservice/arm-containerservice/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)

![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fcontainerservice%2Farm-containerservice%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/containerservice/arm-containerservice/README.png)
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien
if (!options) {
options = {};
}
if (!options.userAgent) {
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}
Expand All @@ -51,10 +51,10 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien
this.credentials = credentials;
this.subscriptionId = subscriptionId;

if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
}
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export {
ManagedClusterAADProfile,
ManagedClusterAccessProfile,
ManagedClusterAddonProfile,
ManagedClusterAddonProfileIdentity,
ManagedClusterAgentPoolProfile,
ManagedClusterAgentPoolProfileProperties,
ManagedClusterAPIServerAccessProfile,
Expand All @@ -42,6 +43,7 @@ export {
ManagedClusterLoadBalancerProfileManagedOutboundIPs,
ManagedClusterLoadBalancerProfileOutboundIPPrefixes,
ManagedClusterLoadBalancerProfileOutboundIPs,
ManagedClusterPropertiesIdentityProfileValue,
ManagedClusterServicePrincipalProfile,
ManagedClusterWindowsProfile,
NetworkProfile,
Expand All @@ -56,5 +58,6 @@ export {
PurchasePlan,
Resource,
ResourceReference,
SubResource
SubResource,
UserAssignedIdentity
} from "../models/mappers";
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export {
ManagedClusterAADProfile,
ManagedClusterAccessProfile,
ManagedClusterAddonProfile,
ManagedClusterAddonProfileIdentity,
ManagedClusterAgentPoolProfile,
ManagedClusterAgentPoolProfileProperties,
ManagedClusterAPIServerAccessProfile,
Expand All @@ -38,6 +39,7 @@ export {
ManagedClusterLoadBalancerProfileManagedOutboundIPs,
ManagedClusterLoadBalancerProfileOutboundIPPrefixes,
ManagedClusterLoadBalancerProfileOutboundIPs,
ManagedClusterPropertiesIdentityProfileValue,
ManagedClusterServicePrincipalProfile,
ManagedClusterWindowsProfile,
NetworkProfile,
Expand All @@ -55,5 +57,6 @@ export {
PurchasePlan,
Resource,
ResourceReference,
SubResource
SubResource,
UserAssignedIdentity
} from "../models/mappers";
114 changes: 111 additions & 3 deletions sdk/containerservice/arm-containerservice/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ export interface ManagedClusterAgentPoolProfileProperties {
*/
readonly provisioningState?: string;
/**
* (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
* Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
*/
availabilityZones?: string[];
/**
Expand All @@ -914,6 +914,14 @@ export interface ManagedClusterAgentPoolProfileProperties {
* 'Delete'.
*/
scaleSetEvictionPolicy?: ScaleSetEvictionPolicy;
/**
* Agent pool tags to be persisted on the agent pool virtual machine scale set.
*/
tags?: { [propertyName: string]: string };
/**
* Agent pool node labels to be persisted across all nodes in agent pool.
*/
nodeLabels?: { [propertyName: string]: string };
/**
* Taints added to new nodes during node pool create and scale. For example,
* key=value:NoSchedule.
Expand Down Expand Up @@ -1027,7 +1035,7 @@ export interface AgentPool extends SubResource {
*/
readonly provisioningState?: string;
/**
* (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
* Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
*/
availabilityZones?: string[];
/**
Expand All @@ -1045,6 +1053,14 @@ export interface AgentPool extends SubResource {
* 'Delete'.
*/
scaleSetEvictionPolicy?: ScaleSetEvictionPolicy;
/**
* Agent pool tags to be persisted on the agent pool virtual machine scale set.
*/
tags?: { [propertyName: string]: string };
/**
* Agent pool node labels to be persisted across all nodes in agent pool.
*/
nodeLabels?: { [propertyName: string]: string };
/**
* Taints added to new nodes during node pool create and scale. For example,
* key=value:NoSchedule.
Expand Down Expand Up @@ -1108,7 +1124,7 @@ export interface ManagedClusterLoadBalancerProfileOutboundIPs {
}

/**
* Profile of the managed cluster load balancer
* Profile of the managed cluster load balancer.
*/
export interface ManagedClusterLoadBalancerProfile {
/**
Expand All @@ -1127,6 +1143,17 @@ export interface ManagedClusterLoadBalancerProfile {
* The effective outbound IP resources of the cluster load balancer.
*/
effectiveOutboundIPs?: ResourceReference[];
/**
* Desired number of allocated SNAT ports per VM. Allowed values must be in the range of 0 to
* 64000 (inclusive). The default value is 0 which results in Azure dynamically allocating ports.
* Default value: 0.
*/
allocatedOutboundPorts?: number;
/**
* Desired outbound flow idle timeout in minutes. Allowed values must be in the range of 4 to 120
* (inclusive). The default value is 30 minutes. Default value: 30.
*/
idleTimeoutInMinutes?: number;
}

/**
Expand Down Expand Up @@ -1163,6 +1190,11 @@ export interface ContainerServiceNetworkProfile {
* Subnet IP ranges or the Kubernetes service address range. Default value: '172.17.0.1/16'.
*/
dockerBridgeCidr?: string;
/**
* The outbound (egress) routing method. Possible values include: 'loadBalancer',
* 'userDefinedRouting'. Default value: 'loadBalancer'.
*/
outboundType?: OutboundType;
/**
* The load balancer sku for the managed cluster. Possible values include: 'standard', 'basic'
*/
Expand All @@ -1173,6 +1205,30 @@ export interface ContainerServiceNetworkProfile {
loadBalancerProfile?: ManagedClusterLoadBalancerProfile;
}

/**
* An interface representing UserAssignedIdentity.
*/
export interface UserAssignedIdentity {
/**
* The resource id of the user assigned identity.
*/
resourceId?: string;
/**
* The client id of the user assigned identity.
*/
clientId?: string;
/**
* The object id of the user assigned identity.
*/
objectId?: string;
}

/**
* Information of user assigned identity used by this add-on.
*/
export interface ManagedClusterAddonProfileIdentity extends UserAssignedIdentity {
}

/**
* A Kubernetes add-on profile for a managed cluster.
*/
Expand All @@ -1185,6 +1241,11 @@ export interface ManagedClusterAddonProfile {
* Key-value pairs for configuring an add-on.
*/
config?: { [propertyName: string]: string };
/**
* Information of user assigned identity used by this add-on.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly identity?: ManagedClusterAddonProfileIdentity;
}

/**
Expand Down Expand Up @@ -1224,6 +1285,12 @@ export interface ManagedClusterAPIServerAccessProfile {
enablePrivateCluster?: boolean;
}

/**
* An interface representing ManagedClusterPropertiesIdentityProfileValue.
*/
export interface ManagedClusterPropertiesIdentityProfileValue extends UserAssignedIdentity {
}

/**
* Identity for the managed cluster.
*/
Expand Down Expand Up @@ -1274,6 +1341,11 @@ export interface ManagedCluster extends Resource {
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly fqdn?: string;
/**
* FQDN of private cluster.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly privateFQDN?: string;
/**
* Properties of the agent pool.
*/
Expand Down Expand Up @@ -1319,6 +1391,14 @@ export interface ManagedCluster extends Resource {
* Access profile for managed cluster API server.
*/
apiServerAccessProfile?: ManagedClusterAPIServerAccessProfile;
/**
* ResourceId of the disk encryption set to use for enabling encryption at rest.
*/
diskEncryptionSetID?: string;
/**
* Identities associated with the cluster.
*/
identityProfile?: { [propertyName: string]: ManagedClusterPropertiesIdentityProfileValue };
/**
* The identity of the managed cluster, if configured.
*/
Expand Down Expand Up @@ -1728,6 +1808,14 @@ export type NetworkPlugin = 'azure' | 'kubenet';
*/
export type NetworkPolicy = 'calico' | 'azure';

/**
* Defines values for OutboundType.
* Possible values include: 'loadBalancer', 'userDefinedRouting'
* @readonly
* @enum {string}
*/
export type OutboundType = 'loadBalancer' | 'userDefinedRouting';

/**
* Defines values for LoadBalancerSku.
* Possible values include: 'standard', 'basic'
Expand Down Expand Up @@ -2224,6 +2312,26 @@ export type ManagedClustersListClusterUserCredentialsResponse = CredentialResult
};
};

/**
* Contains response data for the listClusterMonitoringUserCredentials operation.
*/
export type ManagedClustersListClusterMonitoringUserCredentialsResponse = CredentialResults & {
/**
* 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: CredentialResults;
};
};

/**
* Contains response data for the get operation.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export {
ManagedClusterAADProfile,
ManagedClusterAccessProfile,
ManagedClusterAddonProfile,
ManagedClusterAddonProfileIdentity,
ManagedClusterAgentPoolProfile,
ManagedClusterAgentPoolProfileProperties,
ManagedClusterAPIServerAccessProfile,
Expand All @@ -42,6 +43,7 @@ export {
ManagedClusterLoadBalancerProfileOutboundIPs,
ManagedClusterPoolUpgradeProfile,
ManagedClusterPoolUpgradeProfileUpgradesItem,
ManagedClusterPropertiesIdentityProfileValue,
ManagedClusterServicePrincipalProfile,
ManagedClusterUpgradeProfile,
ManagedClusterWindowsProfile,
Expand All @@ -58,5 +60,6 @@ export {
Resource,
ResourceReference,
SubResource,
TagsObject
TagsObject,
UserAssignedIdentity
} from "../models/mappers";
Loading