diff --git a/src/SDKs/ContainerService/AzSdk.RP.props b/src/SDKs/ContainerService/AzSdk.RP.props index e4be334a737a0..e10c3d119e5a4 100644 --- a/src/SDKs/ContainerService/AzSdk.RP.props +++ b/src/SDKs/ContainerService/AzSdk.RP.props @@ -1,7 +1,7 @@ - ContainerService_2019-02-01;ContainerService_2017-07-01;ContainerService_2017-09-30;ContainerService_2018-09-30-preview; + ContainerService_2019-02-01;ContainerService_2017-07-01;ContainerService_2017-09-30;ContainerService_2019-04-30; $(PackageTags);$(CommonTags);$(AzureApiTag); \ No newline at end of file diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/NetworkProfile.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/NetworkProfile.cs index 16217f0dc5049..b6048318edc13 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/NetworkProfile.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/NetworkProfile.cs @@ -31,10 +31,13 @@ public NetworkProfile() /// /// CIDR for the OpenShift Vnet. /// CIDR of the Vnet to peer. - public NetworkProfile(string vnetCidr = default(string), string peerVnetId = default(string)) + /// ID of the Vnet created for OSA + /// cluster. + public NetworkProfile(string vnetCidr = default(string), string peerVnetId = default(string), string vnetId = default(string)) { VnetCidr = vnetCidr; PeerVnetId = peerVnetId; + VnetId = vnetId; CustomInit(); } @@ -55,5 +58,11 @@ public NetworkProfile() [JsonProperty(PropertyName = "peerVnetId")] public string PeerVnetId { get; set; } + /// + /// Gets or sets ID of the Vnet created for OSA cluster. + /// + [JsonProperty(PropertyName = "vnetId")] + public string VnetId { get; set; } + } } diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftManagedCluster.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftManagedCluster.cs index fdca15728c9d8..fd9eb0ea52817 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftManagedCluster.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftManagedCluster.cs @@ -45,9 +45,11 @@ public OpenShiftManagedCluster() /// billing purposes /// The current deployment or /// provisioning state, which only appears in the response. - /// Optional user-specified FQDN for - /// OpenShift API server. - /// User-specified FQDN for OpenShift API server + /// Version of OpenShift specified when + /// creating the cluster. + /// Service generated FQDN for OpenShift + /// API server. + /// Service generated FQDN for OpenShift API server /// loadbalancer internal hostname. /// Configuration for OpenShift /// networking. @@ -59,12 +61,13 @@ public OpenShiftManagedCluster() /// VMs. /// Configures OpenShift /// authentication. - public OpenShiftManagedCluster(string location, string openShiftVersion, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), PurchasePlan plan = default(PurchasePlan), string provisioningState = default(string), string publicHostname = default(string), string fqdn = default(string), NetworkProfile networkProfile = default(NetworkProfile), IList routerProfiles = default(IList), OpenShiftManagedClusterMasterPoolProfile masterPoolProfile = default(OpenShiftManagedClusterMasterPoolProfile), IList agentPoolProfiles = default(IList), OpenShiftManagedClusterAuthProfile authProfile = default(OpenShiftManagedClusterAuthProfile)) + public OpenShiftManagedCluster(string location, string openShiftVersion, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), PurchasePlan plan = default(PurchasePlan), string provisioningState = default(string), string clusterVersion = default(string), string publicHostname = default(string), string fqdn = default(string), NetworkProfile networkProfile = default(NetworkProfile), IList routerProfiles = default(IList), OpenShiftManagedClusterMasterPoolProfile masterPoolProfile = default(OpenShiftManagedClusterMasterPoolProfile), IList agentPoolProfiles = default(IList), OpenShiftManagedClusterAuthProfile authProfile = default(OpenShiftManagedClusterAuthProfile)) : base(location, id, name, type, tags) { Plan = plan; ProvisioningState = provisioningState; OpenShiftVersion = openShiftVersion; + ClusterVersion = clusterVersion; PublicHostname = publicHostname; Fqdn = fqdn; NetworkProfile = networkProfile; @@ -102,17 +105,23 @@ public OpenShiftManagedCluster() public string OpenShiftVersion { get; set; } /// - /// Gets or sets optional user-specified FQDN for OpenShift API server. + /// Gets version of OpenShift specified when creating the cluster. + /// + [JsonProperty(PropertyName = "properties.clusterVersion")] + public string ClusterVersion { get; private set; } + + /// + /// Gets service generated FQDN for OpenShift API server. /// [JsonProperty(PropertyName = "properties.publicHostname")] - public string PublicHostname { get; set; } + public string PublicHostname { get; private set; } /// - /// Gets or sets user-specified FQDN for OpenShift API server - /// loadbalancer internal hostname. + /// Gets service generated FQDN for OpenShift API server loadbalancer + /// internal hostname. /// [JsonProperty(PropertyName = "properties.fqdn")] - public string Fqdn { get; set; } + public string Fqdn { get; private set; } /// /// Gets or sets configuration for OpenShift networking. diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftRouterProfile.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftRouterProfile.cs index 652e6490c720c..bc985a75d8de8 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftRouterProfile.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OpenShiftRouterProfile.cs @@ -54,10 +54,10 @@ public OpenShiftRouterProfile() public string Name { get; set; } /// - /// Gets or sets DNS subdomain for OpenShift router. + /// Gets DNS subdomain for OpenShift router. /// [JsonProperty(PropertyName = "publicSubdomain")] - public string PublicSubdomain { get; set; } + public string PublicSubdomain { get; private set; } /// /// Gets auto-allocated FQDN for the OpenShift router. diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/OpenShiftManagedClustersOperations.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/OpenShiftManagedClustersOperations.cs index d99cb15189e89..88ceffb58c7dc 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/OpenShiftManagedClustersOperations.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/OpenShiftManagedClustersOperations.cs @@ -84,7 +84,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2018-09-30-preview"; + string apiVersion = "2019-04-30"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -279,7 +279,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client) throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); } } - string apiVersion = "2018-09-30-preview"; + string apiVersion = "2019-04-30"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -482,7 +482,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceName"); } - string apiVersion = "2018-09-30-preview"; + string apiVersion = "2019-04-30"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -783,7 +783,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client) { parameters.Validate(); } - string apiVersion = "2018-09-30-preview"; + string apiVersion = "2019-04-30"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1015,7 +1015,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceName"); } - string apiVersion = "2018-09-30-preview"; + string apiVersion = "2019-04-30"; TagsObject parameters = new TagsObject(); if (tags != null) { @@ -1229,7 +1229,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceName"); } - string apiVersion = "2018-09-30-preview"; + string apiVersion = "2019-04-30"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs index faca44ac3e6ee..fe8c124418f1e 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs @@ -23,7 +23,7 @@ public static IEnumerable> ApiInfo_ContainerServic new Tuple("ContainerService", "ContainerServices", "2017-07-01"), new Tuple("ContainerService", "ContainerServices", "2017-09-30"), new Tuple("ContainerService", "ManagedClusters", "2019-02-01"), - new Tuple("ContainerService", "OpenShiftManagedClusters", "2018-09-30-preview"), + new Tuple("ContainerService", "OpenShiftManagedClusters", "2019-04-30"), new Tuple("ContainerService", "Operations", "2019-02-01"), }.AsEnumerable(); }