Skip to content

Commit 7dfb42a

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

32 files changed

+127
-64
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: "2023-02-03T20:32:34Z"
3-
build_hash: ef775017fc8021baf85ad3ff2ec115df7a543568
4-
go_version: go1.19.1
5-
version: v0.23.1-1-gef77501
2+
build_date: "2023-02-09T23:51:42Z"
3+
build_hash: d0f3d78cbea8061f822cbceac3786128f091efe6
4+
go_version: go1.19
5+
version: v0.24.2
66
api_directory_checksum: 6e86aa4f26729ce014485b1096286db654459af7
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

‎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/ec2-controller
9-
newTag: v1.0.0
9+
newTag: v1.0.1

‎config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ spec:
5757
description: The ID of the VPC.
5858
type: string
5959
vpcRef:
60-
description: 'AWSResourceReferenceWrapper provides a wrapper around
60+
description: "AWSResourceReferenceWrapper provides a wrapper around
6161
*AWSResourceReference type to provide more user friendly syntax
62-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
62+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
6363
properties:
6464
from:
6565
description: AWSResourceReference provides all the values necessary

‎config/crd/bases/ec2.services.k8s.aws_natgateways.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ spec:
5151
it.'
5252
type: string
5353
allocationRef:
54-
description: 'AWSResourceReferenceWrapper provides a wrapper around
54+
description: "AWSResourceReferenceWrapper provides a wrapper around
5555
*AWSResourceReference type to provide more user friendly syntax
56-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
56+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
5757
properties:
5858
from:
5959
description: AWSResourceReference provides all the values necessary
@@ -71,9 +71,9 @@ spec:
7171
description: The subnet in which to create the NAT gateway.
7272
type: string
7373
subnetRef:
74-
description: 'AWSResourceReferenceWrapper provides a wrapper around
74+
description: "AWSResourceReferenceWrapper provides a wrapper around
7575
*AWSResourceReference type to provide more user friendly syntax
76-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
76+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
7777
properties:
7878
from:
7979
description: AWSResourceReference provides all the values necessary

‎config/crd/bases/ec2.services.k8s.aws_routetables.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ spec:
138138
description: The ID of the VPC.
139139
type: string
140140
vpcRef:
141-
description: 'AWSResourceReferenceWrapper provides a wrapper around
141+
description: "AWSResourceReferenceWrapper provides a wrapper around
142142
*AWSResourceReference type to provide more user friendly syntax
143-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
143+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
144144
properties:
145145
from:
146146
description: AWSResourceReference provides all the values necessary

‎config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ spec:
209209
description: '[EC2-VPC] The ID of the VPC. Required for EC2-VPC.'
210210
type: string
211211
vpcRef:
212-
description: 'AWSResourceReferenceWrapper provides a wrapper around
212+
description: "AWSResourceReferenceWrapper provides a wrapper around
213213
*AWSResourceReference type to provide more user friendly syntax
214-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
214+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
215215
properties:
216216
from:
217217
description: AWSResourceReference provides all the values necessary

‎config/crd/bases/ec2.services.k8s.aws_subnets.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ spec:
9494
type: string
9595
routeTableRefs:
9696
items:
97-
description: 'AWSResourceReferenceWrapper provides a wrapper around
97+
description: "AWSResourceReferenceWrapper provides a wrapper around
9898
*AWSResourceReference type to provide more user friendly syntax
99-
for references using ''from'' field Ex: APIIDRef: from: name:
100-
my-api'
99+
for references using 'from' field Ex: APIIDRef: \n from: name:
100+
my-api"
101101
properties:
102102
from:
103103
description: AWSResourceReference provides all the values necessary
@@ -129,9 +129,9 @@ spec:
129129
description: The ID of the VPC.
130130
type: string
131131
vpcRef:
132-
description: 'AWSResourceReferenceWrapper provides a wrapper around
132+
description: "AWSResourceReferenceWrapper provides a wrapper around
133133
*AWSResourceReference type to provide more user friendly syntax
134-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
134+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
135135
properties:
136136
from:
137137
description: AWSResourceReference provides all the values necessary

