Skip to content

Commit 73dc3c2

Browse files
authored
rename Domain.DomainName and Domain.TagList (#13)
Renames Domain.DomainName to Domain.Name and Domain.TagList to Domain.Tags to align the opensearchservice controller with other ACK controllers and CRDs. NOTE: This is a backwards-incompatible API change but I figure this would be better to do early on in preview now than later... Signed-off-by: Jay Pipes <[email protected]> By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent f5125c9 commit 73dc3c2

13 files changed

+83
-59
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ api_directory_checksum: 6f3ca5de4e5a1ac8cb5366ab502f7c73c8d5c88f
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.0
99
generator_config_info:
10-
file_checksum: 387dff40ea37afcdbb465ca305c08d320e2558f4
10+
file_checksum: bd3133286f996b9a993aee42d06c278d88c24b2e
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/domain.go

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

apis/v1alpha1/generator.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ ignore:
99
- CreateDomainInput.SnapshotOptions
1010
resources:
1111
Domain:
12+
renames:
13+
operations:
14+
CreateDomain:
15+
input_fields:
16+
DomainName: Name
17+
TagList: Tags
18+
DeleteDomain:
19+
input_fields:
20+
DomainName: Name
21+
DescribeDomain:
22+
input_fields:
23+
DomainName: Name
1224
reconcile:
1325
# Doing this because it takes a LONG time for the Domain's
1426
# endpoint/endpoints field to be populated, even after the Domain's

apis/v1alpha1/zz_generated.deepcopy.go

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

config/crd/bases/opensearchservice.services.k8s.aws_domains.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,6 @@ spec:
225225
tlsSecurityPolicy:
226226
type: string
227227
type: object
228-
domainName:
229-
description: 'The name of the Amazon OpenSearch Service domain you''re
230-
creating. Domain names are unique across the domains owned by an
231-
account within an AWS region. Domain names must start with a lowercase
232-
letter and can contain the following characters: a-z (lowercase),
233-
0-9, and - (hyphen).'
234-
type: string
235228
ebsOptions:
236229
description: Options to enable, disable, and specify the type and
237230
size of EBS storage volumes.
@@ -283,13 +276,20 @@ spec:
283276
description: Map of LogType and LogPublishingOption, each containing
284277
options to publish a given type of OpenSearch log.
285278
type: object
279+
name:
280+
description: 'The name of the Amazon OpenSearch Service domain you''re
281+
creating. Domain names are unique across the domains owned by an
282+
account within an AWS region. Domain names must start with a lowercase
283+
letter and can contain the following characters: a-z (lowercase),
284+
0-9, and - (hyphen).'
285+
type: string
286286
nodeToNodeEncryptionOptions:
287287
description: Node-to-node encryption options.
288288
properties:
289289
enabled:
290290
type: boolean
291291
type: object
292-
tagList:
292+
tags:
293293
description: A list of Tag added during domain creation.
294294
items:
295295
description: A key value pair for a resource tag.
@@ -321,7 +321,7 @@ spec:
321321
type: array
322322
type: object
323323
required:
324-
- domainName
324+
- name
325325
type: object
326326
status:
327327
description: DomainStatus defines the observed state of Domain

generator.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ ignore:
99
- CreateDomainInput.SnapshotOptions
1010
resources:
1111
Domain:
12+
renames:
13+
operations:
14+
CreateDomain:
15+
input_fields:
16+
DomainName: Name
17+
TagList: Tags
18+
DeleteDomain:
19+
input_fields:
20+
DomainName: Name
21+
DescribeDomain:
22+
input_fields:
23+
DomainName: Name
1224
reconcile:
1325
# Doing this because it takes a LONG time for the Domain's
1426
# endpoint/endpoints field to be populated, even after the Domain's

helm/crds/opensearchservice.services.k8s.aws_domains.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,6 @@ spec:
225225
tlsSecurityPolicy:
226226
type: string
227227
type: object
228-
domainName:
229-
description: 'The name of the Amazon OpenSearch Service domain you''re
230-
creating. Domain names are unique across the domains owned by an
231-
account within an AWS region. Domain names must start with a lowercase
232-
letter and can contain the following characters: a-z (lowercase),
233-
0-9, and - (hyphen).'
234-
type: string
235228
ebsOptions:
236229
description: Options to enable, disable, and specify the type and
237230
size of EBS storage volumes.
@@ -283,13 +276,20 @@ spec:
283276
description: Map of LogType and LogPublishingOption, each containing
284277
options to publish a given type of OpenSearch log.
285278
type: object
279+
name:
280+
description: 'The name of the Amazon OpenSearch Service domain you''re
281+
creating. Domain names are unique across the domains owned by an
282+
account within an AWS region. Domain names must start with a lowercase
283+
letter and can contain the following characters: a-z (lowercase),
284+
0-9, and - (hyphen).'
285+
type: string
286286
nodeToNodeEncryptionOptions:
287287
description: Node-to-node encryption options.
288288
properties:
289289
enabled:
290290
type: boolean
291291
type: object
292-
tagList:
292+
tags:
293293
description: A list of Tag added during domain creation.
294294
items:
295295
description: A key value pair for a resource tag.
@@ -321,7 +321,7 @@ spec:
321321
type: array
322322
type: object
323323
required:
324-
- domainName
324+
- name
325325
type: object
326326
status:
327327
description: DomainStatus defines the observed state of Domain

pkg/resource/domain/delta.go

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

pkg/resource/domain/resource.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/domain/sdk.go

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

0 commit comments

Comments
 (0)