Skip to content

Commit 71be8ca

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

24 files changed

+646
-544
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:01:50Z"
3-
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
4-
go_version: go1.21.5
5-
version: v0.29.2
2+
build_date: "2024-02-14T03:59:30Z"
3+
build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
4+
go_version: go1.22.0
5+
version: v0.30.0
66
api_directory_checksum: 1066e3b0ac63732903ec4155dba6b658fd83ef84
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

apis/v1alpha1/zz_generated.deepcopy.go

Lines changed: 10 additions & 6 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/emrcontainers-controller
9-
newTag: 1.0.6
9+
newTag: 1.0.7

config/crd/bases/emrcontainers.services.k8s.aws_jobruns.yaml

Lines changed: 49 additions & 36 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: jobruns.emrcontainers.services.k8s.aws
98
spec:
109
group: emrcontainers.services.k8s.aws
@@ -28,22 +27,30 @@ spec:
2827
description: JobRun is the Schema for the JobRuns API
2928
properties:
3029
apiVersion:
31-
description: 'APIVersion defines the versioned schema of this representation
32-
of an object. Servers should convert recognized schemas to the latest
33-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
30+
description: |-
31+
APIVersion defines the versioned schema of this representation of an object.
32+
Servers should convert recognized schemas to the latest internal value, and
33+
may reject unrecognized values.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3435
type: string
3536
kind:
36-
description: 'Kind is a string value representing the REST resource this
37-
object represents. Servers may infer this from the endpoint the client
38-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
37+
description: |-
38+
Kind is a string value representing the REST resource this object represents.
39+
Servers may infer this from the endpoint the client submits requests to.
40+
Cannot be updated.
41+
In CamelCase.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3943
type: string
4044
metadata:
4145
type: object
4246
spec:
43-
description: "JobRunSpec defines the desired state of JobRun. \n This
44-
entity describes a job run. A job run is a unit of work, such as a Spark
45-
jar, PySpark script, or SparkSQL query, that you submit to Amazon EMR
46-
on EKS."
47+
description: |-
48+
JobRunSpec defines the desired state of JobRun.
49+
50+
51+
This entity describes a job run. A job run is a unit of work, such as a Spark
52+
jar, PySpark script, or SparkSQL query, that you submit to Amazon EMR on
53+
EKS.
4754
properties:
4855
configurationOverrides:
4956
type: string
@@ -83,12 +90,14 @@ spec:
8390
type: string
8491
virtualClusterRef:
8592
description: "AWSResourceReferenceWrapper provides a wrapper around
86-
*AWSResourceReference type to provide more user friendly syntax
87-
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
93+
*AWSResourceReference\ntype to provide more user friendly syntax
94+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\n\tfrom:\n\t
95+
\ name: my-api"
8896
properties:
8997
from:
90-
description: AWSResourceReference provides all the values necessary
91-
to reference another k8s resource for finding the identifier(Id/ARN/Name)
98+
description: |-
99+
AWSResourceReference provides all the values necessary to reference another
100+
k8s resource for finding the identifier(Id/ARN/Name)
92101
properties:
93102
name:
94103
type: string
@@ -103,24 +112,26 @@ spec:
103112
description: JobRunStatus defines the observed state of JobRun
104113
properties:
105114
ackResourceMetadata:
106-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
107-
member that is used to contain resource sync state, account ownership,
115+
description: |-
116+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
117+
that is used to contain resource sync state, account ownership,
108118
constructed ARN for the resource
109119
properties:
110120
arn:
111-
description: 'ARN is the Amazon Resource Name for the resource.
112-
This is a globally-unique identifier and is set only by the
113-
ACK service controller once the controller has orchestrated
114-
the creation of the resource OR when it has verified that an
115-
"adopted" resource (a resource where the ARN annotation was
116-
set by the Kubernetes user on the CR) exists and matches the
117-
supplied CR''s Spec field values. TODO(vijat@): Find a better
118-
strategy for resources that do not have ARN in CreateOutputResponse
119-
https://github.com/aws/aws-controllers-k8s/issues/270'
121+
description: |-
122+
ARN is the Amazon Resource Name for the resource. This is a
123+
globally-unique identifier and is set only by the ACK service controller
124+
once the controller has orchestrated the creation of the resource OR
125+
when it has verified that an "adopted" resource (a resource where the
126+
ARN annotation was set by the Kubernetes user on the CR) exists and
127+
matches the supplied CR's Spec field values.
128+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
129+
https://github.com/aws/aws-controllers-k8s/issues/270
120130
type: string
121131
ownerAccountID:
122-
description: OwnerAccountID is the AWS Account ID of the account
123-
that owns the backend AWS service API resource.
132+
description: |-
133+
OwnerAccountID is the AWS Account ID of the account that owns the
134+
backend AWS service API resource.
124135
type: string
125136
region:
126137
description: Region is the AWS region in which the resource exists
@@ -131,14 +142,16 @@ spec:
131142
- region
132143
type: object
133144
conditions:
134-
description: All CRS managed by ACK have a common `Status.Conditions`
135-
member that contains a collection of `ackv1alpha1.Condition` objects
136-
that describe the various terminal states of the CR and its backend
137-
AWS service API resource
145+
description: |-
146+
All CRS managed by ACK have a common `Status.Conditions` member that
147+
contains a collection of `ackv1alpha1.Condition` objects that describe
148+
the various terminal states of the CR and its backend AWS service API
149+
resource
138150
items:
139-
description: Condition is the common struct used by all CRDs managed
140-
by ACK service controllers to indicate terminal states of the
141-
CR and its backend AWS service API resource
151+
description: |-
152+
Condition is the common struct used by all CRDs managed by ACK service
153+
controllers to indicate terminal states of the CR and its backend AWS
154+
service API resource
142155
properties:
143156
lastTransitionTime:
144157
description: Last time the condition transitioned from one status

