diff --git a/services/containerservice/mgmt/2019-04-30/containerservice/managedclusters.go b/services/containerservice/mgmt/2019-04-30/containerservice/managedclusters.go
index 5e6672386598..108352014672 100644
--- a/services/containerservice/mgmt/2019-04-30/containerservice/managedclusters.go
+++ b/services/containerservice/mgmt/2019-04-30/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/2019-04-30/containerservice/models.go b/services/containerservice/mgmt/2019-04-30/containerservice/models.go
index 7537bf2d3393..8c4c7ccfb8d5 100644
--- a/services/containerservice/mgmt/2019-04-30/containerservice/models.go
+++ b/services/containerservice/mgmt/2019-04-30/containerservice/models.go
@@ -1390,7 +1390,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"`
@@ -1664,9 +1664,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"`
}