‎config/crd/bases/ec2.services.k8s.aws_vpcendpoints.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ spec:
7878
type: array
7979
routeTableRefs:
8080
items:
81-
description: 'AWSResourceReferenceWrapper provides a wrapper around
81+
description: "AWSResourceReferenceWrapper provides a wrapper around
8282
*AWSResourceReference type to provide more user friendly syntax
83-
for references using ''from'' field Ex: APIIDRef: from: name:
84-
my-api'
83+
for references using 'from' field Ex: APIIDRef: \n from: name:
84+
my-api"
8585
properties:
8686
from:
8787
description: AWSResourceReference provides all the values necessary
@@ -100,10 +100,10 @@ spec:
100100
type: array
101101
securityGroupRefs:
102102
items:
103-
description: 'AWSResourceReferenceWrapper provides a wrapper around
103+
description: "AWSResourceReferenceWrapper provides a wrapper around
104104
*AWSResourceReference type to provide more user friendly syntax
105-
for references using ''from'' field Ex: APIIDRef: from: name:
106-
my-api'
105+
for references using 'from' field Ex: APIIDRef: \n from: name:
106+
my-api"
107107
properties:
108108
from:
109109
description: AWSResourceReference provides all the values necessary
@@ -129,10 +129,10 @@ spec:
129129
type: array
130130
subnetRefs:
131131
items:
132-
description: 'AWSResourceReferenceWrapper provides a wrapper around
132+
description: "AWSResourceReferenceWrapper provides a wrapper around
133133
*AWSResourceReference type to provide more user friendly syntax
134-
for references using ''from'' field Ex: APIIDRef: from: name:
135-
my-api'
134+
for references using 'from' field Ex: APIIDRef: \n from: name:
135+
my-api"
136136
properties:
137137
from:
138138
description: AWSResourceReference provides all the values necessary
@@ -163,9 +163,9 @@ spec:
163163
description: The ID of the VPC in which the endpoint will be used.
164164
type: string
165165
vpcRef:
166-
description: 'AWSResourceReferenceWrapper provides a wrapper around
166+
description: "AWSResourceReferenceWrapper provides a wrapper around
167167
*AWSResourceReference type to provide more user friendly syntax
168-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
168+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
169169
properties:
170170
from:
171171
description: AWSResourceReference provides all the values necessary