config/crd/bases/emrcontainers.services.k8s.aws_virtualclusters.yaml

Lines changed: 47 additions & 36 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: virtualclusters.emrcontainers.services.k8s.aws
98
spec:
109
group: emrcontainers.services.k8s.aws
@@ -21,26 +20,34 @@ spec:
2120
description: VirtualCluster is the Schema for the VirtualClusters 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: "VirtualClusterSpec defines the desired state of VirtualCluster.
37-
\n This entity describes a virtual cluster. A virtual cluster is a Kubernetes
38-
namespace that Amazon EMR is registered with. Amazon EMR uses virtual
39-
clusters to run jobs and host endpoints. Multiple virtual clusters can
40-
be backed by the same physical cluster. However, each virtual cluster
41-
maps to one namespace on an EKS cluster. Virtual clusters do not create
42-
any active resources that contribute to your bill or that require lifecycle
43-
management outside the service."
40+
description: |-
41+
VirtualClusterSpec defines the desired state of VirtualCluster.
42+
43+
44+
This entity describes a virtual cluster. A virtual cluster is a Kubernetes
45+
namespace that Amazon EMR is registered with. Amazon EMR uses virtual clusters
46+
to run jobs and host endpoints. Multiple virtual clusters can be backed by
47+
the same physical cluster. However, each virtual cluster maps to one namespace
48+
on an EKS cluster. Virtual clusters do not create any active resources that
49+
contribute to your bill or that require lifecycle management outside the
50+
service.
4451
properties:
4552
containerProvider:
4653
description: The container provider of the virtual cluster.
@@ -77,24 +84,26 @@ spec:
7784
description: VirtualClusterStatus defines the observed state of VirtualCluster
7885
properties:
7986
ackResourceMetadata:
80-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
81-
member that is used to contain resource sync state, account ownership,
87+
description: |-
88+
All CRs managed by ACK have a common `Status.ACKResourceMetadata` member
89+
that is used to contain resource sync state, account ownership,
8290
constructed ARN for the resource
8391
properties:
8492
arn:
85-
description: 'ARN is the Amazon Resource Name for the resource.
86-
This is a globally-unique identifier and is set only by the
87-
ACK service controller once the controller has orchestrated
88-
the creation of the resource OR when it has verified that an
89-
"adopted" resource (a resource where the ARN annotation was
90-
set by the Kubernetes user on the CR) exists and matches the
91-
supplied CR''s Spec field values. TODO(vijat@): Find a better
92-
strategy for resources that do not have ARN in CreateOutputResponse
93-
https://github.com/aws/aws-controllers-k8s/issues/270'
93+
description: |-
94+
ARN is the Amazon Resource Name for the resource. This is a
95+
globally-unique identifier and is set only by the ACK service controller
96+
once the controller has orchestrated the creation of the resource OR
97+
when it has verified that an "adopted" resource (a resource where the
98+
ARN annotation was set by the Kubernetes user on the CR) exists and
99+
matches the supplied CR's Spec field values.
100+
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
101+
https://github.com/aws/aws-controllers-k8s/issues/270
94102
type: string
95103
ownerAccountID:
96-
description: OwnerAccountID is the AWS Account ID of the account
97-
that owns the backend AWS service API resource.
104+
description: |-
105+
OwnerAccountID is the AWS Account ID of the account that owns the
106+
backend AWS service API resource.
98107
type: string
99108
region:
100109
description: Region is the AWS region in which the resource exists
@@ -105,14 +114,16 @@ spec:
105114
- region
106115
type: object
107116
conditions:
108-
description: All CRS managed by ACK have a common `Status.Conditions`
109-
member that contains a collection of `ackv1alpha1.Condition` objects
110-
that describe the various terminal states of the CR and its backend
111-
AWS service API resource
117+
description: |-
118+
All CRS managed by ACK have a common `Status.Conditions` member that
119+
contains a collection of `ackv1alpha1.Condition` objects that describe
120+
the various terminal states of the CR and its backend AWS service API
121+
resource
112122
items:
113-
description: Condition is the common struct used by all CRDs managed
114-
by ACK service controllers to indicate terminal states of the
115-
CR and its backend AWS service API resource
123+
description: |-
124+
Condition is the common struct used by all CRDs managed by ACK service
125+
controllers to indicate terminal states of the CR and its backend AWS
126+
service API resource
116127
properties:
117128
lastTransitionTime:
118129
description: Last time the condition transitioned from one status

0 commit comments

Comments
 (0)