Skip to content

Commit 7b996f8

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

22 files changed

+598
-505
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-01-29T07:03:57Z"
3-
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
4-
go_version: go1.21.5
5-
version: v0.29.2
2+
build_date: "2024-02-14T04:08:54Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: 4f7fb701a99ba2779fc1f32a9038e16d190b07ff
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

apis/v1alpha1/zz_generated.deepcopy.go

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

config/controller/kustomization.yaml

Lines changed: 1 addition & 1 deletion
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/mq-controller
9-
newTag: 0.0.30
9+
newTag: 0.0.31

config/crd/bases/mq.services.k8s.aws_brokers.yaml

Lines changed: 75 additions & 54 deletions
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: brokers.mq.services.k8s.aws
98
spec:
109
group: mq.services.k8s.aws
@@ -21,14 +20,19 @@ spec:
2120
description: Broker is the Schema for the Brokers API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
@@ -40,8 +44,11 @@ spec:
4044
autoMinorVersionUpgrade:
4145
type: boolean
4246
configuration:
43-
description: "A list of information about the configuration. \n Does
44-
not apply to RabbitMQ brokers."
47+
description: |-
48+
A list of information about the configuration.
49+
50+
51+
Does not apply to RabbitMQ brokers.
4552
properties:
4653
id:
4754
type: string
@@ -54,8 +61,11 @@ spec:
5461
deploymentMode:
5562
type: string
5663
encryptionOptions:
57-
description: "Does not apply to RabbitMQ brokers. \n Encryption options
58-
for the broker."
64+
description: |-
65+
Does not apply to RabbitMQ brokers.
66+
67+
68+
Encryption options for the broker.
5969
properties:
6070
kmsKeyID:
6171
type: string
@@ -69,9 +79,12 @@ spec:
6979
hostInstanceType:
7080
type: string
7181
ldapServerMetadata:
72-
description: "Optional. The metadata of the LDAP server used to authenticate
73-
and authorize connections to the broker. \n Does not apply to RabbitMQ
74-
brokers."
82+
description: |-
83+
Optional. The metadata of the LDAP server used to authenticate and authorize
84+
connections to the broker.
85+
86+
87+
Does not apply to RabbitMQ brokers.
7588
properties:
7689
hosts:
7790
items:
@@ -108,8 +121,9 @@ spec:
108121
type: boolean
109122
type: object
110123
maintenanceWindowStartTime:
111-
description: The scheduled time period relative to UTC during which
112-
Amazon MQ begins to apply pending updates or patches to the broker.
124+
description: |-
125+
The scheduled time period relative to UTC during which Amazon MQ begins to
126+
apply pending updates or patches to the broker.
113127
properties:
114128
dayOfWeek:
115129
type: string
@@ -125,13 +139,14 @@ spec:
125139
securityGroupRefs:
126140
items:
127141
description: "AWSResourceReferenceWrapper provides a wrapper around
128-
*AWSResourceReference type to provide more user friendly syntax
129-
for references using 'from' field Ex: APIIDRef: \n from: name:
130-
my-api"
142+
*AWSResourceReference\ntype to provide more user friendly syntax
143+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
144+
\ name: my-api"
131145
properties:
132146
from:
133-
description: AWSResourceReference provides all the values necessary
134-
to reference another k8s resource for finding the identifier(Id/ARN/Name)
147+
description: |-
148+
AWSResourceReference provides all the values necessary to reference another
149+
k8s resource for finding the identifier(Id/ARN/Name)
135150
properties:
136151
name:
137152
type: string
@@ -151,13 +166,14 @@ spec:
151166
subnetRefs:
152167
items:
153168
description: "AWSResourceReferenceWrapper provides a wrapper around
154-
*AWSResourceReference type to provide more user friendly syntax
155-
for references using 'from' field Ex: APIIDRef: \n from: name:
156-
my-api"
169+
*AWSResourceReference\ntype to provide more user friendly syntax
170+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
171+
\ name: my-api"
157172
properties:
158173
from:
159-
description: AWSResourceReference provides all the values necessary
160-
to reference another k8s resource for finding the identifier(Id/ARN/Name)
174+
description: |-
175+
AWSResourceReference provides all the values necessary to reference another
176+
k8s resource for finding the identifier(Id/ARN/Name)
161177
properties:
162178
name:
163179
type: string
@@ -170,11 +186,11 @@ spec:
170186
type: object
171187
users:
172188
items:
173-
description: A user associated with the broker. For RabbitMQ brokers,
174-
one and only one administrative user is accepted and created when
175-
a broker is first provisioned. All subsequent broker users are
176-
created by making RabbitMQ API calls directly to brokers or via
177-
the RabbitMQ web console.
189+
description: |-
190+
A user associated with the broker. For RabbitMQ brokers, one and only one
191+
administrative user is accepted and created when a broker is first provisioned.
192+
All subsequent broker users are created by making RabbitMQ API calls directly
193+
to brokers or via the RabbitMQ web console.
178194
properties:
179195
consoleAccess:
180196
type: boolean
@@ -183,8 +199,9 @@ spec:
183199
type: string
184200
type: array
185201
password:
186-
description: SecretKeyReference combines a k8s corev1.SecretReference
187-
with a specific key within the referred-to Secret
202+
description: |-
203+
SecretKeyReference combines a k8s corev1.SecretReference with a
204+
specific key within the referred-to Secret
188205
properties:
189206
key:
190207
description: Key is the key within the secret
@@ -219,24 +236,26 @@ spec:
219236
description: BrokerStatus defines the observed state of Broker
220237
properties:
221238
ackResourceMetadata:
222-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
223-
member that is used to contain resource sync state, account ownership,
239+
description: |-
240+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
241+
that is used to contain resource sync state, account ownership,
224242
constructed ARN for the resource
225243
properties:
226244
arn:
227-
description: 'ARN is the Amazon Resource Name for the resource.
228-
This is a globally-unique identifier and is set only by the
229-
ACK service controller once the controller has orchestrated
230-
the creation of the resource OR when it has verified that an
231-
"adopted" resource (a resource where the ARN annotation was
232-
set by the Kubernetes user on the CR) exists and matches the
233-
supplied CR''s Spec field values. TODO(vijat@): Find a better
234-
strategy for resources that do not have ARN in CreateOutputResponse
235-
https://github.com/aws/aws-controllers-k8s/issues/270'
245+
description: |-
246+
ARN is the Amazon Resource Name for the resource. This is a
247+
globally-unique identifier and is set only by the ACK service controller
248+
once the controller has orchestrated the creation of the resource OR
249+
when it has verified that an "adopted" resource (a resource where the
250+
ARN annotation was set by the Kubernetes user on the CR) exists and
251+
matches the supplied CR's Spec field values.
252+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
253+
https://github.com/aws/aws-controllers-k8s/issues/270
236254
type: string
237255
ownerAccountID:
238-
description: OwnerAccountID is the AWS Account ID of the account
239-
that owns the backend AWS service API resource.
256+
description: |-
257+
OwnerAccountID is the AWS Account ID of the account that owns the
258+
backend AWS service API resource.
240259
type: string
241260
region:
242261
description: Region is the AWS region in which the resource exists
@@ -265,14 +284,16 @@ spec:
265284
brokerState:
266285
type: string
267286
conditions:
268-
description: All CRS managed by ACK have a common `Status.Conditions`
269-
member that contains a collection of `ackv1alpha1.Condition` objects
270-
that describe the various terminal states of the CR and its backend
271-
AWS service API resource
287+
description: |-
288+
All CRS managed by ACK have a common `Status.Conditions` member that
289+
contains a collection of `ackv1alpha1.Condition` objects that describe
290+
the various terminal states of the CR and its backend AWS service API
291+
resource
272292
items:
273-
description: Condition is the common struct used by all CRDs managed
274-
by ACK service controllers to indicate terminal states of the
275-
CR and its backend AWS service API resource
293+
description: |-
294+
Condition is the common struct used by all CRDs managed by ACK service
295+
controllers to indicate terminal states of the CR and its backend AWS
296+
service API resource
276297
properties:
277298
lastTransitionTime:
278299
description: Last time the condition transitioned from one status

0 commit comments

Comments
 (0)