‎go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/ec2-controller
33
go 1.19
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.23.0
6+
github.com/aws-controllers-k8s/runtime v0.24.0
77
github.com/aws/aws-sdk-go v1.44.93
88
github.com/go-logr/logr v1.2.0
99
github.com/spf13/pflag v1.0.5
@@ -42,10 +42,12 @@ require (
4242
github.com/prometheus/client_model v0.2.0 // indirect
4343
github.com/prometheus/common v0.28.0 // indirect
4444
github.com/prometheus/procfs v0.6.0 // indirect
45+
github.com/samber/lo v1.37.0 // indirect
4546
github.com/stretchr/objx v0.2.0 // indirect
4647
go.uber.org/atomic v1.7.0 // indirect
4748
go.uber.org/multierr v1.6.0 // indirect
4849
go.uber.org/zap v1.19.1 // indirect
50+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
4951
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
5052
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
5153
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect

‎go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
6464
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
6565
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
6666
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
67-
github.com/aws-controllers-k8s/runtime v0.23.0 h1:xM/zKyFzqbSr4gN9/cMRyjUUEEezHB0inpcsSV5clkg=
68-
github.com/aws-controllers-k8s/runtime v0.23.0/go.mod h1:vBsKxMSP7Ya2Mv5KPGadu6OuIESTX+YIZB/2dOV7gXo=
67+
github.com/aws-controllers-k8s/runtime v0.24.0 h1:F53HtC1YDHXcjtlRl2Q1xU0/7TRFvy9IlMFp0rTYeWE=
68+
github.com/aws-controllers-k8s/runtime v0.24.0/go.mod h1:vBfkfwxAIULdvjHCfJNi6Pj3/QJJCrh+8uH3/ZfewVU=
6969
github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
7070
github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
7171
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -413,6 +413,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
413413
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
414414
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
415415
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
416+
github.com/samber/lo v1.37.0 h1:XjVcB8g6tgUp8rsPsJ2CvhClfImrpL04YpQHXeHPhRw=
417+
github.com/samber/lo v1.37.0/go.mod h1:9vaz2O4o8oOnK23pd2TrXufcbdbJIa3b6cstBWKpopA=
416418
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
417419
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
418420
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -523,6 +525,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
523525
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
524526
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
525527
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
528+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
529+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
526530
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
527531
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
528532
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

‎helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: ec2-chart
33
description: A Helm chart for the ACK service controller for Amazon Elastic Cloud Compute (EC2)
4-
version: v1.0.0
5-
appVersion: v1.0.0
4+
version: v1.0.1
5+
appVersion: v1.0.1
66
home: https://github.com/aws-controllers-k8s/ec2-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/crds/ec2.services.k8s.aws_internetgateways.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ spec:
5757
description: The ID of the VPC.
5858
type: string
5959
vpcRef:
60-
description: 'AWSResourceReferenceWrapper provides a wrapper around
60+
description: "AWSResourceReferenceWrapper provides a wrapper around
6161
*AWSResourceReference type to provide more user friendly syntax
62-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
62+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
6363
properties:
6464
from:
6565
description: AWSResourceReference provides all the values necessary

‎helm/crds/ec2.services.k8s.aws_natgateways.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ spec:
5151
it.'
5252
type: string
5353
allocationRef:
54-
description: 'AWSResourceReferenceWrapper provides a wrapper around
54+
description: "AWSResourceReferenceWrapper provides a wrapper around
5555
*AWSResourceReference type to provide more user friendly syntax
56-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
56+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
5757
properties:
5858
from:
5959
description: AWSResourceReference provides all the values necessary
@@ -71,9 +71,9 @@ spec:
7171
description: The subnet in which to create the NAT gateway.
7272
type: string
7373
subnetRef:
74-
description: 'AWSResourceReferenceWrapper provides a wrapper around
74+
description: "AWSResourceReferenceWrapper provides a wrapper around
7575
*AWSResourceReference type to provide more user friendly syntax
76-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
76+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
7777
properties:
7878
from:
7979
description: AWSResourceReference provides all the values necessary

‎helm/crds/ec2.services.k8s.aws_routetables.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ spec:
138138
description: The ID of the VPC.
139139
type: string
140140
vpcRef:
141-
description: 'AWSResourceReferenceWrapper provides a wrapper around
141+
description: "AWSResourceReferenceWrapper provides a wrapper around
142142
*AWSResourceReference type to provide more user friendly syntax
143-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
143+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
144144
properties:
145145
from:
146146
description: AWSResourceReference provides all the values necessary

‎helm/crds/ec2.services.k8s.aws_securitygroups.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ spec:
209209
description: '[EC2-VPC] The ID of the VPC. Required for EC2-VPC.'
210210
type: string
211211
vpcRef:
212-
description: 'AWSResourceReferenceWrapper provides a wrapper around
212+
description: "AWSResourceReferenceWrapper provides a wrapper around
213213
*AWSResourceReference type to provide more user friendly syntax
214-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
214+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
215215
properties:
216216
from:
217217
description: AWSResourceReference provides all the values necessary

‎helm/crds/ec2.services.k8s.aws_subnets.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ spec:
9494
type: string
9595
routeTableRefs:
9696
items:
97-
description: 'AWSResourceReferenceWrapper provides a wrapper around
97+
description: "AWSResourceReferenceWrapper provides a wrapper around
9898
*AWSResourceReference type to provide more user friendly syntax
99-
for references using ''from'' field Ex: APIIDRef: from: name:
100-
my-api'
99+
for references using 'from' field Ex: APIIDRef: \n from: name:
100+
my-api"
101101
properties:
102102
from:
103103
description: AWSResourceReference provides all the values necessary
@@ -129,9 +129,9 @@ spec:
129129
description: The ID of the VPC.
130130
type: string
131131
vpcRef:
132-
description: 'AWSResourceReferenceWrapper provides a wrapper around
132+
description: "AWSResourceReferenceWrapper provides a wrapper around
133133
*AWSResourceReference type to provide more user friendly syntax
134-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
134+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
135135
properties:
136136
from:
137137
description: AWSResourceReference provides all the values necessary

0 commit comments

Comments
 (0)