Skip to content

Commit a19d488

Browse files
Yao725Yao725
authored
[ContainerService] Upgrade API version to 2022-09-01 and polish the API (Azure#32719)
* upgrade container service to 2022-09-01 * update version and changelog * temporarily remove sample generation * fix spell error * resolve comments * missed... * update release date
1 parent 5493309 commit a19d488

File tree

63 files changed

+4739
-9340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+4739
-9340
lines changed

‎.vscode/cspell.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@
262262
"sysctls",
263263
"tcpkeepalive",
264264
"wasi",
265-
"wmem"
265+
"wmem",
266+
"Oidc"
266267
]
267268
},
268269
{

‎sdk/containerservice/Azure.ResourceManager.ContainerService/CHANGELOG.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# Release History
22

3-
## 1.1.0-beta.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
3+
## 1.1.0 (2022-12-14)
104

115
### Other Changes
126

7+
- Upgraded API version to 2022-09-01.
8+
- Upgraded dependent `Azure.Core` to 1.26.0.
9+
- Upgraded dependent `Azure.ResourceManager` to 1.3.2.
10+
1311
## 1.0.0 (2022-09-26)
1412

1513
This release is the first stable release of the Container Service Management library.

‎sdk/containerservice/Azure.ResourceManager.ContainerService/api/Azure.ResourceManager.ContainerService.netstandard2.0.cs‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public ContainerServiceAgentPoolData() { }
9393
public bool? EnableNodePublicIP { get { throw null; } set { } }
9494
public bool? EnableUltraSsd { get { throw null; } set { } }
9595
public Azure.ResourceManager.ContainerService.Models.GpuInstanceProfile? GpuInstanceProfile { get { throw null; } set { } }
96+
public Azure.Core.ResourceIdentifier HostGroupId { get { throw null; } set { } }
9697
public Azure.ResourceManager.ContainerService.Models.KubeletConfig KubeletConfig { get { throw null; } set { } }
9798
public Azure.ResourceManager.ContainerService.Models.KubeletDiskType? KubeletDiskType { get { throw null; } set { } }
9899
public Azure.ResourceManager.ContainerService.Models.LinuxOSConfig LinuxOSConfig { get { throw null; } set { } }
@@ -245,13 +246,17 @@ public ContainerServiceManagedClusterData(Azure.Core.AzureLocation location) : b
245246
public int? MaxAgentPools { get { throw null; } }
246247
public Azure.ResourceManager.ContainerService.Models.ContainerServiceNetworkProfile NetworkProfile { get { throw null; } set { } }
247248
public string NodeResourceGroup { get { throw null; } set { } }
249+
public Azure.ResourceManager.ContainerService.Models.ManagedClusterOidcIssuerProfile OidcIssuerProfile { get { throw null; } set { } }
248250
public Azure.ResourceManager.ContainerService.Models.ManagedClusterPodIdentityProfile PodIdentityProfile { get { throw null; } set { } }
249251
public Azure.ResourceManager.ContainerService.Models.ContainerServiceStateCode? PowerStateCode { get { throw null; } }
250252
public string PrivateFqdn { get { throw null; } }
251253
public System.Collections.Generic.IList<Azure.ResourceManager.ContainerService.Models.ContainerServicePrivateLinkResourceData> PrivateLinkResources { get { throw null; } }
252254
public string ProvisioningState { get { throw null; } }
253255
public Azure.ResourceManager.ContainerService.Models.ContainerServicePublicNetworkAccess? PublicNetworkAccess { get { throw null; } set { } }
256+
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
257+
[System.ObsoleteAttribute("This property is obsolete and will be removed in a future release", false)]
254258
public Azure.ResourceManager.ContainerService.Models.ManagedClusterSecurityProfileAzureDefender SecurityAzureDefender { get { throw null; } set { } }
259+
public Azure.ResourceManager.ContainerService.Models.ManagedClusterSecurityProfile SecurityProfile { get { throw null; } set { } }
255260
public Azure.ResourceManager.ContainerService.Models.ManagedClusterServicePrincipalProfile ServicePrincipalProfile { get { throw null; } set { } }
256261
public Azure.ResourceManager.ContainerService.Models.ManagedClusterSku Sku { get { throw null; } set { } }
257262
public Azure.ResourceManager.ContainerService.Models.ManagedClusterStorageProfile StorageProfile { get { throw null; } set { } }
@@ -307,6 +312,8 @@ protected ContainerServiceManagedClusterResource() { }
307312
public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.ContainerService.Models.ContainerServicePrivateLinkResourceData>> ResolvePrivateLinkServiceIdAsync(Azure.ResourceManager.ContainerService.Models.ContainerServicePrivateLinkResourceData data, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
308313
public virtual Azure.ResourceManager.ArmOperation RotateClusterCertificates(Azure.WaitUntil waitUntil, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
309314
public virtual System.Threading.Tasks.Task<Azure.ResourceManager.ArmOperation> RotateClusterCertificatesAsync(Azure.WaitUntil waitUntil, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
315+
public virtual Azure.ResourceManager.ArmOperation RotateServiceAccountSigningKeys(Azure.WaitUntil waitUntil, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
316+
public virtual System.Threading.Tasks.Task<Azure.ResourceManager.ArmOperation> RotateServiceAccountSigningKeysAsync(Azure.WaitUntil waitUntil, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
310317
public virtual Azure.ResourceManager.ArmOperation<Azure.ResourceManager.ContainerService.Models.ManagedClusterRunCommandResult> RunCommand(Azure.WaitUntil waitUntil, Azure.ResourceManager.ContainerService.Models.ManagedClusterRunCommandContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
311318
public virtual System.Threading.Tasks.Task<Azure.ResourceManager.ArmOperation<Azure.ResourceManager.ContainerService.Models.ManagedClusterRunCommandResult>> RunCommandAsync(Azure.WaitUntil waitUntil, Azure.ResourceManager.ContainerService.Models.ManagedClusterRunCommandContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
312319
public virtual Azure.Response<Azure.ResourceManager.ContainerService.ContainerServiceManagedClusterResource> SetTags(System.Collections.Generic.IDictionary<string, string> tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -526,6 +533,7 @@ public ContainerServiceLinuxProfile(string adminUsername, Azure.ResourceManager.
526533
public ContainerServiceNetworkPlugin(string value) { throw null; }
527534
public static Azure.ResourceManager.ContainerService.Models.ContainerServiceNetworkPlugin Azure { get { throw null; } }
528535
public static Azure.ResourceManager.ContainerService.Models.ContainerServiceNetworkPlugin Kubenet { get { throw null; } }
536+
public static Azure.ResourceManager.ContainerService.Models.ContainerServiceNetworkPlugin None { get { throw null; } }
529537
public bool Equals(Azure.ResourceManager.ContainerService.Models.ContainerServiceNetworkPlugin other) { throw null; }
530538
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
531539
public override bool Equals(object obj) { throw null; }
@@ -604,6 +612,8 @@ internal ContainerServiceOSOptionProperty() { }
604612
public ContainerServiceOSSku(string value) { throw null; }
605613
public static Azure.ResourceManager.ContainerService.Models.ContainerServiceOSSku CblMariner { get { throw null; } }
606614
public static Azure.ResourceManager.ContainerService.Models.ContainerServiceOSSku Ubuntu { get { throw null; } }
615+
public static Azure.ResourceManager.ContainerService.Models.ContainerServiceOSSku Windows2019 { get { throw null; } }
616+
public static Azure.ResourceManager.ContainerService.Models.ContainerServiceOSSku Windows2022 { get { throw null; } }
607617
public bool Equals(Azure.ResourceManager.ContainerService.Models.ContainerServiceOSSku other) { throw null; }
608618
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
609619
public override bool Equals(object obj) { throw null; }
@@ -951,6 +961,7 @@ public ManagedClusterAgentPoolProfileProperties() { }
951961
public bool? EnableNodePublicIP { get { throw null; } set { } }
952962
public bool? EnableUltraSsd { get { throw null; } set { } }
953963
public Azure.ResourceManager.ContainerService.Models.GpuInstanceProfile? GpuInstanceProfile { get { throw null; } set { } }
964+
public Azure.Core.ResourceIdentifier HostGroupId { get { throw null; } set { } }
954965
public Azure.ResourceManager.ContainerService.Models.KubeletConfig KubeletConfig { get { throw null; } set { } }
955966
public Azure.ResourceManager.ContainerService.Models.KubeletDiskType? KubeletDiskType { get { throw null; } set { } }
956967
public Azure.ResourceManager.ContainerService.Models.LinuxOSConfig LinuxOSConfig { get { throw null; } set { } }
@@ -1030,6 +1041,24 @@ public ManagedClusterHttpProxyConfig() { }
10301041
public System.Collections.Generic.IList<string> NoProxy { get { throw null; } }
10311042
public string TrustedCA { get { throw null; } set { } }
10321043
}
1044+
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
1045+
public readonly partial struct ManagedClusterKeyVaultNetworkAccessType : System.IEquatable<Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType>
1046+
{
1047+
private readonly object _dummy;
1048+
private readonly int _dummyPrimitive;
1049+
public ManagedClusterKeyVaultNetworkAccessType(string value) { throw null; }
1050+
public static Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType Private { get { throw null; } }
1051+
public static Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType Public { get { throw null; } }
1052+
public bool Equals(Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType other) { throw null; }
1053+
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
1054+
public override bool Equals(object obj) { throw null; }
1055+
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
1056+
public override int GetHashCode() { throw null; }
1057+
public static bool operator ==(Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType left, Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType right) { throw null; }
1058+
public static implicit operator Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType (string value) { throw null; }
1059+
public static bool operator !=(Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType left, Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType right) { throw null; }
1060+
public override string ToString() { throw null; }
1061+
}
10331062
public partial class ManagedClusterLoadBalancerProfile
10341063
{
10351064
public ManagedClusterLoadBalancerProfile() { }
@@ -1054,6 +1083,12 @@ public ManagedClusterNatGatewayProfile() { }
10541083
public int? IdleTimeoutInMinutes { get { throw null; } set { } }
10551084
public int? ManagedOutboundIPCount { get { throw null; } set { } }
10561085
}
1086+
public partial class ManagedClusterOidcIssuerProfile
1087+
{
1088+
public ManagedClusterOidcIssuerProfile() { }
1089+
public bool? IsEnabled { get { throw null; } set { } }
1090+
public string IssuerUriInfo { get { throw null; } }
1091+
}
10571092
public partial class ManagedClusterPodIdentity
10581093
{
10591094
public ManagedClusterPodIdentity(string name, string @namespace, Azure.ResourceManager.ContainerService.Models.ContainerServiceUserAssignedIdentity identity) { }
@@ -1131,12 +1166,32 @@ internal ManagedClusterRunCommandResult() { }
11311166
public string Reason { get { throw null; } }
11321167
public System.DateTimeOffset? StartedOn { get { throw null; } }
11331168
}
1169+
public partial class ManagedClusterSecurityProfile
1170+
{
1171+
public ManagedClusterSecurityProfile() { }
1172+
public Azure.ResourceManager.ContainerService.Models.ManagedClusterSecurityProfileKeyVaultKms AzureKeyVaultKms { get { throw null; } set { } }
1173+
public Azure.ResourceManager.ContainerService.Models.ManagedClusterSecurityProfileDefender Defender { get { throw null; } set { } }
1174+
}
11341175
public partial class ManagedClusterSecurityProfileAzureDefender
11351176
{
11361177
public ManagedClusterSecurityProfileAzureDefender() { }
11371178
public bool? IsEnabled { get { throw null; } set { } }
11381179
public Azure.Core.ResourceIdentifier LogAnalyticsWorkspaceResourceId { get { throw null; } set { } }
11391180
}
1181+
public partial class ManagedClusterSecurityProfileDefender
1182+
{
1183+
public ManagedClusterSecurityProfileDefender() { }
1184+
public bool? IsSecurityMonitoringEnabled { get { throw null; } set { } }
1185+
public Azure.Core.ResourceIdentifier LogAnalyticsWorkspaceResourceId { get { throw null; } set { } }
1186+
}
1187+
public partial class ManagedClusterSecurityProfileKeyVaultKms
1188+
{
1189+
public ManagedClusterSecurityProfileKeyVaultKms() { }
1190+
public bool? IsEnabled { get { throw null; } set { } }
1191+
public string KeyId { get { throw null; } set { } }
1192+
public Azure.ResourceManager.ContainerService.Models.ManagedClusterKeyVaultNetworkAccessType? KeyVaultNetworkAccess { get { throw null; } set { } }
1193+
public Azure.Core.ResourceIdentifier KeyVaultResourceId { get { throw null; } set { } }
1194+
}
11401195
public partial class ManagedClusterServicePrincipalProfile
11411196
{
11421197
public ManagedClusterServicePrincipalProfile(string clientId) { }
@@ -1187,6 +1242,7 @@ public ManagedClusterSku() { }
11871242
public partial class ManagedClusterStorageProfile
11881243
{
11891244
public ManagedClusterStorageProfile() { }
1245+
public bool? IsBlobCsiDriverEnabled { get { throw null; } set { } }
11901246
public bool? IsDiskCsiDriverEnabled { get { throw null; } set { } }
11911247
public bool? IsFileCsiDriverEnabled { get { throw null; } set { } }
11921248
public bool? IsSnapshotControllerEnabled { get { throw null; } set { } }

‎sdk/containerservice/Azure.ResourceManager.ContainerService/src/Azure.ResourceManager.ContainerService.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Version>1.1.0-beta.1</Version>
3+
<Version>1.1.0</Version>
44
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
55
<ApiCompatVersion>1.0.0</ApiCompatVersion>
66
<PackageId>Azure.ResourceManager.ContainerService</PackageId>

‎sdk/containerservice/Azure.ResourceManager.ContainerService/src/Custom/ContainerServiceManagedClusterData.cs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#nullable disable
5+
6+
using System;
7+
using System.Collections.Generic;
8+
using System.ComponentModel;
9+
using Azure.Core;
10+
using Azure.ResourceManager.ContainerService.Models;
11+
using Azure.ResourceManager.Models;
12+
using Azure.ResourceManager.Resources.Models;
13+
14+
namespace Azure.ResourceManager.ContainerService
15+
{
16+
/// <summary> A class representing the ContainerServiceManagedCluster data model. </summary>
17+
public partial class ContainerServiceManagedClusterData
18+
{
19+
/// <summary> Azure Defender settings for the security profile. </summary>
20+
[Obsolete("This property is obsolete and will be removed in a future release", false)]
21+
[EditorBrowsable(EditorBrowsableState.Never)]
22+
public ManagedClusterSecurityProfileAzureDefender SecurityAzureDefender
23+
{
24+
get
25+
{
26+
if (SecurityProfile != null && SecurityProfile.Defender != null)
27+
{
28+
return new ManagedClusterSecurityProfileAzureDefender
29+
{
30+
IsEnabled = SecurityProfile.Defender.IsSecurityMonitoringEnabled,
31+
LogAnalyticsWorkspaceResourceId = SecurityProfile.Defender.LogAnalyticsWorkspaceResourceId
32+
};
33+
}
34+
return default;
35+
}
36+
set
37+
{
38+
if (SecurityProfile is null)
39+
SecurityProfile = new ManagedClusterSecurityProfile();
40+
SecurityProfile.Defender = new ManagedClusterSecurityProfileDefender()
41+
{
42+
LogAnalyticsWorkspaceResourceId = value.LogAnalyticsWorkspaceResourceId,
43+
IsSecurityMonitoringEnabled = value.IsEnabled
44+
};
45+
}
46+
}
47+
}
48+
}

sdk/containerservice/Azure.ResourceManager.ContainerService/src/Generated/Models/ManagedClusterSecurityProfileAzureDefender.cs renamed to sdk/containerservice/Azure.ResourceManager.ContainerService/src/Custom/Models/ManagedClusterSecurityProfileAzureDefender.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
// <auto-generated/>
5-
64
#nullable disable
75

86
using Azure.Core;
@@ -17,15 +15,6 @@ public ManagedClusterSecurityProfileAzureDefender()
1715
{
1816
}
1917

20-
/// <summary> Initializes a new instance of ManagedClusterSecurityProfileAzureDefender. </summary>
21-
/// <param name="isEnabled"> Whether to enable Azure Defender. </param>
22-
/// <param name="logAnalyticsWorkspaceResourceId"> Resource ID of the Log Analytics workspace to be associated with Azure Defender. When Azure Defender is enabled, this field is required and must be a valid workspace resource ID. When Azure Defender is disabled, leave the field empty. </param>
23-
internal ManagedClusterSecurityProfileAzureDefender(bool? isEnabled, ResourceIdentifier logAnalyticsWorkspaceResourceId)
24-
{
25-
IsEnabled = isEnabled;
26-
LogAnalyticsWorkspaceResourceId = logAnalyticsWorkspaceResourceId;
27-
}
28-
2918
/// <summary> Whether to enable Azure Defender. </summary>
3019
public bool? IsEnabled { get; set; }
3120
/// <summary> Resource ID of the Log Analytics workspace to be associated with Azure Defender. When Azure Defender is enabled, this field is required and must be a valid workspace resource ID. When Azure Defender is disabled, leave the field empty. </summary>

‎sdk/containerservice/Azure.ResourceManager.ContainerService/src/Custom/Models/ManagedClusterStorageProfile.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,17 @@ public bool? IsSnapshotControllerEnabled
4646
SnapshotController.IsEnabled = value;
4747
}
4848
}
49+
50+
/// <summary> Whether to enable AzureBlob CSI Driver. The default value is false. </summary>
51+
public bool? IsBlobCsiDriverEnabled
52+
{
53+
get => BlobCsiDriver is null ? default : BlobCsiDriver.IsEnabled;
54+
set
55+
{
56+
if (BlobCsiDriver is null)
57+
BlobCsiDriver = new ManagedClusterStorageProfileBlobCsiDriver();
58+
BlobCsiDriver.IsEnabled = value;
59+
}
60+
}
4961
}
5062
}

0 commit comments

Comments
 (0)