diff --git a/services/containerservice/mgmt/2020-06-01/containerservice/managedclusters.go b/services/containerservice/mgmt/2020-06-01/containerservice/managedclusters.go
index b0b1bf79115b..023a155c9bc8 100644
--- a/services/containerservice/mgmt/2020-06-01/containerservice/managedclusters.go
+++ b/services/containerservice/mgmt/2020-06-01/containerservice/managedclusters.go
@@ -75,9 +75,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.WindowsProfile", Name: validation.Null, Rule: false,
- Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.WindowsProfile.AdminUsername", Name: validation.Null, Rule: true,
- Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.WindowsProfile.AdminUsername", Name: validation.Pattern, Rule: `^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$`, Chain: nil}}},
- }},
+ Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.WindowsProfile.AdminUsername", 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.NetworkProfile", Name: validation.Null, Rule: false,
diff --git a/services/containerservice/mgmt/2020-06-01/containerservice/models.go b/services/containerservice/mgmt/2020-06-01/containerservice/models.go
index 1cc68ef9b5c3..af262b1f5cd6 100644
--- a/services/containerservice/mgmt/2020-06-01/containerservice/models.go
+++ b/services/containerservice/mgmt/2020-06-01/containerservice/models.go
@@ -359,8 +359,11 @@ func (page AgentPoolListResultPage) Values() []AgentPool {
}
// Creates a new instance of the AgentPoolListResultPage type.
-func NewAgentPoolListResultPage(getNextPage func(context.Context, AgentPoolListResult) (AgentPoolListResult, error)) AgentPoolListResultPage {
- return AgentPoolListResultPage{fn: getNextPage}
+func NewAgentPoolListResultPage(cur AgentPoolListResult, getNextPage func(context.Context, AgentPoolListResult) (AgentPoolListResult, error)) AgentPoolListResultPage {
+ return AgentPoolListResultPage{
+ fn: getNextPage,
+ aplr: cur,
+ }
}
// AgentPoolProfile profile for the container service agent pool.
@@ -420,8 +423,8 @@ func (app AgentPoolProfile) MarshalJSON() ([]byte, error) {
return json.Marshal(objectMap)
}
-// AgentPoolsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
+// AgentPoolsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
type AgentPoolsCreateOrUpdateFuture struct {
azure.Future
}
@@ -449,7 +452,8 @@ func (future *AgentPoolsCreateOrUpdateFuture) Result(client AgentPoolsClient) (a
return
}
-// AgentPoolsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+// AgentPoolsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
type AgentPoolsDeleteFuture struct {
azure.Future
}
@@ -718,8 +722,8 @@ func (future *ContainerServicesCreateOrUpdateFutureType) Result(client Container
return
}
-// ContainerServicesDeleteFutureType an abstraction for monitoring and retrieving the results of a long-running
-// operation.
+// ContainerServicesDeleteFutureType an abstraction for monitoring and retrieving the results of a
+// long-running operation.
type ContainerServicesDeleteFutureType struct {
azure.Future
}
@@ -947,8 +951,11 @@ func (page ListResultPage) Values() []ContainerService {
}
// Creates a new instance of the ListResultPage type.
-func NewListResultPage(getNextPage func(context.Context, ListResult) (ListResult, error)) ListResultPage {
- return ListResultPage{fn: getNextPage}
+func NewListResultPage(cur ListResult, getNextPage func(context.Context, ListResult) (ListResult, error)) ListResultPage {
+ return ListResultPage{
+ fn: getNextPage,
+ lr: cur,
+ }
}
// ManagedCluster managed cluster.
@@ -1691,8 +1698,11 @@ func (page ManagedClusterListResultPage) Values() []ManagedCluster {
}
// Creates a new instance of the ManagedClusterListResultPage type.
-func NewManagedClusterListResultPage(getNextPage func(context.Context, ManagedClusterListResult) (ManagedClusterListResult, error)) ManagedClusterListResultPage {
- return ManagedClusterListResultPage{fn: getNextPage}
+func NewManagedClusterListResultPage(cur ManagedClusterListResult, getNextPage func(context.Context, ManagedClusterListResult) (ManagedClusterListResult, error)) ManagedClusterListResultPage {
+ return ManagedClusterListResultPage{
+ fn: getNextPage,
+ mclr: cur,
+ }
}
// ManagedClusterLoadBalancerProfile profile of the managed cluster load balancer.
@@ -1725,7 +1735,8 @@ type ManagedClusterLoadBalancerProfileOutboundIPPrefixes struct {
PublicIPPrefixes *[]ResourceReference `json:"publicIPPrefixes,omitempty"`
}
-// ManagedClusterLoadBalancerProfileOutboundIPs desired outbound IP resources for the cluster load balancer.
+// ManagedClusterLoadBalancerProfileOutboundIPs desired outbound IP resources for the cluster load
+// balancer.
type ManagedClusterLoadBalancerProfileOutboundIPs struct {
// PublicIPs - A list of public IP resources.
PublicIPs *[]ResourceReference `json:"publicIPs,omitempty"`
@@ -1779,7 +1790,7 @@ type ManagedClusterProperties struct {
NodeResourceGroup *string `json:"nodeResourceGroup,omitempty"`
// EnableRBAC - Whether to enable Kubernetes Role-Based Access Control.
EnableRBAC *bool `json:"enableRBAC,omitempty"`
- // EnablePodSecurityPolicy - (PREVIEW) Whether to enable Kubernetes Pod security policy.
+ // EnablePodSecurityPolicy - (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy.
EnablePodSecurityPolicy *bool `json:"enablePodSecurityPolicy,omitempty"`
// NetworkProfile - Profile of network configuration.
NetworkProfile *NetworkProfileType `json:"networkProfile,omitempty"`
@@ -1849,7 +1860,8 @@ func (mcp ManagedClusterProperties) MarshalJSON() ([]byte, error) {
return json.Marshal(objectMap)
}
-// ManagedClusterPropertiesAutoScalerProfile parameters to be applied to the cluster-autoscaler when enabled
+// ManagedClusterPropertiesAutoScalerProfile parameters to be applied to the cluster-autoscaler when
+// enabled
type ManagedClusterPropertiesAutoScalerProfile struct {
BalanceSimilarNodeGroups *string `json:"balance-similar-node-groups,omitempty"`
ScanInterval *string `json:"scan-interval,omitempty"`
@@ -1924,8 +1936,8 @@ func (future *ManagedClustersDeleteFuture) Result(client ManagedClustersClient)
return
}
-// ManagedClusterServicePrincipalProfile information about a service principal identity for the cluster to use
-// for manipulating Azure APIs.
+// 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"`
@@ -1964,8 +1976,8 @@ func (future *ManagedClustersResetAADProfileFuture) Result(client ManagedCluster
return
}
-// ManagedClustersResetServicePrincipalProfileFuture an abstraction for monitoring and retrieving the results
-// of a long-running operation.
+// ManagedClustersResetServicePrincipalProfileFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
type ManagedClustersResetServicePrincipalProfileFuture struct {
azure.Future
}
@@ -1987,8 +1999,8 @@ func (future *ManagedClustersResetServicePrincipalProfileFuture) Result(client M
return
}
-// ManagedClustersRotateClusterCertificatesFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
+// ManagedClustersRotateClusterCertificatesFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
type ManagedClustersRotateClusterCertificatesFuture struct {
azure.Future
}
@@ -2010,8 +2022,8 @@ func (future *ManagedClustersRotateClusterCertificatesFuture) Result(client Mana
return
}
-// ManagedClustersUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
+// ManagedClustersUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
type ManagedClustersUpdateTagsFuture struct {
azure.Future
}
@@ -2122,9 +2134,9 @@ type ManagedClusterUpgradeProfileProperties struct {
// ManagedClusterWindowsProfile profile for Windows VMs in the container service cluster.
type ManagedClusterWindowsProfile struct {
- // AdminUsername - The administrator username to use for Windows VMs.
+ // AdminUsername - Specifies the name of the administrator account.
**restriction:** Cannot end in "."
**Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5".
**Minimum-length:** 1 character
**Max-length:** 20 characters
AdminUsername *string `json:"adminUsername,omitempty"`
- // AdminPassword - The administrator password to use for Windows VMs.
+ // AdminPassword - Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\W_])
**Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!"
AdminPassword *string `json:"adminPassword,omitempty"`
}
@@ -2391,7 +2403,8 @@ type OpenShiftManagedClusterAgentPoolProfile struct {
Role OpenShiftAgentPoolProfileRole `json:"role,omitempty"`
}
-// OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster.
+// OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift
+// cluster.
type OpenShiftManagedClusterAuthProfile struct {
// IdentityProviders - Type of authentication profile to use.
IdentityProviders *[]OpenShiftManagedClusterIdentityProvider `json:"identityProviders,omitempty"`
@@ -2471,8 +2484,8 @@ func (osmcbip OpenShiftManagedClusterBaseIdentityProvider) AsBasicOpenShiftManag
return &osmcbip, true
}
-// OpenShiftManagedClusterIdentityProvider defines the configuration of the identity providers to be used in
-// the OpenShift cluster.
+// OpenShiftManagedClusterIdentityProvider defines the configuration of the identity providers to be used
+// in the OpenShift cluster.
type OpenShiftManagedClusterIdentityProvider struct {
// Name - Name of the provider.
Name *string `json:"name,omitempty"`
@@ -2530,8 +2543,8 @@ func (osmclr OpenShiftManagedClusterListResult) MarshalJSON() ([]byte, error) {
return json.Marshal(objectMap)
}
-// OpenShiftManagedClusterListResultIterator provides access to a complete listing of OpenShiftManagedCluster
-// values.
+// OpenShiftManagedClusterListResultIterator provides access to a complete listing of
+// OpenShiftManagedCluster values.
type OpenShiftManagedClusterListResultIterator struct {
i int
page OpenShiftManagedClusterListResultPage
@@ -2674,12 +2687,15 @@ func (page OpenShiftManagedClusterListResultPage) Values() []OpenShiftManagedClu
}
// Creates a new instance of the OpenShiftManagedClusterListResultPage type.
-func NewOpenShiftManagedClusterListResultPage(getNextPage func(context.Context, OpenShiftManagedClusterListResult) (OpenShiftManagedClusterListResult, error)) OpenShiftManagedClusterListResultPage {
- return OpenShiftManagedClusterListResultPage{fn: getNextPage}
+func NewOpenShiftManagedClusterListResultPage(cur OpenShiftManagedClusterListResult, getNextPage func(context.Context, OpenShiftManagedClusterListResult) (OpenShiftManagedClusterListResult, error)) OpenShiftManagedClusterListResultPage {
+ return OpenShiftManagedClusterListResultPage{
+ fn: getNextPage,
+ osmclr: cur,
+ }
}
-// OpenShiftManagedClusterMasterPoolProfile openShiftManagedClusterMaterPoolProfile contains configuration for
-// OpenShift master VMs.
+// OpenShiftManagedClusterMasterPoolProfile openShiftManagedClusterMaterPoolProfile contains configuration
+// for OpenShift master VMs.
type OpenShiftManagedClusterMasterPoolProfile struct {
// Name - Unique name of the master pool profile in the context of the subscription and resource group.
Name *string `json:"name,omitempty"`
@@ -2741,8 +2757,8 @@ func (osmcp OpenShiftManagedClusterProperties) MarshalJSON() ([]byte, error) {
return json.Marshal(objectMap)
}
-// OpenShiftManagedClustersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
+// OpenShiftManagedClustersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
type OpenShiftManagedClustersCreateOrUpdateFuture struct {
azure.Future
}