Skip to content

Commit 7096ae9

Browse files
committed
Merge branch 'main' into elasticache-add-GlobalReplicationGroup
2 parents 123c5c8 + 2b606f4 commit 7096ae9

20 files changed

+27
-166
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2025-08-27T23:22:35Z"
2+
build_date: "2025-08-28T20:28:18Z"
33
build_hash: 1045a5e99038b11b0630ca2f2f69c3bae4bedba6
44
go_version: go1.25.0
55
version: v0.51.0-1-g1045a5e
6-
api_directory_checksum: 56b9a489a72e4cc8e1d7fe3648fbfa515ab180d6
6+
api_directory_checksum: 6bee70e53dd51507425f6efd44560aa797d6e170
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.32.6
99
generator_config_info:
10-
file_checksum: 8fe61e100e579320fd6d57d443a30682011b3b8f
10+
file_checksum: 90c9c43f870e2a80c20722ef37819874bdcdfb3b
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/generator.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ resources:
7979
template_path: hooks/cache_cluster/sdk_create_post_set_output.go.tpl
8080
sdk_delete_pre_build_request:
8181
template_path: hooks/cache_cluster/sdk_delete_pre_build_request.go.tpl
82+
sdk_read_many_post_build_request:
83+
template_path: hooks/cache_cluster/sdk_read_many_post_build_request.go.tpl
8284
sdk_read_many_post_set_output:
8385
template_path: hooks/cache_cluster/sdk_read_many_post_set_output.go.tpl
8486
sdk_update_pre_build_request:
@@ -127,10 +129,6 @@ resources:
127129
references:
128130
resource: ReplicationGroup
129131
path: Spec.ReplicationGroupID
130-
Tags:
131-
from:
132-
operation: ListTagsForResource
133-
path: TagList
134132
exceptions:
135133
errors:
136134
404:
@@ -140,13 +138,8 @@ resources:
140138
- InvalidParameterValueException
141139
- InvalidGlobalReplicationGroupStateFault
142140
- ServiceLinkedRoleNotFoundFault
143-
hooks:
144-
sdk_create_post_set_output:
145-
template_path: hooks/global_replication_group/sdk_create_post_set_output.go.tpl
146-
sdk_update_pre_build_request:
147-
template_path: hooks/global_replication_group/sdk_update_pre_build_request.go.tpl
148-
sdk_read_one_post_set_output:
149-
template_path: hooks/global_replication_group/sdk_read_one_post_set_output.go.tpl
141+
tags:
142+
ignore: true
150143
ReplicationGroup:
151144
exceptions:
152145
terminal_codes:

apis/v1alpha1/global_replication_group.go

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

apis/v1alpha1/zz_generated.deepcopy.go

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

config/crd/bases/elasticache.services.k8s.aws_globalreplicationgroups.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,6 @@ spec:
9292
type: string
9393
type: object
9494
type: object
95-
tags:
96-
description: A list of tags as key-value pairs.
97-
items:
98-
description: |-
99-
A tag that can be added to an ElastiCache cluster or replication group. Tags
100-
are composed of a Key/Value pair. You can use tags to categorize and track
101-
all your ElastiCache resources, with the exception of global replication
102-
group. When you add or remove tags on replication groups, those actions will
103-
be replicated to all nodes in the replication group. A tag with a null Value
104-
is permitted.
105-
properties:
106-
key:
107-
type: string
108-
value:
109-
type: string
110-
type: object
111-
type: array
11295
required:
11396
- globalReplicationGroupIDSuffix
11497
type: object

