Skip to content

Commit

Permalink
Update to ACK runtime v0.30.0, code-generator v0.30.0 (#22)
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.2` to `v0.0.3`

Once this PR is merged, release `v0.0.3` will be automatically created for `kafka-controller`

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

----------

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

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

----------

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 9e29f69 commit f2c6de1
Show file tree
Hide file tree
Showing 22 changed files with 568 additions and 490 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:00:48Z"
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
go_version: go1.21.5
version: v0.29.2
build_date: "2024-02-14T04:06:40Z"
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
go_version: go1.22.0
version: v0.30.0
api_directory_checksum: c8e83d87ead76e028002723c5d78f49d1d18c0c8
api_version: v1alpha1
aws_sdk_go_version: v1.44.158
Expand Down
10 changes: 6 additions & 4 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/kafka-controller
newTag: 0.0.2
newTag: 0.0.3
105 changes: 59 additions & 46 deletions config/crd/bases/kafka.services.k8s.aws_clusters.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: clusters.kafka.services.k8s.aws
spec:
group: kafka.services.k8s.aws
Expand All @@ -21,31 +20,39 @@ spec:
description: Cluster is the Schema for the Clusters 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: "ClusterSpec defines the desired state of Cluster. \n Returns
information about a cluster of either the provisioned or the serverless
type."
description: |-
ClusterSpec defines the desired state of Cluster.
Returns information about a cluster of either the provisioned or the serverless
type.
properties:
brokerNodeGroupInfo:
description: Information about the brokers.
properties:
brokerAZDistribution:
description: The distribution of broker nodes across Availability
Zones. By default, broker nodes are distributed among the Availability
Zones of your Region. Currently, the only supported value is
DEFAULT. You can either specify this value explicitly or leave
it out.
description: |-
The distribution of broker nodes across Availability Zones. By default, broker
nodes are distributed among the Availability Zones of your Region. Currently,
the only supported value is DEFAULT. You can either specify this value explicitly
or leave it out.
type: string
clientSubnets:
items:
Expand All @@ -72,12 +79,14 @@ spec:
to MSK broker nodes.
properties:
ebsStorageInfo:
description: Contains information about the EBS storage volumes
attached to Apache Kafka broker nodes.
description: |-
Contains information about the EBS storage volumes attached to Apache Kafka
broker nodes.
properties:
provisionedThroughput:
description: Contains information about provisioned throughput
for EBS storage volumes attached to kafka broker nodes.
description: |-
Contains information about provisioned throughput for EBS storage volumes
attached to kafka broker nodes.
properties:
enabled:
type: boolean
Expand Down Expand Up @@ -155,9 +164,9 @@ spec:
type: object
type: object
enhancedMonitoring:
description: Specifies the level of monitoring for the MSK cluster.
The possible values are DEFAULT, PER_BROKER, PER_TOPIC_PER_BROKER,
and PER_TOPIC_PER_PARTITION.
description: |-
Specifies the level of monitoring for the MSK cluster. The possible values
are DEFAULT, PER_BROKER, PER_TOPIC_PER_BROKER, and PER_TOPIC_PER_PARTITION.
type: string
kafkaVersion:
description: The version of Apache Kafka.
Expand Down Expand Up @@ -246,24 +255,26 @@ spec:
description: ClusterStatus defines the observed state of Cluster
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 @@ -274,14 +285,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 All @@ -307,9 +320,9 @@ spec:
type: object
type: array
state:
description: The state of the cluster. The possible states are ACTIVE,
CREATING, DELETING, FAILED, HEALING, MAINTENANCE, REBOOTING_BROKER,
and UPDATING.
description: |-
The state of the cluster. The possible states are ACTIVE, CREATING, DELETING,
FAILED, HEALING, MAINTENANCE, REBOOTING_BROKER, and UPDATING.
type: string
type: object
type: object
Expand Down
Loading

0 comments on commit f2c6de1

Please sign in to comment.