Skip to content

Commit d5168f3

Browse files
patrickdillonpatrickdillon
committed
Generate infrastructure CRDs for aws tags with spaces
1 parent 96a465d commit d5168f3

File tree

40 files changed

+709
-154
lines changed

40 files changed

+709
-154
lines changed

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,20 +1305,35 @@ spec:
13051305
created for the cluster.
13061306
properties:
13071307
key:
1308-
description: key is the key of the tag
1308+
description: |-
1309+
key sets the key of the AWS resource tag key-value pair. Key is required when defining an AWS resource tag.
1310+
Key should consist of between 1 and 128 characters, and may
1311+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
13091312
maxLength: 128
13101313
minLength: 1
1311-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
13121314
type: string
1315+
x-kubernetes-validations:
1316+
- message: invalid AWS resource tag key. The string
1317+
can contain only the set of alphanumeric characters,
1318+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1319+
'@'
1320+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
13131321
value:
13141322
description: |-
1315-
value is the value of the tag.
1323+
value sets the value of the AWS resource tag key-value pair. Value is required when defining an AWS resource tag.
1324+
Value should consist of between 1 and 256 characters, and may
1325+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
13161326
Some AWS service do not support empty values. Since tags are added to resources in many services, the
13171327
length of the tag value must meet the requirements of all services.
13181328
maxLength: 256
13191329
minLength: 1
1320-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
13211330
type: string
1331+
x-kubernetes-validations:
1332+
- message: invalid AWS resource tag value. The string
1333+
can contain only the set of alphanumeric characters,
1334+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1335+
'@'
1336+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
13221337
required:
13231338
- key
13241339
- value

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,20 +1185,35 @@ spec:
11851185
created for the cluster.
11861186
properties:
11871187
key:
1188-
description: key is the key of the tag
1188+
description: |-
1189+
key sets the key of the AWS resource tag key-value pair. Key is required when defining an AWS resource tag.
1190+
Key should consist of between 1 and 128 characters, and may
1191+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
11891192
maxLength: 128
11901193
minLength: 1
1191-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
11921194
type: string
1195+
x-kubernetes-validations:
1196+
- message: invalid AWS resource tag key. The string
1197+
can contain only the set of alphanumeric characters,
1198+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1199+
'@'
1200+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
11931201
value:
11941202
description: |-
1195-
value is the value of the tag.
1203+
value sets the value of the AWS resource tag key-value pair. Value is required when defining an AWS resource tag.
1204+
Value should consist of between 1 and 256 characters, and may
1205+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
11961206
Some AWS service do not support empty values. Since tags are added to resources in many services, the
11971207
length of the tag value must meet the requirements of all services.
11981208
maxLength: 256
11991209
minLength: 1
1200-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
12011210
type: string
1211+
x-kubernetes-validations:
1212+
- message: invalid AWS resource tag value. The string
1213+
can contain only the set of alphanumeric characters,
1214+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1215+
'@'
1216+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
12021217
required:
12031218
- key
12041219
- value

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,20 +1305,35 @@ spec:
13051305
created for the cluster.
13061306
properties:
13071307
key:
1308-
description: key is the key of the tag
1308+
description: |-
1309+
key sets the key of the AWS resource tag key-value pair. Key is required when defining an AWS resource tag.
1310+
Key should consist of between 1 and 128 characters, and may
1311+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
13091312
maxLength: 128
13101313
minLength: 1
1311-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
13121314
type: string
1315+
x-kubernetes-validations:
1316+
- message: invalid AWS resource tag key. The string
1317+
can contain only the set of alphanumeric characters,
1318+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1319+
'@'
1320+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
13131321
value:
13141322
description: |-
1315-
value is the value of the tag.
1323+
value sets the value of the AWS resource tag key-value pair. Value is required when defining an AWS resource tag.
1324+
Value should consist of between 1 and 256 characters, and may
1325+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
13161326
Some AWS service do not support empty values. Since tags are added to resources in many services, the
13171327
length of the tag value must meet the requirements of all services.
13181328
maxLength: 256
13191329
minLength: 1
1320-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
13211330
type: string
1331+
x-kubernetes-validations:
1332+
- message: invalid AWS resource tag value. The string
1333+
can contain only the set of alphanumeric characters,
1334+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1335+
'@'
1336+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
13221337
required:
13231338
- key
13241339
- value

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,20 +1305,35 @@ spec:
13051305
created for the cluster.
13061306
properties:
13071307
key:
1308-
description: key is the key of the tag
1308+
description: |-
1309+
key sets the key of the AWS resource tag key-value pair. Key is required when defining an AWS resource tag.
1310+
Key should consist of between 1 and 128 characters, and may
1311+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
13091312
maxLength: 128
13101313
minLength: 1
1311-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
13121314
type: string
1315+
x-kubernetes-validations:
1316+
- message: invalid AWS resource tag key. The string
1317+
can contain only the set of alphanumeric characters,
1318+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1319+
'@'
1320+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
13131321
value:
13141322
description: |-
1315-
value is the value of the tag.
1323+
value sets the value of the AWS resource tag key-value pair. Value is required when defining an AWS resource tag.
1324+
Value should consist of between 1 and 256 characters, and may
1325+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
13161326
Some AWS service do not support empty values. Since tags are added to resources in many services, the
13171327
length of the tag value must meet the requirements of all services.
13181328
maxLength: 256
13191329
minLength: 1
1320-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
13211330
type: string
1331+
x-kubernetes-validations:
1332+
- message: invalid AWS resource tag value. The string
1333+
can contain only the set of alphanumeric characters,
1334+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1335+
'@'
1336+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
13221337
required:
13231338
- key
13241339
- value

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,20 +1158,35 @@ spec:
11581158
created for the cluster.
11591159
properties:
11601160
key:
1161-
description: key is the key of the tag
1161+
description: |-
1162+
key sets the key of the AWS resource tag key-value pair. Key is required when defining an AWS resource tag.
1163+
Key should consist of between 1 and 128 characters, and may
1164+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
11621165
maxLength: 128
11631166
minLength: 1
1164-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
11651167
type: string
1168+
x-kubernetes-validations:
1169+
- message: invalid AWS resource tag key. The string
1170+
can contain only the set of alphanumeric characters,
1171+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1172+
'@'
1173+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
11661174
value:
11671175
description: |-
1168-
value is the value of the tag.
1176+
value sets the value of the AWS resource tag key-value pair. Value is required when defining an AWS resource tag.
1177+
Value should consist of between 1 and 256 characters, and may
1178+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
11691179
Some AWS service do not support empty values. Since tags are added to resources in many services, the
11701180
length of the tag value must meet the requirements of all services.
11711181
maxLength: 256
11721182
minLength: 1
1173-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
11741183
type: string
1184+
x-kubernetes-validations:
1185+
- message: invalid AWS resource tag value. The string
1186+
can contain only the set of alphanumeric characters,
1187+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1188+
'@'
1189+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
11751190
required:
11761191
- key
11771192
- value

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,20 +1255,35 @@ spec:
12551255
created for the cluster.
12561256
properties:
12571257
key:
1258-
description: key is the key of the tag
1258+
description: |-
1259+
key sets the key of the AWS resource tag key-value pair. Key is required when defining an AWS resource tag.
1260+
Key should consist of between 1 and 128 characters, and may
1261+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
12591262
maxLength: 128
12601263
minLength: 1
1261-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
12621264
type: string
1265+
x-kubernetes-validations:
1266+
- message: invalid AWS resource tag key. The string
1267+
can contain only the set of alphanumeric characters,
1268+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1269+
'@'
1270+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
12631271
value:
12641272
description: |-
1265-
value is the value of the tag.
1273+
value sets the value of the AWS resource tag key-value pair. Value is required when defining an AWS resource tag.
1274+
Value should consist of between 1 and 256 characters, and may
1275+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
12661276
Some AWS service do not support empty values. Since tags are added to resources in many services, the
12671277
length of the tag value must meet the requirements of all services.
12681278
maxLength: 256
12691279
minLength: 1
1270-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
12711280
type: string
1281+
x-kubernetes-validations:
1282+
- message: invalid AWS resource tag value. The string
1283+
can contain only the set of alphanumeric characters,
1284+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1285+
'@'
1286+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
12721287
required:
12731288
- key
12741289
- value

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,20 +1151,35 @@ spec:
11511151
created for the cluster.
11521152
properties:
11531153
key:
1154-
description: key is the key of the tag
1154+
description: |-
1155+
key sets the key of the AWS resource tag key-value pair. Key is required when defining an AWS resource tag.
1156+
Key should consist of between 1 and 128 characters, and may
1157+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
11551158
maxLength: 128
11561159
minLength: 1
1157-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
11581160
type: string
1161+
x-kubernetes-validations:
1162+
- message: invalid AWS resource tag key. The string
1163+
can contain only the set of alphanumeric characters,
1164+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1165+
'@'
1166+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
11591167
value:
11601168
description: |-
1161-
value is the value of the tag.
1169+
value sets the value of the AWS resource tag key-value pair. Value is required when defining an AWS resource tag.
1170+
Value should consist of between 1 and 256 characters, and may
1171+
contain only the set of alphanumeric characters, space (' '), '_', '.', '/', '=', '+', '-', ':', and '@'.
11621172
Some AWS service do not support empty values. Since tags are added to resources in many services, the
11631173
length of the tag value must meet the requirements of all services.
11641174
maxLength: 256
11651175
minLength: 1
1166-
pattern: ^[0-9A-Za-z_.:/=+-@]+$
11671176
type: string
1177+
x-kubernetes-validations:
1178+
- message: invalid AWS resource tag value. The string
1179+
can contain only the set of alphanumeric characters,
1180+
space (' '), '_', '.', '/', '=', '+', '-', ':',
1181+
'@'
1182+
rule: self.matches('^[0-9A-Za-z_.:/=+-@ ]+$')
11681183
required:
11691184
- key
11701185
- value

0 commit comments

Comments
 (0)