From 9aea85210c69ccdfb6aa10c1122afc67f1f31d8e Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 24 Jul 2018 16:31:27 +0000 Subject: [PATCH 1/3] Generated from 1bcaff877042ea44dc32ff09ddf54d8c9a1bf2da [AKS] remove "ports" property from managed cluster agent pool This was mistakenly copied from ContainerServiceAgentPoolProfile, but is not supported by AKS. --- .../containerservice/mgmt/2018-03-31/containerservice/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/containerservice/mgmt/2018-03-31/containerservice/models.go b/services/containerservice/mgmt/2018-03-31/containerservice/models.go index ba39aa50ca0c..4c04bb487f05 100644 --- a/services/containerservice/mgmt/2018-03-31/containerservice/models.go +++ b/services/containerservice/mgmt/2018-03-31/containerservice/models.go @@ -1053,8 +1053,6 @@ type ManagedClusterAgentPoolProfile struct { DNSPrefix *string `json:"dnsPrefix,omitempty"` // Fqdn - FDQN for the agent pool. Fqdn *string `json:"fqdn,omitempty"` - // Ports - Ports number array used to expose on this agent pool. The default opened ports are different based on your choice of orchestrator. - Ports *[]int32 `json:"ports,omitempty"` // StorageProfile - Storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. Possible values include: 'StorageAccount', 'ManagedDisks' StorageProfile StorageProfileTypes `json:"storageProfile,omitempty"` // VnetSubnetID - VNet SubnetID specifies the vnet's subnet identifier. From 8b69c4ed03d1aef4e30116fa3f3befb04f8e4dbb Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 26 Jul 2018 20:41:59 +0000 Subject: [PATCH 2/3] Generated from a541179a5d095f958ec91d967183cbe2eb4e7f38 [AKS] remove "fqdn" and "dnsPrefix" and make "storageProfile" read-only --- .../mgmt/2018-03-31/containerservice/models.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/containerservice/mgmt/2018-03-31/containerservice/models.go b/services/containerservice/mgmt/2018-03-31/containerservice/models.go index 4c04bb487f05..baf715e0fcee 100644 --- a/services/containerservice/mgmt/2018-03-31/containerservice/models.go +++ b/services/containerservice/mgmt/2018-03-31/containerservice/models.go @@ -1049,11 +1049,7 @@ type ManagedClusterAgentPoolProfile struct { VMSize VMSizeTypes `json:"vmSize,omitempty"` // OsDiskSizeGB - OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified. OsDiskSizeGB *int32 `json:"osDiskSizeGB,omitempty"` - // DNSPrefix - DNS prefix to be used to create the FQDN for the agent pool. - DNSPrefix *string `json:"dnsPrefix,omitempty"` - // Fqdn - FDQN for the agent pool. - Fqdn *string `json:"fqdn,omitempty"` - // StorageProfile - Storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. Possible values include: 'StorageAccount', 'ManagedDisks' + // StorageProfile - Storage profile specifies what kind of storage used. Defaults to ManagedDisks. Possible values include: 'StorageAccount', 'ManagedDisks' StorageProfile StorageProfileTypes `json:"storageProfile,omitempty"` // VnetSubnetID - VNet SubnetID specifies the vnet's subnet identifier. VnetSubnetID *string `json:"vnetSubnetID,omitempty"` From e3b603c309899f0f87ec0e7a8ad071a84348247c Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 30 Jul 2018 19:26:11 +0000 Subject: [PATCH 3/3] Generated from a541179a5d095f958ec91d967183cbe2eb4e7f38 [AKS] remove "fqdn" and "dnsPrefix" and make "storageProfile" read-only --- .../mgmt/containerservice/models.go | 1 + .../2018-03-31/containerservice/managedclusters.go | 7 +------ .../mgmt/2018-03-31/containerservice/models.go | 13 +++++++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/profiles/preview/containerservice/mgmt/containerservice/models.go b/profiles/preview/containerservice/mgmt/containerservice/models.go index 12747e0d2930..8832ad448518 100644 --- a/profiles/preview/containerservice/mgmt/containerservice/models.go +++ b/profiles/preview/containerservice/mgmt/containerservice/models.go @@ -268,6 +268,7 @@ type ManagedClusterPoolUpgradeProfile = original.ManagedClusterPoolUpgradeProfil type ManagedClusterProperties = original.ManagedClusterProperties type ManagedClustersCreateOrUpdateFuture = original.ManagedClustersCreateOrUpdateFuture type ManagedClustersDeleteFuture = original.ManagedClustersDeleteFuture +type ManagedClusterServicePrincipalProfile = original.ManagedClusterServicePrincipalProfile type ManagedClustersUpdateTagsFuture = original.ManagedClustersUpdateTagsFuture type ManagedClusterUpgradeProfile = original.ManagedClusterUpgradeProfile type ManagedClusterUpgradeProfileProperties = original.ManagedClusterUpgradeProfileProperties diff --git a/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go b/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go index da59cf33e70f..7f71f13e92e3 100644 --- a/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go +++ b/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go @@ -57,12 +57,7 @@ func (client ManagedClustersClient) CreateOrUpdate(ctx context.Context, resource Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.LinuxProfile.SSH.PublicKeys", Name: validation.Null, Rule: true, Chain: nil}}}, }}, {Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.ClientID", Name: validation.Null, Rule: true, Chain: nil}, - {Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.KeyVaultSecretRef", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.KeyVaultSecretRef.VaultID", Name: validation.Null, Rule: true, Chain: nil}, - {Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.KeyVaultSecretRef.SecretName", Name: validation.Null, Rule: true, Chain: nil}, - }}, - }}, + Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.ClientID", Name: validation.Null, Rule: true, Chain: nil}}}, {Target: "parameters.ManagedClusterProperties.NetworkProfile", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.NetworkProfile.PodCidr", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.NetworkProfile.PodCidr", Name: validation.Pattern, Rule: `^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$`, Chain: nil}}}, diff --git a/services/containerservice/mgmt/2018-03-31/containerservice/models.go b/services/containerservice/mgmt/2018-03-31/containerservice/models.go index baf715e0fcee..50da10473472 100644 --- a/services/containerservice/mgmt/2018-03-31/containerservice/models.go +++ b/services/containerservice/mgmt/2018-03-31/containerservice/models.go @@ -1187,8 +1187,8 @@ type ManagedClusterProperties struct { AgentPoolProfiles *[]ManagedClusterAgentPoolProfile `json:"agentPoolProfiles,omitempty"` // LinuxProfile - Profile for Linux VMs in the container service cluster. LinuxProfile *LinuxProfile `json:"linuxProfile,omitempty"` - // ServicePrincipalProfile - Information about a service principal identity for the cluster to use for manipulating Azure APIs. Either secret or keyVaultSecretRef must be specified. - ServicePrincipalProfile *ServicePrincipalProfile `json:"servicePrincipalProfile,omitempty"` + // ServicePrincipalProfile - Information about a service principal identity for the cluster to use for manipulating Azure APIs. + ServicePrincipalProfile *ManagedClusterServicePrincipalProfile `json:"servicePrincipalProfile,omitempty"` // AddonProfiles - Profile of managed cluster add-on. AddonProfiles map[string]*ManagedClusterAddonProfile `json:"addonProfiles"` // NodeResourceGroup - Name of the resource group containing agent pool nodes. @@ -1295,6 +1295,15 @@ func (future *ManagedClustersDeleteFuture) Result(client ManagedClustersClient) return } +// ManagedClusterServicePrincipalProfile information about a service principal identity for the cluster to use for +// manipulating Azure APIs. +type ManagedClusterServicePrincipalProfile struct { + // ClientID - The ID for the service principal. + ClientID *string `json:"clientId,omitempty"` + // Secret - The secret password associated with the service principal in plain text. + Secret *string `json:"secret,omitempty"` +} + // ManagedClustersUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ManagedClustersUpdateTagsFuture struct {