Skip to content

Commit

Permalink
Update to ACK runtime v0.39.0, code-generator v0.39.1 (#54)
Browse files Browse the repository at this point in the history
### Update to ACK runtime `v0.39.0`, code-generator `v0.39.1`

----------

* ACK code-generator `v0.39.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.39.1)
* ACK runtime `v0.39.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.39.0)

----------

NOTE:
This PR increments the release version of service controller from `v1.0.14` to `v1.0.15`

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

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

----------

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

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

----------

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 Oct 12, 2024
1 parent 02b2da1 commit d234915
Show file tree
Hide file tree
Showing 22 changed files with 139 additions and 337 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-08-29T17:09:30Z"
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
go_version: go1.22.5
version: v0.38.1
build_date: "2024-10-10T04:08:53Z"
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
go_version: go1.23.2
version: v0.39.1
api_directory_checksum: ca09e471c5ee4dfb63cc1f60c2bf8fe3662aafc3
api_version: v1alpha1
aws_sdk_go_version: v1.49.0
Expand Down
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/eventbridge-controller
newTag: 1.0.14
newTag: 1.0.15
6 changes: 2 additions & 4 deletions config/crd/bases/eventbridge.services.k8s.aws_archives.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: archives.eventbridge.services.k8s.aws
spec:
group: eventbridge.services.k8s.aws
Expand Down Expand Up @@ -54,7 +54,6 @@ spec:
description: |-
ArchiveSpec defines the desired state of Archive.
An Archive object that contains details about an archive.
properties:
description:
Expand All @@ -70,7 +69,7 @@ spec:
eventSourceRef:
description: "AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference\ntype to provide more user friendly syntax
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
\ name: my-api"
properties:
from:
Expand Down Expand Up @@ -113,7 +112,6 @@ spec:
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:
Expand Down
5 changes: 1 addition & 4 deletions config/crd/bases/eventbridge.services.k8s.aws_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: endpoints.eventbridge.services.k8s.aws
spec:
group: eventbridge.services.k8s.aws
Expand Down Expand Up @@ -54,7 +54,6 @@ spec:
description: |-
EndpointSpec defines the desired state of Endpoint.
A global endpoint used to improve your application's availability by making
it regional-fault tolerant. For more information about global endpoints,
see Making applications Regional-fault tolerant with global endpoints and
Expand All @@ -68,7 +67,6 @@ spec:
description: |-
Define the event buses used.
The names of the event buses must be identical in each Region.
items:
description: The event buses the endpoint is associated with.
Expand Down Expand Up @@ -139,7 +137,6 @@ spec:
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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: eventbuses.eventbridge.services.k8s.aws
spec:
group: eventbridge.services.k8s.aws
Expand Down Expand Up @@ -54,7 +54,6 @@ spec:
description: |-
EventBusSpec defines the desired state of EventBus.
An event bus receives events from a source, uses rules to evaluate them,
applies any configured input transformation, and routes them to the appropriate
target(s). Your account's default event bus receives events from Amazon Web
Expand All @@ -72,13 +71,11 @@ spec:
description: |-
The name of the new event bus.
Custom event bus names can't contain the / character, but you can use the
/ character in partner event bus names. In addition, for partner event buses,
the name must exactly match the name of the partner event source that this
event bus is matched to.
You can't use the name default for a custom event bus, as this name is already
used for your account's default event bus.
type: string
Expand Down Expand Up @@ -115,7 +112,6 @@ spec:
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:
Expand Down
12 changes: 2 additions & 10 deletions config/crd/bases/eventbridge.services.k8s.aws_rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: rules.eventbridge.services.k8s.aws
spec:
group: eventbridge.services.k8s.aws
Expand Down Expand Up @@ -53,7 +53,6 @@ spec:
description: |-
RuleSpec defines the desired state of Rule.
Contains information about a rule in Amazon EventBridge.
properties:
description:
Expand All @@ -67,7 +66,7 @@ spec:
eventBusRef:
description: "AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference\ntype to provide more user friendly syntax
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
\ name: my-api"
properties:
from:
Expand All @@ -94,7 +93,6 @@ spec:
description: |-
The Amazon Resource Name (ARN) of the IAM role associated with the rule.
If you're setting an event bus in another account as the target and that
account granted permission to your account through an organization instead
of directly by the account ID, you must specify a RoleArn with proper permissions
Expand All @@ -108,19 +106,15 @@ spec:
description: |-
The state of the rule.
Valid values include:
* DISABLED: The rule is disabled. EventBridge does not match any events
against the rule.
* ENABLED: The rule is enabled. EventBridge matches events against the
rule, except for Amazon Web Services management events delivered through
CloudTrail.
* ENABLED_WITH_ALL_CLOUDTRAIL_MANAGEMENT_EVENTS: The rule is enabled for
all events, including Amazon Web Services management events delivered
through CloudTrail. Management events provide visibility into management
Expand Down Expand Up @@ -154,7 +148,6 @@ spec:
list of services and resources that can be set as a target, see PutTargets
(https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_PutTargets.html).
If you are setting the event bus of another account as the target, and that
account granted permission to your account through an organization instead
of directly by the account ID, then you must specify a RoleArn with proper
Expand Down Expand Up @@ -464,7 +457,6 @@ spec:
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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: adoptedresources.services.k8s.aws
spec:
group: services.k8s.aws
Expand Down Expand Up @@ -78,11 +78,9 @@ spec:
automatically converts this to an arbitrary string-string map.
https://github.com/kubernetes-sigs/controller-tools/issues/385
Active discussion about inclusion of this field in the spec is happening in this PR:
https://github.com/kubernetes-sigs/controller-tools/pull/395
Until this is allowed, or if it never is, we will produce a subset of the object meta
that contains only the fields which the user is allowed to modify in the metadata.
properties:
Expand All @@ -105,13 +103,11 @@ spec:
and may be truncated by the length of the suffix required to make the value
unique on the server.
If this field is specified and the generated name exists, the server will
NOT return a 409 - instead, it will either return 201 Created or 500 with Reason
ServerTimeout indicating a unique name could not be found in the time allotted, and the client
should retry (optionally after the time indicated in the Retry-After header).
Applied only if Name is not specified.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
type: string
Expand Down Expand Up @@ -140,7 +136,6 @@ spec:
Not all objects are required to be scoped to a namespace - the value of this field for
those objects will be empty.
Must be a DNS_LABEL.
Cannot be updated.
More info: http://kubernetes.io/docs/user-guide/namespaces
Expand Down
2 changes: 1 addition & 1 deletion config/crd/common/bases/services.k8s.aws_fieldexports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
name: fieldexports.services.k8s.aws
spec:
group: services.k8s.aws
Expand Down
90 changes: 5 additions & 85 deletions config/rbac/cluster-role-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ rules:
- ""
resources:
- configmaps
- secrets
verbs:
- get
- list
Expand All @@ -21,78 +22,12 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- patch
- watch
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- archives
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- archives/status
verbs:
- get
- patch
- update
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- endpoints
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- endpoints/status
verbs:
- get
- patch
- update
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- eventbuses
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- eventbuses/status
verbs:
- get
- patch
- update
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- rules
verbs:
- create
Expand All @@ -105,6 +40,9 @@ rules:
- apiGroups:
- eventbridge.services.k8s.aws
resources:
- archives/status
- endpoints/status
- eventbuses/status
- rules/status
verbs:
- get
Expand All @@ -114,25 +52,6 @@ rules:
- services.k8s.aws
resources:
- adoptedresources
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources/status
verbs:
- get
- patch
- update
- apiGroups:
- services.k8s.aws
resources:
- fieldexports
verbs:
- create
Expand All @@ -145,6 +64,7 @@ rules:
- apiGroups:
- services.k8s.aws
resources:
- adoptedresources/status
- fieldexports/status
verbs:
- get
Expand Down
Loading

0 comments on commit d234915

Please sign in to comment.