generator.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ resources:
7979
template_path: hooks/cache_cluster/sdk_create_post_set_output.go.tpl
8080
sdk_delete_pre_build_request:
8181
template_path: hooks/cache_cluster/sdk_delete_pre_build_request.go.tpl
82+
sdk_read_many_post_build_request:
83+
template_path: hooks/cache_cluster/sdk_read_many_post_build_request.go.tpl
8284
sdk_read_many_post_set_output:
8385
template_path: hooks/cache_cluster/sdk_read_many_post_set_output.go.tpl
8486
sdk_update_pre_build_request:
@@ -127,10 +129,6 @@ resources:
127129
references:
128130
resource: ReplicationGroup
129131
path: Spec.ReplicationGroupID
130-
Tags:
131-
from:
132-
operation: ListTagsForResource
133-
path: TagList
134132
exceptions:
135133
errors:
136134
404:
@@ -140,13 +138,8 @@ resources:
140138
- InvalidParameterValueException
141139
- InvalidGlobalReplicationGroupStateFault
142140
- ServiceLinkedRoleNotFoundFault
143-
hooks:
144-
sdk_create_post_set_output:
145-
template_path: hooks/global_replication_group/sdk_create_post_set_output.go.tpl
146-
sdk_update_pre_build_request:
147-
template_path: hooks/global_replication_group/sdk_update_pre_build_request.go.tpl
148-
sdk_read_one_post_set_output:
149-
template_path: hooks/global_replication_group/sdk_read_one_post_set_output.go.tpl
141+
tags:
142+
ignore: true
150143
ReplicationGroup:
151144
exceptions:
152145
terminal_codes:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.24.1
66

77
require (
88
github.com/aws-controllers-k8s/ec2-controller v1.0.7
9-
github.com/aws-controllers-k8s/runtime v0.50.0
9+
github.com/aws-controllers-k8s/runtime v0.51.0
1010
github.com/aws-controllers-k8s/sns-controller v1.0.11
1111
github.com/aws/aws-sdk-go v1.49.0
1212
github.com/aws/aws-sdk-go-v2 v1.36.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/aws-controllers-k8s/ec2-controller v1.0.7 h1:7MDu2bq8NFKbgzzgHYPFRT7bf+SmTchgWuq8ixKK0Jc=
22
github.com/aws-controllers-k8s/ec2-controller v1.0.7/go.mod h1:PvsQehgncHgcu9FiY13M45+GkVsKI98g7G83SrgH7vY=
3-
github.com/aws-controllers-k8s/runtime v0.50.0 h1:6BXOBdnb+xw6uSMEDeALhTKc4veZR9NfXIsl5QJKZ8k=
4-
github.com/aws-controllers-k8s/runtime v0.50.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
3+
github.com/aws-controllers-k8s/runtime v0.51.0 h1:ZKu1DXPG7+CsvbEPLMCGqWFdfK37kSbceLzYf9lRZbw=
4+
github.com/aws-controllers-k8s/runtime v0.51.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
55
github.com/aws-controllers-k8s/sns-controller v1.0.11 h1:nnkywTHzO64y7RrrfoPNyYf1TOkkQHtlg+S0jEPKUZ8=
66
github.com/aws-controllers-k8s/sns-controller v1.0.11/go.mod h1:ODQIDZR3hHQqcyif4UXVFQfEzTaWU1jqFtVr83K2p9M=
77
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=

helm/crds/elasticache.services.k8s.aws_globalreplicationgroups.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,6 @@ spec:
9292
type: string
9393
type: object
9494
type: object
95-
tags:
96-
description: A list of tags as key-value pairs.
97-
items:
98-
description: |-
99-
A tag that can be added to an ElastiCache cluster or replication group. Tags
100-
are composed of a Key/Value pair. You can use tags to categorize and track
101-
all your ElastiCache resources, with the exception of global replication
102-
group. When you add or remove tags on replication groups, those actions will
103-
be replicated to all nodes in the replication group. A tag with a null Value
104-
is permitted.
105-
properties:
106-
key:
107-
type: string
108-
value:
109-
type: string
110-
type: object
111-
type: array
11295
required:
11396
- globalReplicationGroupIDSuffix
11497
type: object

pkg/resource/cache_cluster/hooks.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ const (
4545
var (
4646
condMsgCurrentlyDeleting = "CacheCluster is currently being deleted"
4747
condMsgNoDeleteWhileModifying = "Cannot delete CacheCluster while it is being modified"
48-
condMsgCurrentlyUpdating = "CacheCluster is currently being updated"
4948
)
5049

5150
var (

0 commit comments

Comments
 (0)