Skip to content

Commit

Permalink
Update to ACK runtime v0.30.0, code-generator v0.30.0 (#16)
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 `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.
  • Loading branch information
@ack-bot
ack-bot authored Feb 14, 2024
1 parent 806dbe3 commit b7f3fd3
Show file tree
Hide file tree
Showing 22 changed files with 634 additions and 513 deletions.
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-01-29T07:02:06Z"
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
go_version: go1.21.5
version: v0.29.2
build_date: "2024-02-14T04:03:37Z"
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
go_version: go1.22.0
version: v0.30.0
api_directory_checksum: 37b933d95cb4cee8d623aa354c10fe43c29575ed
api_version: v1alpha1
aws_sdk_go_version: v1.44.167
Expand Down
1 change: 0 additions & 1 deletion apis/v1alpha1/zz_generated.deepcopy.go
View file

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
View file
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/organizations-controller
newTag: 0.0.2
newTag: 0.0.3
154 changes: 95 additions & 59 deletions config/crd/bases/organizations.services.k8s.aws_organizationalunits.yaml
View file
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: organizationalunits.organizations.services.k8s.aws
spec:
group: organizations.services.k8s.aws
Expand All @@ -22,52 +21,83 @@ spec:
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: "OrganizationalUnitSpec defines the desired state of OrganizationalUnit.
\n Contains details about an organizational unit (OU). An OU is a container
description: |-
OrganizationalUnitSpec defines the desired state of OrganizationalUnit.
Contains details about an organizational unit (OU). An OU is a container
of Amazon Web Services accounts within a root of an organization. Policies
that are attached to an OU apply to all accounts contained in that OU
and in any child OUs."
that are attached to an OU apply to all accounts contained in that OU and
in any child OUs.
properties:
name:
description: The friendly name to assign to the new OU.
type: string
parentID:
description: "The unique identifier (ID) of the parent root or OU
that you want to create the new OU in. \n The regex pattern (http://wikipedia.org/wiki/regex)
for a parent ID string requires one of the following: \n * Root
- A string that begins with \"r-\" followed by from 4 to 32 lowercase
letters or digits. \n * Organizational unit (OU) - A string that
begins with \"ou-\" followed by from 4 to 32 lowercase letters or
digits (the ID of the root that the OU is in). This string is followed
by a second \"-\" dash and from 8 to 32 additional lowercase letters
or digits."
description: |-
The unique identifier (ID) of the parent root or OU that you want to create
the new OU in.
The regex pattern (http://wikipedia.org/wiki/regex) for a parent ID string
requires one of the following:
* Root - A string that begins with "r-" followed by from 4 to 32 lowercase
letters or digits.
* Organizational unit (OU) - A string that begins with "ou-" followed
by from 4 to 32 lowercase letters or digits (the ID of the root that the
OU is in). This string is followed by a second "-" dash and from 8 to
32 additional lowercase letters or digits.
type: string
tags:
description: "A list of tags that you want to attach to the newly
created OU. For each tag in the list, you must specify both a tag
key and a value. You can set the value to an empty string, but you
can't set it to null. For more information about tagging, see Tagging
Organizations resources (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_tagging.html)
in the Organizations User Guide. \n If any one of the tags is invalid
or if you exceed the allowed number of tags for an OU, then the
entire request fails and the OU is not created."
description: |-
A list of tags that you want to attach to the newly created OU. For each
tag in the list, you must specify both a tag key and a value. You can set
the value to an empty string, but you can't set it to null. For more information
about tagging, see Tagging Organizations resources (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_tagging.html)
in the Organizations User Guide.
If any one of the tags is invalid or if you exceed the allowed number of
tags for an OU, then the entire request fails and the OU is not created.
items:
description: "A custom key-value pair associated with a resource
within your organization. \n You can attach tags to any of the
following organization resources. \n * Amazon Web Services account
\n * Organizational unit (OU) \n * Organization root \n * Policy"
description: |-
A custom key-value pair associated with a resource within your organization.
You can attach tags to any of the following organization resources.
* Amazon Web Services account
* Organizational unit (OU)
* Organization root
* Policy
properties:
key:
type: string
Expand All @@ -83,24 +113,26 @@ spec:
description: OrganizationalUnitStatus defines the observed state of OrganizationalUnit
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 @@ -111,14 +143,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 @@ -144,12 +178,14 @@ spec:
type: object
type: array
id:
description: "The unique identifier (ID) associated with this OU.
\n The regex pattern (http://wikipedia.org/wiki/regex) for an organizational
unit ID string requires \"ou-\" followed by from 4 to 32 lowercase
letters or digits (the ID of the root that contains the OU). This
string is followed by a second \"-\" dash and from 8 to 32 additional
lowercase letters or digits."
description: |-
The unique identifier (ID) associated with this OU.
The regex pattern (http://wikipedia.org/wiki/regex) for an organizational
unit ID string requires "ou-" followed by from 4 to 32 lowercase letters
or digits (the ID of the root that contains the OU). This string is followed
by a second "-" dash and from 8 to 32 additional lowercase letters or digits.
type: string
type: object
type: object
Expand Down
Loading

0 comments on commit b7f3fd3

Please sign in to comment.