Skip to content

Commit

Permalink
Update to ACK runtime v0.30.0, code-generator v0.30.0 (#68)
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 `v1.0.9` to `v1.0.10`

Once this PR is merged, release `v1.0.10` will be automatically created for `kms-controller`

**Please close this PR, if you do not want the new patch release for `kms-controller`**

----------

#### stdout for `make build-controller`:

```
building ack-generate ... ok.
==== building kms-controller ====
Copying common custom resource definitions into kms
Building Kubernetes API objects for kms
Generating deepcopy code for kms
Generating custom resource definitions for kms
Building service controller for kms
Generating RBAC manifests for kms
Running gofmt against generated code for kms
Updating additional GitHub repository maintenance files
==== building kms-controller release artifacts ====
Building release artifacts for kms-v1.0.10
Generating common custom resource definitions
Generating custom resource definitions for kms
Generating RBAC manifests for kms
```

----------

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 f57a69f commit 86cc99c
Show file tree
Hide file tree
Showing 26 changed files with 1,673 additions and 1,206 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:10:33Z"
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
go_version: go1.21.5
version: v0.29.2
build_date: "2024-02-14T04:09:28Z"
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
go_version: go1.22.0
version: v0.30.0
api_directory_checksum: 70eb6bda460cfa4eda159f3e887696468dabf7a2
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/kms-controller
newTag: 1.0.9
newTag: 1.0.10
126 changes: 77 additions & 49 deletions config/crd/bases/kms.services.k8s.aws_aliases.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: aliases.kms.services.k8s.aws
spec:
group: kms.services.k8s.aws
Expand All @@ -21,49 +20,74 @@ spec:
description: Alias is the Schema for the Aliases 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
spec:
description: AliasSpec defines the desired state of Alias.
properties:
name:
description: "Specifies the alias name. This value must begin with
alias/ followed by a name, such as alias/ExampleAlias. \n The AliasName
value must be string of 1-256 characters. It can contain only alphanumeric
characters, forward slashes (/), underscores (_), and dashes (-).
The alias name cannot begin with alias/aws/. The alias/aws/ prefix
is reserved for Amazon Web Services managed keys (https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk)."
description: |-
Specifies the alias name. This value must begin with alias/ followed by a
name, such as alias/ExampleAlias.
The AliasName value must be string of 1-256 characters. It can contain only
alphanumeric characters, forward slashes (/), underscores (_), and dashes
(-). The alias name cannot begin with alias/aws/. The alias/aws/ prefix is
reserved for Amazon Web Services managed keys (https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk).
type: string
targetKeyID:
description: "Associates the alias with the specified customer managed
key (https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#customer-cmk).
The KMS key must be in the same Amazon Web Services Region. \n A
valid key ID is required. If you supply a null or empty string value,
this operation returns an error. \n For help finding the key ID
and ARN, see Finding the Key ID and ARN (https://docs.aws.amazon.com/kms/latest/developerguide/viewing-keys.html#find-cmk-id-arn)
in the Key Management Service Developer Guide . \n Specify the key
ID or key ARN of the KMS key. \n For example: \n * Key ID: 1234abcd-12ab-34cd-56ef-1234567890ab
\n * Key ARN: arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab
\n To get the key ID and key ARN for a KMS key, use ListKeys or
DescribeKey."
description: |-
Associates the alias with the specified customer managed key (https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#customer-cmk).
The KMS key must be in the same Amazon Web Services Region.
A valid key ID is required. If you supply a null or empty string value, this
operation returns an error.
For help finding the key ID and ARN, see Finding the Key ID and ARN (https://docs.aws.amazon.com/kms/latest/developerguide/viewing-keys.html#find-cmk-id-arn)
in the Key Management Service Developer Guide .
Specify the key ID or key ARN of the KMS key.
For example:
* Key ID: 1234abcd-12ab-34cd-56ef-1234567890ab
* Key ARN: arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab
To get the key ID and key ARN for a KMS key, use ListKeys or DescribeKey.
type: string
targetKeyRef:
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 @@ -76,24 +100,26 @@ spec:
description: AliasStatus defines the observed state of Alias
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 All @@ -104,14 +130,16 @@ spec:
- region
type: object
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 86cc99c

Please sign in to comment.