Skip to content

Commit

Permalink
Update to ACK runtime v0.30.0, code-generator v0.30.0 (#71)
Browse files Browse the repository at this point in the history
### 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.
  • Loading branch information
ack-bot authored Feb 14, 2024
1 parent 8df229c commit 7b996f8
Show file tree
Hide file tree
Showing 22 changed files with 598 additions and 505 deletions.
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-01-29T07:03:57Z"
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
go_version: go1.21.5
version: v0.29.2
build_date: "2024-02-14T04:08:54Z"
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
go_version: go1.22.0
version: v0.30.0
api_directory_checksum: 4f7fb701a99ba2779fc1f32a9038e16d190b07ff
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
Expand Down
7 changes: 4 additions & 3 deletions apis/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/mq-controller
newTag: 0.0.30
newTag: 0.0.31
129 changes: 75 additions & 54 deletions config/crd/bases/mq.services.k8s.aws_brokers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: brokers.mq.services.k8s.aws
spec:
group: mq.services.k8s.aws
Expand All @@ -21,14 +20,19 @@ spec:
description: Broker is the Schema for the Brokers API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -40,8 +44,11 @@ spec:
autoMinorVersionUpgrade:
type: boolean
configuration:
description: "A list of information about the configuration. \n Does
not apply to RabbitMQ brokers."
description: |-
A list of information about the configuration.
Does not apply to RabbitMQ brokers.
properties:
id:
type: string
Expand All @@ -54,8 +61,11 @@ spec:
deploymentMode:
type: string
encryptionOptions:
description: "Does not apply to RabbitMQ brokers. \n Encryption options
for the broker."
description: |-
Does not apply to RabbitMQ brokers.
Encryption options for the broker.
properties:
kmsKeyID:
type: string
Expand All @@ -69,9 +79,12 @@ spec:
hostInstanceType:
type: string
ldapServerMetadata:
description: "Optional. The metadata of the LDAP server used to authenticate
and authorize connections to the broker. \n Does not apply to RabbitMQ
brokers."
description: |-
Optional. The metadata of the LDAP server used to authenticate and authorize
connections to the broker.
Does not apply to RabbitMQ brokers.
properties:
hosts:
items:
Expand Down Expand Up @@ -108,8 +121,9 @@ spec:
type: boolean
type: object
maintenanceWindowStartTime:
description: The scheduled time period relative to UTC during which
Amazon MQ begins to apply pending updates or patches to the broker.
description: |-
The scheduled time period relative to UTC during which Amazon MQ begins to
apply pending updates or patches to the broker.
properties:
dayOfWeek:
type: string
Expand All @@ -125,13 +139,14 @@ spec:
securityGroupRefs:
items:
description: "AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference type to provide more user friendly syntax
for references using 'from' field Ex: APIIDRef: \n from: name:
my-api"
*AWSResourceReference\ntype to provide more user friendly syntax
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
\ name: my-api"
properties:
from:
description: AWSResourceReference provides all the values necessary
to reference another k8s resource for finding the identifier(Id/ARN/Name)
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
Expand All @@ -151,13 +166,14 @@ spec:
subnetRefs:
items:
description: "AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference type to provide more user friendly syntax
for references using 'from' field Ex: APIIDRef: \n from: name:
my-api"
*AWSResourceReference\ntype to provide more user friendly syntax
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
\ name: my-api"
properties:
from:
description: AWSResourceReference provides all the values necessary
to reference another k8s resource for finding the identifier(Id/ARN/Name)
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
Expand All @@ -170,11 +186,11 @@ spec:
type: object
users:
items:
description: A user associated with the broker. For RabbitMQ brokers,
one and only one administrative user is accepted and created when
a broker is first provisioned. All subsequent broker users are
created by making RabbitMQ API calls directly to brokers or via
the RabbitMQ web console.
description: |-
A user associated with the broker. For RabbitMQ brokers, one and only one
administrative user is accepted and created when a broker is first provisioned.
All subsequent broker users are created by making RabbitMQ API calls directly
to brokers or via the RabbitMQ web console.
properties:
consoleAccess:
type: boolean
Expand All @@ -183,8 +199,9 @@ spec:
type: string
type: array
password:
description: SecretKeyReference combines a k8s corev1.SecretReference
with a specific key within the referred-to Secret
description: |-
SecretKeyReference combines a k8s corev1.SecretReference with a
specific key within the referred-to Secret
properties:
key:
description: Key is the key within the secret
Expand Down Expand Up @@ -219,24 +236,26 @@ spec:
description: BrokerStatus defines the observed state of Broker
properties:
ackResourceMetadata:
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
member that is used to contain resource sync state, account ownership,
description: |-
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
that is used to contain resource sync state, account ownership,
constructed ARN for the resource
properties:
arn:
description: 'ARN is the Amazon Resource Name for the resource.
This is a globally-unique identifier and is set only by the
ACK service controller once the controller has orchestrated
the creation of the resource OR when it has verified that an
"adopted" resource (a resource where the ARN annotation was
set by the Kubernetes user on the CR) exists and matches the
supplied CR''s Spec field values. TODO(vijat@): Find a better
strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270'
description: |-
ARN is the Amazon Resource Name for the resource. This is a
globally-unique identifier and is set only by the ACK service controller
once the controller has orchestrated the creation of the resource OR
when it has verified that an "adopted" resource (a resource where the
ARN annotation was set by the Kubernetes user on the CR) exists and
matches the supplied CR's Spec field values.
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
https://github.com/aws/aws-controllers-k8s/issues/270
type: string
ownerAccountID:
description: OwnerAccountID is the AWS Account ID of the account
that owns the backend AWS service API resource.
description: |-
OwnerAccountID is the AWS Account ID of the account that owns the
backend AWS service API resource.
type: string
region:
description: Region is the AWS region in which the resource exists
Expand Down Expand Up @@ -265,14 +284,16 @@ spec:
brokerState:
type: string
conditions:
description: All CRS managed by ACK have a common `Status.Conditions`
member that contains a collection of `ackv1alpha1.Condition` objects
that describe the various terminal states of the CR and its backend
AWS service API resource
description: |-
All CRS managed by ACK have a common `Status.Conditions` member that
contains a collection of `ackv1alpha1.Condition` objects that describe
the various terminal states of the CR and its backend AWS service API
resource
items:
description: Condition is the common struct used by all CRDs managed
by ACK service controllers to indicate terminal states of the
CR and its backend AWS service API resource
description: |-
Condition is the common struct used by all CRDs managed by ACK service
controllers to indicate terminal states of the CR and its backend AWS
service API resource
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
Expand Down
Loading

0 comments on commit 7b996f8

Please sign in to comment.