Skip to content

Commit b7f3fd3

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

22 files changed

+634
-513
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:02:06Z"
3-
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
4-
go_version: go1.21.5
5-
version: v0.29.2
2+
build_date: "2024-02-14T04:03:37Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: 37b933d95cb4cee8d623aa354c10fe43c29575ed
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.167

‎apis/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 1 deletion
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/organizations-controller
9-
newTag: 0.0.2
9+
newTag: 0.0.3

‎config/crd/bases/organizations.services.k8s.aws_organizationalunits.yaml‎

Lines changed: 95 additions & 59 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: organizationalunits.organizations.services.k8s.aws
98
spec:
109
group: organizations.services.k8s.aws
@@ -22,52 +21,83 @@ spec:
2221
API
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object
3640
spec:
37-
description: "OrganizationalUnitSpec defines the desired state of OrganizationalUnit.
38-
\n Contains details about an organizational unit (OU). An OU is a container
41+
description: |-
42+
OrganizationalUnitSpec defines the desired state of OrganizationalUnit.
43+
44+
45+
Contains details about an organizational unit (OU). An OU is a container
3946
of Amazon Web Services accounts within a root of an organization. Policies
40-
that are attached to an OU apply to all accounts contained in that OU
41-
and in any child OUs."
47+
that are attached to an OU apply to all accounts contained in that OU and
48+
in any child OUs.
4249
properties:
4350
name:
4451
description: The friendly name to assign to the new OU.
4552
type: string
4653
parentID:
47-
description: "The unique identifier (ID) of the parent root or OU
48-
that you want to create the new OU in. \n The regex pattern (http://wikipedia.org/wiki/regex)
49-
for a parent ID string requires one of the following: \n * Root
50-
- A string that begins with \"r-\" followed by from 4 to 32 lowercase
51-
letters or digits. \n * Organizational unit (OU) - A string that
52-
begins with \"ou-\" followed by from 4 to 32 lowercase letters or
53-
digits (the ID of the root that the OU is in). This string is followed
54-
by a second \"-\" dash and from 8 to 32 additional lowercase letters
55-
or digits."
54+
description: |-
55+
The unique identifier (ID) of the parent root or OU that you want to create
56+
the new OU in.
57+
58+
59+
The regex pattern (http://wikipedia.org/wiki/regex) for a parent ID string
60+
requires one of the following:
61+
62+
63+
* Root - A string that begins with "r-" followed by from 4 to 32 lowercase
64+
letters or digits.
65+
66+
67+
* Organizational unit (OU) - A string that begins with "ou-" followed
68+
by from 4 to 32 lowercase letters or digits (the ID of the root that the
69+
OU is in). This string is followed by a second "-" dash and from 8 to
70+
32 additional lowercase letters or digits.
5671
type: string
5772
tags:
58-
description: "A list of tags that you want to attach to the newly
59-
created OU. For each tag in the list, you must specify both a tag
60-
key and a value. You can set the value to an empty string, but you
61-
can't set it to null. For more information about tagging, see Tagging
62-
Organizations resources (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_tagging.html)
63-
in the Organizations User Guide. \n If any one of the tags is invalid
64-
or if you exceed the allowed number of tags for an OU, then the
65-
entire request fails and the OU is not created."
73+
description: |-
74+
A list of tags that you want to attach to the newly created OU. For each
75+
tag in the list, you must specify both a tag key and a value. You can set
76+
the value to an empty string, but you can't set it to null. For more information
77+
about tagging, see Tagging Organizations resources (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_tagging.html)
78+
in the Organizations User Guide.
79+
80+
81+
If any one of the tags is invalid or if you exceed the allowed number of
82+
tags for an OU, then the entire request fails and the OU is not created.
6683
items:
67-
description: "A custom key-value pair associated with a resource
68-
within your organization. \n You can attach tags to any of the
69-
following organization resources. \n * Amazon Web Services account
70-
\n * Organizational unit (OU) \n * Organization root \n * Policy"
84+
description: |-
85+
A custom key-value pair associated with a resource within your organization.
86+
87+
88+
You can attach tags to any of the following organization resources.
89+
90+
91+
* Amazon Web Services account
92+
93+
94+
* Organizational unit (OU)
95+
96+
97+
* Organization root
98+
99+
100+
* Policy
71101
properties:
72102
key:
73103
type: string
@@ -83,24 +113,26 @@ spec:
83113
description: OrganizationalUnitStatus defines the observed state of OrganizationalUnit
84114
properties:
85115
ackResourceMetadata:
86-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
87-
member that is used to contain resource sync state, account ownership,
116+
description: |-
117+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
118+
that is used to contain resource sync state, account ownership,
88119
constructed ARN for the resource
89120
properties:
90121
arn:
91-
description: 'ARN is the Amazon Resource Name for the resource.
92-
This is a globally-unique identifier and is set only by the
93-
ACK service controller once the controller has orchestrated
94-
the creation of the resource OR when it has verified that an
95-
"adopted" resource (a resource where the ARN annotation was
96-
set by the Kubernetes user on the CR) exists and matches the
97-
supplied CR''s Spec field values. TODO(vijat@): Find a better
98-
strategy for resources that do not have ARN in CreateOutputResponse
99-
https://github.com/aws/aws-controllers-k8s/issues/270'
122+
description: |-
123+
ARN is the Amazon Resource Name for the resource. This is a
124+
globally-unique identifier and is set only by the ACK service controller
125+
once the controller has orchestrated the creation of the resource OR
126+
when it has verified that an "adopted" resource (a resource where the
127+
ARN annotation was set by the Kubernetes user on the CR) exists and
128+
matches the supplied CR's Spec field values.
129+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
130+
https://github.com/aws/aws-controllers-k8s/issues/270
100131
type: string
101132
ownerAccountID:
102-
description: OwnerAccountID is the AWS Account ID of the account
103-
that owns the backend AWS service API resource.
133+
description: |-
134+
OwnerAccountID is the AWS Account ID of the account that owns the
135+
backend AWS service API resource.
104136
type: string
105137
region:
106138
description: Region is the AWS region in which the resource exists
@@ -111,14 +143,16 @@ spec:
111143
- region
112144
type: object
113145
conditions:
114-
description: All CRS managed by ACK have a common `Status.Conditions`
115-
member that contains a collection of `ackv1alpha1.Condition` objects
116-
that describe the various terminal states of the CR and its backend
117-
AWS service API resource
146+
description: |-
147+
All CRS managed by ACK have a common `Status.Conditions` member that
148+
contains a collection of `ackv1alpha1.Condition` objects that describe
149+
the various terminal states of the CR and its backend AWS service API
150+
resource
118151
items:
119-
description: Condition is the common struct used by all CRDs managed
120-
by ACK service controllers to indicate terminal states of the
121-
CR and its backend AWS service API resource
152+
description: |-
153+
Condition is the common struct used by all CRDs managed by ACK service
154+
controllers to indicate terminal states of the CR and its backend AWS
155+
service API resource
122156
properties:
123157
lastTransitionTime:
124158
description: Last time the condition transitioned from one status
@@ -144,12 +178,14 @@ spec:
144178
type: object
145179
type: array
146180
id:
147-
description: "The unique identifier (ID) associated with this OU.
148-
\n The regex pattern (http://wikipedia.org/wiki/regex) for an organizational
149-
unit ID string requires \"ou-\" followed by from 4 to 32 lowercase
150-
letters or digits (the ID of the root that contains the OU). This
151-
string is followed by a second \"-\" dash and from 8 to 32 additional
152-
lowercase letters or digits."
181+
description: |-
182+
The unique identifier (ID) associated with this OU.
183+
184+
185+
The regex pattern (http://wikipedia.org/wiki/regex) for an organizational
186+
unit ID string requires "ou-" followed by from 4 to 32 lowercase letters
187+
or digits (the ID of the root that contains the OU). This string is followed
188+
by a second "-" dash and from 8 to 32 additional lowercase letters or digits.
153189
type: string
154190
type: object
155191
type: object

0 commit comments

Comments
 (0)