Skip to content

Commit 487b138

Browse files
authored
Update to ACK runtime v0.30.0, code-generator v0.30.0 (#12)
### 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.3` to `v0.0.4` Once this PR is merged, release `v0.0.4` will be automatically created for `cloudwatchlogs-controller` **Please close this PR, if you do not want the new patch release for `cloudwatchlogs-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building cloudwatchlogs-controller ==== Copying common custom resource definitions into cloudwatchlogs Building Kubernetes API objects for cloudwatchlogs Generating deepcopy code for cloudwatchlogs Generating custom resource definitions for cloudwatchlogs Building service controller for cloudwatchlogs Generating RBAC manifests for cloudwatchlogs Running gofmt against generated code for cloudwatchlogs Updating additional GitHub repository maintenance files ==== building cloudwatchlogs-controller release artifacts ==== Building release artifacts for cloudwatchlogs-v0.0.4 Generating common custom resource definitions Generating custom resource definitions for cloudwatchlogs Generating RBAC manifests for cloudwatchlogs ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 065c59f commit 487b138

22 files changed

+582
-498
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:13:55Z"
3-
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
4-
go_version: go1.21.5
5-
version: v0.29.2
2+
build_date: "2024-02-14T04:08:37Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: 1c09a2cd5e3e19b4be39e68fc87d33aaf0dccd1e
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.263

apis/v1alpha1/zz_generated.deepcopy.go

Lines changed: 2 additions & 2 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/cloudwatchlogs-controller
9-
newTag: 0.0.3
9+
newTag: 0.0.4

config/crd/bases/cloudwatchlogs.services.k8s.aws_loggroups.yaml

Lines changed: 68 additions & 51 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: loggroups.cloudwatchlogs.services.k8s.aws
98
spec:
109
group: cloudwatchlogs.services.k8s.aws
@@ -21,34 +20,44 @@ spec:
2120
description: LogGroup is the Schema for the LogGroups 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
3539
spec:
36-
description: "LogGroupSpec defines the desired state of LogGroup. \n Represents
37-
a log group."
40+
description: |-
41+
LogGroupSpec defines the desired state of LogGroup.
42+
43+
44+
Represents a log group.
3845
properties:
3946
kmsKeyID:
40-
description: The Amazon Resource Name (ARN) of the KMS key to use
41-
when encrypting log data. For more information, see Amazon Resource
42-
Names (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-kms).
47+
description: |-
48+
The Amazon Resource Name (ARN) of the KMS key to use when encrypting log
49+
data. For more information, see Amazon Resource Names (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-kms).
4350
type: string
4451
kmsKeyRef:
4552
description: "AWSResourceReferenceWrapper provides a wrapper around
46-
*AWSResourceReference type to provide more user friendly syntax
47-
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
53+
*AWSResourceReference\ntype to provide more user friendly syntax
54+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
55+
\ name: my-api"
4856
properties:
4957
from:
50-
description: AWSResourceReference provides all the values necessary
51-
to reference another k8s resource for finding the identifier(Id/ARN/Name)
58+
description: |-
59+
AWSResourceReference provides all the values necessary to reference another
60+
k8s resource for finding the identifier(Id/ARN/Name)
5261
properties:
5362
name:
5463
type: string
@@ -62,15 +71,18 @@ spec:
6271
tags:
6372
additionalProperties:
6473
type: string
65-
description: "The key-value pairs to use for the tags. \n You can
66-
grant users access to certain log groups while preventing them from
67-
accessing other log groups. To do so, tag your groups and use IAM
68-
policies that refer to those tags. To assign tags when you create
69-
a log group, you must have either the logs:TagResource or logs:TagLogGroup
70-
permission. For more information about tagging, see Tagging Amazon
71-
Web Services resources (https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html).
72-
For more information about using tags to control access, see Controlling
73-
access to Amazon Web Services resources using tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_tags.html)."
74+
description: |-
75+
The key-value pairs to use for the tags.
76+
77+
78+
You can grant users access to certain log groups while preventing them from
79+
accessing other log groups. To do so, tag your groups and use IAM policies
80+
that refer to those tags. To assign tags when you create a log group, you
81+
must have either the logs:TagResource or logs:TagLogGroup permission. For
82+
more information about tagging, see Tagging Amazon Web Services resources
83+
(https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html). For more
84+
information about using tags to control access, see Controlling access to
85+
Amazon Web Services resources using tags (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_tags.html).
7486
type: object
7587
required:
7688
- name
@@ -79,24 +91,26 @@ spec:
7991
description: LogGroupStatus defines the observed state of LogGroup
8092
properties:
8193
ackResourceMetadata:
82-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
83-
member that is used to contain resource sync state, account ownership,
94+
description: |-
95+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
96+
that is used to contain resource sync state, account ownership,
8497
constructed ARN for the resource
8598
properties:
8699
arn:
87-
description: 'ARN is the Amazon Resource Name for the resource.
88-
This is a globally-unique identifier and is set only by the
89-
ACK service controller once the controller has orchestrated
90-
the creation of the resource OR when it has verified that an
91-
"adopted" resource (a resource where the ARN annotation was
92-
set by the Kubernetes user on the CR) exists and matches the
93-
supplied CR''s Spec field values. TODO(vijat@): Find a better
94-
strategy for resources that do not have ARN in CreateOutputResponse
95-
https://github.com/aws/aws-controllers-k8s/issues/270'
100+
description: |-
101+
ARN is the Amazon Resource Name for the resource. This is a
102+
globally-unique identifier and is set only by the ACK service controller
103+
once the controller has orchestrated the creation of the resource OR
104+
when it has verified that an "adopted" resource (a resource where the
105+
ARN annotation was set by the Kubernetes user on the CR) exists and
106+
matches the supplied CR's Spec field values.
107+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
108+
https://github.com/aws/aws-controllers-k8s/issues/270
96109
type: string
97110
ownerAccountID:
98-
description: OwnerAccountID is the AWS Account ID of the account
99-
that owns the backend AWS service API resource.
111+
description: |-
112+
OwnerAccountID is the AWS Account ID of the account that owns the
113+
backend AWS service API resource.
100114
type: string
101115
region:
102116
description: Region is the AWS region in which the resource exists
@@ -107,14 +121,16 @@ spec:
107121
- region
108122
type: object
109123
conditions:
110-
description: All CRS managed by ACK have a common `Status.Conditions`
111-
member that contains a collection of `ackv1alpha1.Condition` objects
112-
that describe the various terminal states of the CR and its backend
113-
AWS service API resource
124+
description: |-
125+
All CRS managed by ACK have a common `Status.Conditions` member that
126+
contains a collection of `ackv1alpha1.Condition` objects that describe
127+
the various terminal states of the CR and its backend AWS service API
128+
resource
114129
items:
115-
description: Condition is the common struct used by all CRDs managed
116-
by ACK service controllers to indicate terminal states of the
117-
CR and its backend AWS service API resource
130+
description: |-
131+
Condition is the common struct used by all CRDs managed by ACK service
132+
controllers to indicate terminal states of the CR and its backend AWS
133+
service API resource
118134
properties:
119135
lastTransitionTime:
120136
description: Last time the condition transitioned from one status
@@ -140,14 +156,15 @@ spec:
140156
type: object
141157
type: array
142158
creationTime:
143-
description: The creation time of the log group, expressed as the
144-
number of milliseconds after Jan 1, 1970 00:00:00 UTC.
159+
description: |-
160+
The creation time of the log group, expressed as the number of milliseconds
161+
after Jan 1, 1970 00:00:00 UTC.
145162
format: int64
146163
type: integer
147164
dataProtectionStatus:
148-
description: Displays whether this log group has a protection policy,
149-
or whether it had one in the past. For more information, see PutDataProtectionPolicy
150-
(https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDataProtectionPolicy.html).
165+
description: |-
166+
Displays whether this log group has a protection policy, or whether it had
167+
one in the past. For more information, see PutDataProtectionPolicy (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDataProtectionPolicy.html).
151168
type: string
152169
metricFilterCount:
153170
description: The number of metric filters.

0 commit comments

Comments
 (0)