Skip to content

Commit 10ade92

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

24 files changed

+699
-594
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:07:47Z"
3-
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
4-
go_version: go1.21.5
5-
version: v0.29.2
2+
build_date: "2024-02-14T04:07:36Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: e33a65f2b24673bb4e6b614f65b3e16533ceb95c
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

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/ecr-controller
9-
newTag: 1.0.11
9+
newTag: 1.0.12

config/crd/bases/ecr.services.k8s.aws_pullthroughcacherules.yaml

Lines changed: 51 additions & 37 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: pullthroughcacherules.ecr.services.k8s.aws
98
spec:
109
group: ecr.services.k8s.aws
@@ -22,33 +21,43 @@ 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: "PullThroughCacheRuleSpec defines the desired state of PullThroughCacheRule.
38-
\n The details of a pull through cache rule."
41+
description: |-
42+
PullThroughCacheRuleSpec defines the desired state of PullThroughCacheRule.
43+
44+
45+
The details of a pull through cache rule.
3946
properties:
4047
ecrRepositoryPrefix:
4148
description: The repository name prefix to use when caching images
4249
from the source registry.
4350
type: string
4451
registryID:
45-
description: The Amazon Web Services account ID associated with the
46-
registry to create the pull through cache rule for. If you do not
47-
specify a registry, the default registry is assumed.
52+
description: |-
53+
The Amazon Web Services account ID associated with the registry to create
54+
the pull through cache rule for. If you do not specify a registry, the default
55+
registry is assumed.
4856
type: string
4957
upstreamRegistryURL:
50-
description: The registry URL of the upstream public registry to use
51-
as the source for the pull through cache rule.
58+
description: |-
59+
The registry URL of the upstream public registry to use as the source for
60+
the pull through cache rule.
5261
type: string
5362
required:
5463
- ecrRepositoryPrefix
@@ -59,24 +68,26 @@ spec:
5968
PullThroughCacheRule
6069
properties:
6170
ackResourceMetadata:
62-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
63-
member that is used to contain resource sync state, account ownership,
71+
description: |-
72+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
73+
that is used to contain resource sync state, account ownership,
6474
constructed ARN for the resource
6575
properties:
6676
arn:
67-
description: 'ARN is the Amazon Resource Name for the resource.
68-
This is a globally-unique identifier and is set only by the
69-
ACK service controller once the controller has orchestrated
70-
the creation of the resource OR when it has verified that an
71-
"adopted" resource (a resource where the ARN annotation was
72-
set by the Kubernetes user on the CR) exists and matches the
73-
supplied CR''s Spec field values. TODO(vijat@): Find a better
74-
strategy for resources that do not have ARN in CreateOutputResponse
75-
https://github.com/aws/aws-controllers-k8s/issues/270'
77+
description: |-
78+
ARN is the Amazon Resource Name for the resource. This is a
79+
globally-unique identifier and is set only by the ACK service controller
80+
once the controller has orchestrated the creation of the resource OR
81+
when it has verified that an "adopted" resource (a resource where the
82+
ARN annotation was set by the Kubernetes user on the CR) exists and
83+
matches the supplied CR's Spec field values.
84+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
85+
https://github.com/aws/aws-controllers-k8s/issues/270
7686
type: string
7787
ownerAccountID:
78-
description: OwnerAccountID is the AWS Account ID of the account
79-
that owns the backend AWS service API resource.
88+
description: |-
89+
OwnerAccountID is the AWS Account ID of the account that owns the
90+
backend AWS service API resource.
8091
type: string
8192
region:
8293
description: Region is the AWS region in which the resource exists
@@ -87,14 +98,16 @@ spec:
8798
- region
8899
type: object
89100
conditions:
90-
description: All CRS managed by ACK have a common `Status.Conditions`
91-
member that contains a collection of `ackv1alpha1.Condition` objects
92-
that describe the various terminal states of the CR and its backend
93-
AWS service API resource
101+
description: |-
102+
All CRS managed by ACK have a common `Status.Conditions` member that
103+
contains a collection of `ackv1alpha1.Condition` objects that describe
104+
the various terminal states of the CR and its backend AWS service API
105+
resource
94106
items:
95-
description: Condition is the common struct used by all CRDs managed
96-
by ACK service controllers to indicate terminal states of the
97-
CR and its backend AWS service API resource
107+
description: |-
108+
Condition is the common struct used by all CRDs managed by ACK service
109+
controllers to indicate terminal states of the CR and its backend AWS
110+
service API resource
98111
properties:
99112
lastTransitionTime:
100113
description: Last time the condition transitioned from one status
@@ -120,8 +133,9 @@ spec:
120133
type: object
121134
type: array
122135
createdAt:
123-
description: The date and time, in JavaScript date format, when the
124-
pull through cache rule was created.
136+
description: |-
137+
The date and time, in JavaScript date format, when the pull through cache
138+
rule was created.
125139
format: date-time
126140
type: string
127141
type: object

0 commit comments

Comments
 (0)