Skip to content

Commit 268cd65

Browse files
committed
config: add aws usertags to infrastructure
Add a new field userTags to `.status.aws` of the infrastructure.config.openshift.io type. Tags included in the userTags field will be applied to new resources created for the cluster. https://issues.redhat.com/browse/CORS-1657
1 parent a99ffa1 commit 268cd65

File tree

4 files changed

+59
-0
lines changed

4 files changed

+59
-0
lines changed

config/v1/0000_10_config-operator_01_infrastructure.crd.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,21 @@ spec:
271271
empty.
272272
type: string
273273
pattern: ^https://
274+
userTags:
275+
description: userTags is a list of additional tags to apply
276+
to AWS resources created for the cluster.
277+
type: array
278+
items:
279+
description: AWSUserTag is a tag to apply to AWS resources
280+
created for the cluster.
281+
type: object
282+
properties:
283+
key:
284+
description: key is the key of the tag
285+
type: string
286+
value:
287+
description: value is the value of the tag
288+
type: string
274289
azure:
275290
description: Azure contains settings specific to the Azure infrastructure
276291
provider.

config/v1/types_infrastructure.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,18 @@ type AWSPlatformStatus struct {
313313
// There must be only one ServiceEndpoint for a service.
314314
// +optional
315315
ServiceEndpoints []AWSServiceEndpoint `json:"serviceEndpoints,omitempty"`
316+
317+
// userTags is a list of additional tags to apply to AWS resources created for the cluster.
318+
// +optional
319+
UserTags []AWSUserTag `json:"userTags,omitempty"`
320+
}
321+
322+
// AWSUserTag is a tag to apply to AWS resources created for the cluster.
323+
type AWSUserTag struct {
324+
// key is the key of the tag
325+
Key string `json:"key"`
326+
// value is the value of the tag
327+
Value string `json:"value"`
316328
}
317329

318330
// AzurePlatformSpec holds the desired state of the Azure infrastructure provider.

config/v1/zz_generated.deepcopy.go

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/v1/zz_generated.swagger_doc_generated.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)