Skip to content

Commit 2919800

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.20.1, code-generator v0.20.1 (#51)
### Update to ACK runtime `v0.20.1`, code-generator `v0.20.1` ---------- * ACK code-generator `v0.20.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.20.1) * ACK runtime `v0.20.1` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.20.1) ---------- NOTE: This PR increments the release version of service controller from `v0.1.6` to `v0.1.7` Once this PR is merged, release `v0.1.7` will be automatically created for `eks-controller` **Please close this PR, if you do not want the new patch release for `eks-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building eks-controller ==== Copying common custom resource definitions into eks Building Kubernetes API objects for eks Generating deepcopy code for eks Generating custom resource definitions for eks Building service controller for eks Generating RBAC manifests for eks Running gofmt against generated code for eks Updating additional GitHub repository maintenance files ==== building eks-controller release artifacts ==== Building release artifacts for eks-v0.1.7 Generating common custom resource definitions Generating custom resource definitions for eks Generating RBAC manifests for eks ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 07dec72 commit 2919800

22 files changed

+144
-172
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ack_generate_info:
2-
build_date: "2022-09-06T13:13:07Z"
3-
build_hash: 585f06bbd6d4cc1b738acb85901e7a009bf452c7
2+
build_date: "2022-09-12T19:36:34Z"
3+
build_hash: 2944c8772f216656d84ee02d392eaca501274c1e
44
go_version: go1.17.5
5-
version: v0.20.0
6-
api_directory_checksum: 7b070fe012124ee552759771abc96d313cd2be43
5+
version: v0.20.1
6+
api_directory_checksum: 9ccbf1f9bf7c5ee745f5b55fe465211dd2bb109a
77
api_version: v1alpha1
8-
aws_sdk_go_version: v1.42.28
8+
aws_sdk_go_version: v1.44.93
99
generator_config_info:
1010
file_checksum: 5f43816010007fa46c7804e1ad4e9493b2820744
1111
original_file_name: generator.yaml

‎apis/v1alpha1/addon.go

Lines changed: 18 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/enums.go

Lines changed: 11 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/nodegroup.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/types.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/eks-controller
9-
newTag: v0.1.6
9+
newTag: v0.1.7

‎config/crd/bases/eks.services.k8s.aws_addons.yaml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
87
creationTimestamp: null
98
name: addons.eks.services.k8s.aws
109
spec:
@@ -52,8 +51,7 @@ spec:
5251
clusterRef:
5352
description: 'AWSResourceReferenceWrapper provides a wrapper around
5453
*AWSResourceReference type to provide more user friendly syntax
55-
for references using ''from'' field Ex: APIIDRef: from: name:
56-
my-api'
54+
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
5755
properties:
5856
from:
5957
description: AWSResourceReference provides all the values necessary
@@ -68,8 +66,20 @@ spec:
6866
names returned by DescribeAddonVersions (https://docs.aws.amazon.com/eks/latest/APIReference/API_DescribeAddonVersions.html).
6967
type: string
7068
resolveConflicts:
71-
description: How to resolve parameter value conflicts when migrating
72-
an existing add-on to an Amazon EKS add-on.
69+
description: "How to resolve field value conflicts for an Amazon EKS
70+
add-on. Conflicts are handled based on the value you choose: \n
71+
* None – If the self-managed version of the add-on is installed
72+
on your cluster, Amazon EKS doesn't change the value. Creation of
73+
the add-on might fail. \n * Overwrite – If the self-managed version
74+
of the add-on is installed on your cluster and the Amazon EKS default
75+
value is different than the existing value, Amazon EKS changes the
76+
value to the Amazon EKS default value. \n * Preserve – Not supported.
77+
You can set this value when updating an add-on though. For more
78+
information, see UpdateAddon (https://docs.aws.amazon.com/eks/latest/APIReference/API_UpdateAddon.html).
79+
\n If you don't currently have the self-managed version of the add-on
80+
installed on your cluster, the Amazon EKS add-on is installed. Amazon
81+
EKS sets all values to default values, regardless of the option
82+
that you specify."
7383
type: string
7484
serviceAccountRoleARN:
7585
description: "The Amazon Resource Name (ARN) of an existing IAM role
@@ -87,8 +97,7 @@ spec:
8797
serviceAccountRoleRef:
8898
description: 'AWSResourceReferenceWrapper provides a wrapper around
8999
*AWSResourceReference type to provide more user friendly syntax
90-
for references using ''from'' field Ex: APIIDRef: from: name:
91-
my-api'
100+
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
92101
properties:
93102
from:
94103
description: AWSResourceReference provides all the values necessary
@@ -207,9 +216,3 @@ spec:
207216
storage: true
208217
subresources:
209218
status: {}
210-
status:
211-
acceptedNames:
212-
kind: ""
213-
plural: ""
214-
conditions: []
215-
storedVersions: []

‎config/crd/bases/eks.services.k8s.aws_clusters.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
87
creationTimestamp: null
98
name: clusters.eks.services.k8s.aws
109
spec:
@@ -121,8 +120,8 @@ spec:
121120
items:
122121
description: 'AWSResourceReferenceWrapper provides a wrapper
123122
around *AWSResourceReference type to provide more user friendly
124-
syntax for references using ''from'' field Ex: APIIDRef: from: name:
125-
my-api'
123+
syntax for references using ''from'' field Ex: APIIDRef: from:
124+
name: my-api'
126125
properties:
127126
from:
128127
description: AWSResourceReference provides all the values
@@ -143,8 +142,8 @@ spec:
143142
items:
144143
description: 'AWSResourceReferenceWrapper provides a wrapper
145144
around *AWSResourceReference type to provide more user friendly
146-
syntax for references using ''from'' field Ex: APIIDRef: from: name:
147-
my-api'
145+
syntax for references using ''from'' field Ex: APIIDRef: from:
146+
name: my-api'
148147
properties:
149148
from:
150149
description: AWSResourceReference provides all the values
@@ -167,8 +166,7 @@ spec:
167166
roleRef:
168167
description: 'AWSResourceReferenceWrapper provides a wrapper around
169168
*AWSResourceReference type to provide more user friendly syntax
170-
for references using ''from'' field Ex: APIIDRef: from: name:
171-
my-api'
169+
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
172170
properties:
173171
from:
174172
description: AWSResourceReference provides all the values necessary
@@ -312,9 +310,3 @@ spec:
312310
storage: true
313311
subresources:
314312
status: {}
315-
status:
316-
acceptedNames:
317-
kind: ""
318-
plural: ""
319-
conditions: []
320-
storedVersions: []

‎config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
87
creationTimestamp: null
98
name: fargateprofiles.eks.services.k8s.aws
109
spec:
@@ -48,8 +47,7 @@ spec:
4847
clusterRef:
4948
description: 'AWSResourceReferenceWrapper provides a wrapper around
5049
*AWSResourceReference type to provide more user friendly syntax
51-
for references using ''from'' field Ex: APIIDRef: from: name:
52-
my-api'
50+
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
5351
properties:
5452
from:
5553
description: AWSResourceReference provides all the values necessary
@@ -74,8 +72,7 @@ spec:
7472
podExecutionRoleRef:
7573
description: 'AWSResourceReferenceWrapper provides a wrapper around
7674
*AWSResourceReference type to provide more user friendly syntax
77-
for references using ''from'' field Ex: APIIDRef: from: name:
78-
my-api'
75+
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
7976
properties:
8077
from:
8178
description: AWSResourceReference provides all the values necessary
@@ -105,7 +102,7 @@ spec:
105102
items:
106103
description: 'AWSResourceReferenceWrapper provides a wrapper around
107104
*AWSResourceReference type to provide more user friendly syntax
108-
for references using ''from'' field Ex: APIIDRef: from: name:
105+
for references using ''from'' field Ex: APIIDRef: from: name:
109106
my-api'
110107
properties:
111108
from:
@@ -215,9 +212,3 @@ spec:
215212
storage: true
216213
subresources:
217214
status: {}
218-
status:
219-
acceptedNames:
220-
kind: ""
221-
plural: ""
222-
conditions: []
223-
storedVersions: []

0 commit comments

Comments
 (0)