Skip to content

Commit 63b9491

Browse files
authored
Update to ACK runtime v0.34.0, code-generator v0.34.0 (#135)
### Update to ACK runtime `v0.34.0`, code-generator `v0.34.0` ---------- * ACK code-generator `v0.34.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.34.0) * ACK runtime `v0.34.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.34.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.29` to `v0.0.30` Once this PR is merged, release `v0.0.30` will be automatically created for `elasticache-controller` **Please close this PR, if you do not want the new patch release for `elasticache-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building elasticache-controller ==== Copying common custom resource definitions into elasticache Building Kubernetes API objects for elasticache Generating deepcopy code for elasticache Generating custom resource definitions for elasticache Building service controller for elasticache Generating RBAC manifests for elasticache Running gofmt against generated code for elasticache Updating additional GitHub repository maintenance files ==== building elasticache-controller release artifacts ==== Building release artifacts for elasticache-v0.0.30 Generating common custom resource definitions Generating custom resource definitions for elasticache Generating RBAC manifests for elasticache ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 819f218 commit 63b9491

35 files changed

+2425
-1656
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-01-29T07:10:55Z"
3-
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
4-
go_version: go1.21.5
5-
version: v0.29.2
2+
build_date: "2024-05-02T20:54:33Z"
3+
build_hash: 14cef51778d471698018b6c38b604181a6948248
4+
go_version: go1.22.0
5+
version: v0.34.0
66
api_directory_checksum: bd34f72147706f1dbc990acf4a6c4f6615c1bddb
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

apis/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/controller/main.go

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ spec:
3939
- --enable-leader-election=$(ENABLE_LEADER_ELECTION)
4040
- --leader-election-namespace
4141
- "$(LEADER_ELECTION_NAMESPACE)"
42+
- --reconcile-default-max-concurrent-syncs
43+
- "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
4244
image: controller:latest
4345
name: controller
4446
ports:
@@ -72,13 +74,27 @@ spec:
7274
value: "false"
7375
- name: LEADER_ELECTION_NAMESPACE
7476
value: "ack-system"
77+
- name: "RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS"
78+
value: "1"
7579
securityContext:
7680
allowPrivilegeEscalation: false
7781
privileged: false
7882
runAsNonRoot: true
7983
capabilities:
8084
drop:
8185
- ALL
86+
livenessProbe:
87+
httpGet:
88+
path: /healthz
89+
port: 8081
90+
initialDelaySeconds: 15
91+
periodSeconds: 20
92+
readinessProbe:
93+
httpGet:
94+
path: /readyz
95+
port: 8081
96+
initialDelaySeconds: 5
97+
periodSeconds: 10
8298
securityContext:
8399
seccompProfile:
84100
type: RuntimeDefault

config/controller/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/elasticache-controller
9-
newTag: 0.0.29
9+
newTag: 0.0.30

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

+71-54
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: cacheparametergroups.elasticache.services.k8s.aws
98
spec:
109
group: elasticache.services.k8s.aws
@@ -22,26 +21,37 @@ spec:
2221
API
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object
3640
spec:
37-
description: "CacheParameterGroupSpec defines the desired state of CacheParameterGroup.
38-
\n Represents the output of a CreateCacheParameterGroup operation."
41+
description: |-
42+
CacheParameterGroupSpec defines the desired state of CacheParameterGroup.
43+
44+
45+
Represents the output of a CreateCacheParameterGroup operation.
3946
properties:
4047
cacheParameterGroupFamily:
41-
description: "The name of the cache parameter group family that the
42-
cache parameter group can be used with. \n Valid values are: memcached1.4
43-
| memcached1.5 | memcached1.6 | redis2.6 | redis2.8 | redis3.2 |
44-
redis4.0 | redis5.0 | redis6.x"
48+
description: |-
49+
The name of the cache parameter group family that the cache parameter group
50+
can be used with.
51+
52+
53+
Valid values are: memcached1.4 | memcached1.5 | memcached1.6 | redis2.6 |
54+
redis2.8 | redis3.2 | redis4.0 | redis5.0 | redis6.x
4555
type: string
4656
cacheParameterGroupName:
4757
description: A user-specified name for the cache parameter group.
@@ -51,10 +61,10 @@ spec:
5161
group.
5262
type: string
5363
parameterNameValues:
54-
description: An array of parameter names and values for the parameter
55-
update. You must supply at least one parameter name and value; subsequent
56-
arguments are optional. A maximum of 20 parameters may be modified
57-
per request.
64+
description: |-
65+
An array of parameter names and values for the parameter update. You must
66+
supply at least one parameter name and value; subsequent arguments are optional.
67+
A maximum of 20 parameters may be modified per request.
5868
items:
5969
description: Describes a name-value pair that is used to update
6070
the value of a parameter.
@@ -66,16 +76,16 @@ spec:
6676
type: object
6777
type: array
6878
tags:
69-
description: A list of tags to be added to this resource. A tag is
70-
a key-value pair. A tag key must be accompanied by a tag value,
71-
although null is accepted.
79+
description: |-
80+
A list of tags to be added to this resource. A tag is a key-value pair. A
81+
tag key must be accompanied by a tag value, although null is accepted.
7282
items:
73-
description: A tag that can be added to an ElastiCache cluster or
74-
replication group. Tags are composed of a Key/Value pair. You
75-
can use tags to categorize and track all your ElastiCache resources,
76-
with the exception of global replication group. When you add or
77-
remove tags on replication groups, those actions will be replicated
78-
to all nodes in the replication group. A tag with a null Value
83+
description: |-
84+
A tag that can be added to an ElastiCache cluster or replication group. Tags
85+
are composed of a Key/Value pair. You can use tags to categorize and track
86+
all your ElastiCache resources, with the exception of global replication
87+
group. When you add or remove tags on replication groups, those actions will
88+
be replicated to all nodes in the replication group. A tag with a null Value
7989
is permitted.
8090
properties:
8191
key:
@@ -93,24 +103,26 @@ spec:
93103
description: CacheParameterGroupStatus defines the observed state of CacheParameterGroup
94104
properties:
95105
ackResourceMetadata:
96-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
97-
member that is used to contain resource sync state, account ownership,
106+
description: |-
107+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
108+
that is used to contain resource sync state, account ownership,
98109
constructed ARN for the resource
99110
properties:
100111
arn:
101-
description: 'ARN is the Amazon Resource Name for the resource.
102-
This is a globally-unique identifier and is set only by the
103-
ACK service controller once the controller has orchestrated
104-
the creation of the resource OR when it has verified that an
105-
"adopted" resource (a resource where the ARN annotation was
106-
set by the Kubernetes user on the CR) exists and matches the
107-
supplied CR''s Spec field values. TODO(vijat@): Find a better
108-
strategy for resources that do not have ARN in CreateOutputResponse
109-
https://github.com/aws/aws-controllers-k8s/issues/270'
112+
description: |-
113+
ARN is the Amazon Resource Name for the resource. This is a
114+
globally-unique identifier and is set only by the ACK service controller
115+
once the controller has orchestrated the creation of the resource OR
116+
when it has verified that an "adopted" resource (a resource where the
117+
ARN annotation was set by the Kubernetes user on the CR) exists and
118+
matches the supplied CR's Spec field values.
119+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
120+
https://github.com/aws/aws-controllers-k8s/issues/270
110121
type: string
111122
ownerAccountID:
112-
description: OwnerAccountID is the AWS Account ID of the account
113-
that owns the backend AWS service API resource.
123+
description: |-
124+
OwnerAccountID is the AWS Account ID of the account that owns the
125+
backend AWS service API resource.
114126
type: string
115127
region:
116128
description: Region is the AWS region in which the resource exists
@@ -121,14 +133,16 @@ spec:
121133
- region
122134
type: object
123135
conditions:
124-
description: All CRS managed by ACK have a common `Status.Conditions`
125-
member that contains a collection of `ackv1alpha1.Condition` objects
126-
that describe the various terminal states of the CR and its backend
127-
AWS service API resource
136+
description: |-
137+
All CRS managed by ACK have a common `Status.Conditions` member that
138+
contains a collection of `ackv1alpha1.Condition` objects that describe
139+
the various terminal states of the CR and its backend AWS service API
140+
resource
128141
items:
129-
description: Condition is the common struct used by all CRDs managed
130-
by ACK service controllers to indicate terminal states of the
131-
CR and its backend AWS service API resource
142+
description: |-
143+
Condition is the common struct used by all CRDs managed by ACK service
144+
controllers to indicate terminal states of the CR and its backend AWS
145+
service API resource
132146
properties:
133147
lastTransitionTime:
134148
description: Last time the condition transitioned from one status
@@ -154,12 +168,14 @@ spec:
154168
type: object
155169
type: array
156170
events:
157-
description: A list of events. Each element in the list contains detailed
158-
information about one event.
171+
description: |-
172+
A list of events. Each element in the list contains detailed information
173+
about one event.
159174
items:
160-
description: Represents a single occurrence of something interesting
161-
within the system. Some examples of events are creating a cluster,
162-
adding or removing a cache node, or rebooting a node.
175+
description: |-
176+
Represents a single occurrence of something interesting within the system.
177+
Some examples of events are creating a cluster, adding or removing a cache
178+
node, or rebooting a node.
163179
properties:
164180
date:
165181
format: date-time
@@ -179,8 +195,9 @@ spec:
179195
parameters:
180196
description: A list of Parameter instances.
181197
items:
182-
description: Describes an individual setting that controls some
183-
aspect of ElastiCache behavior.
198+
description: |-
199+
Describes an individual setting that controls some aspect of ElastiCache
200+
behavior.
184201
properties:
185202
allowedValues:
186203
type: string

0 commit comments

Comments
 (0)