WIP: Update changes made during Azure user tags implementation
@@ -75,8 +75,8 @@ tags meet all the below conditions or else the cluster creation will fail.
- Tag name has a limit of 512 characters for all resources except for
storage accounts, which has a limit of 128 characters and hence tag name
length is restricted to 128 characters on every resource required by Openshift.
-2. A tag name cannot contain `<, >, %, &, \, ?, /, #, :, whitespace` characters and
- must not start with a number.
+2. A tag name must begin with a letter, end with a letter, number or underscore, and
+ can contain only letters, numbers, underscores, periods, or hyphens.
- DNS zones, Traffic, Front Door resources does not support tag with spaces,
special/unicode characters or starting with number, hence these are added as
constraints on every other Azure resource required by Openshift as well.
@@ -163,10 +163,10 @@ spec:
description: resourceTags is a list of additional tags to apply to Azure
resources created for the cluster. See
https://docs.microsoft.com/en-us/rest/api/resources/tags for information
- on tagging Azure resources. Azure supports a maximum of 50 tags per
- resource except for few, which have limitation of 15 tags. OpenShift
- reserves 5 tags for its internal use, and allows 10 tags
- for user configuration.
+ on tagging Azure resources. Due to limitations on Automation,
+ Content Delivery Network, DNS Azure resources, a maximum of 15 tags may be
+ applied. OpenShift reserves 5 tags for internal use, allowing 10 tags for
+ user configuration.
type: array
maxItems: 10
items:
@@ -177,13 +177,18 @@ spec:
- value
properties:
key:
- description: key is the key of the tag
+ description: key is the key part of the tag. A tag key can have a maximum of
+ 128 characters and cannot be empty. Key must beg in with a letter, end with a
+ letter, number or underscore, and can contain only letters, numbers,
+ underscores, periods, or hyphens.
type: string
maxLength: 128
minLength: 1
- pattern: ^[a-zA-Z][0-9A-Za-z_.=+-@]+$
+ pattern: ^[a-zA-Z][0-9A-Za-z_.-]+[0-9A-Za-z_]$
value:
- description: value is the value of the tag.
+ description: value is the value part of the tag. A tag value can have a maximum
+ of 256 characters and cannot be empty. Value can contain only `a-zA-Z0-9_.=+-@`
+ characters.
type: string
maxLength: 256
minLength: 1
