Skip to content

Commit 2869df7

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

8 files changed

Lines changed: 217 additions & 211 deletions

File tree

ATTRIBUTION.md

Lines changed: 80 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ THE SOFTWARE.
833833

834834
License Identifier: BSD-3-Clause
835835

836-
Copyright 2009 The Go Authors.
836+
Copyright (c) 2009 The Go Authors. All rights reserved.
837837

838838
Redistribution and use in source and binary forms, with or without
839839
modification, are permitted provided that the following conditions are
@@ -845,7 +845,7 @@ notice, this list of conditions and the following disclaimer.
845845
copyright notice, this list of conditions and the following disclaimer
846846
in the documentation and/or other materials provided with the
847847
distribution.
848-
* Neither the name of Google LLC nor the names of its
848+
* Neither the name of Google Inc. nor the names of its
849849
contributors may be used to endorse or promote products derived from
850850
this software without specific prior written permission.
851851

@@ -1413,19 +1413,21 @@ Subdependencies:
14131413
* `github.com/aws/smithy-go`
14141414
* `github.com/cenkalti/backoff/v4`
14151415
* `github.com/go-logr/logr`
1416+
* `github.com/go-logr/zapr`
14161417
* `github.com/google/go-cmp`
14171418
* `github.com/itchyny/gojq`
14181419
* `github.com/jaypipes/envutil`
1420+
* `github.com/micahhausler/aws-iam-policy`
14191421
* `github.com/pkg/errors`
14201422
* `github.com/prometheus/client_golang`
1421-
* `github.com/samber/lo`
14221423
* `github.com/spf13/pflag`
14231424
* `github.com/stretchr/testify`
14241425
* `go.uber.org/zap`
14251426
* `k8s.io/api`
14261427
* `k8s.io/apimachinery`
14271428
* `k8s.io/client-go`
14281429
* `k8s.io/klog/v2`
1430+
* `k8s.io/utils`
14291431
* `sigs.k8s.io/controller-runtime`
14301432
* `github.com/aws/aws-sdk-go-v2/feature/ec2/imds`
14311433
* `github.com/aws/aws-sdk-go-v2/internal/configsources`
@@ -1443,15 +1445,11 @@ Subdependencies:
14431445
* `github.com/evanphx/json-patch/v5`
14441446
* `github.com/fsnotify/fsnotify`
14451447
* `github.com/fxamacker/cbor/v2`
1446-
* `github.com/go-logr/zapr`
14471448
* `github.com/go-openapi/jsonpointer`
14481449
* `github.com/go-openapi/jsonreference`
14491450
* `github.com/go-openapi/swag`
1450-
* `github.com/gogo/protobuf`
1451-
* `github.com/golang/protobuf`
14521451
* `github.com/google/btree`
14531452
* `github.com/google/gnostic-models`
1454-
* `github.com/google/gofuzz`
14551453
* `github.com/google/uuid`
14561454
* `github.com/itchyny/timefmt-go`
14571455
* `github.com/josharian/intern`
@@ -1467,25 +1465,25 @@ Subdependencies:
14671465
* `github.com/stretchr/objx`
14681466
* `github.com/x448/float16`
14691467
* `go.uber.org/multierr`
1470-
* `golang.org/x/exp`
1468+
* `go.yaml.in/yaml/v2`
1469+
* `go.yaml.in/yaml/v3`
14711470
* `golang.org/x/net`
14721471
* `golang.org/x/oauth2`
14731472
* `golang.org/x/sync`
14741473
* `golang.org/x/sys`
14751474
* `golang.org/x/term`
14761475
* `golang.org/x/text`
14771476
* `golang.org/x/time`
1478-
* `golang.org/x/tools`
14791477
* `gomodules.xyz/jsonpatch/v2`
14801478
* `google.golang.org/protobuf`
14811479
* `gopkg.in/evanphx/json-patch.v4`
14821480
* `gopkg.in/inf.v0`
14831481
* `gopkg.in/yaml.v3`
14841482
* `k8s.io/apiextensions-apiserver`
14851483
* `k8s.io/kube-openapi`
1486-
* `k8s.io/utils`
14871484
* `sigs.k8s.io/json`
1488-
* `sigs.k8s.io/structured-merge-diff/v4`
1485+
* `sigs.k8s.io/randfill`
1486+
* `sigs.k8s.io/structured-merge-diff/v6`
14891487
* `sigs.k8s.io/yaml`
14901488

14911489
#### github.com/aws/aws-sdk-go-v2
@@ -1522,12 +1520,57 @@ License Identifier: Apache-2.0
15221520

15231521

15241522

1523+
#### github.com/micahhausler/aws-iam-policy
1524+
1525+
License Identifier: MIT
1526+
1527+
The MIT License (MIT)
1528+
1529+
Copyright (c) 2023, Micah Hausler
15251530

1531+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
1532+
1533+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
15261534

1535+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15271536

15281537

15291538

15301539

1540+
1541+
#### github.com/spf13/pflag
1542+
1543+
License Identifier: BSD-3-Clause
1544+
1545+
Copyright (c) 2012 Alex Ogier. All rights reserved.
1546+
Copyright (c) 2012 The Go Authors. All rights reserved.
1547+
1548+
Redistribution and use in source and binary forms, with or without
1549+
modification, are permitted provided that the following conditions are
1550+
met:
1551+
1552+
* Redistributions of source code must retain the above copyright
1553+
notice, this list of conditions and the following disclaimer.
1554+
* Redistributions in binary form must reproduce the above
1555+
copyright notice, this list of conditions and the following disclaimer
1556+
in the documentation and/or other materials provided with the
1557+
distribution.
1558+
* Neither the name of Google Inc. nor the names of its
1559+
contributors may be used to endorse or promote products derived from
1560+
this software without specific prior written permission.
1561+
1562+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1563+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1564+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1565+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1566+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1567+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1568+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1569+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1570+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1571+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1572+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1573+
15311574
#### github.com/stretchr/testify
15321575

15331576
License Identifier: MIT
@@ -1570,6 +1613,8 @@ License Identifier: Apache-2.0
15701613

15711614

15721615

1616+
1617+
15731618
#### sigs.k8s.io/controller-runtime
15741619

15751620
License Identifier: Apache-2.0
@@ -1680,12 +1725,6 @@ SOFTWARE.
16801725

16811726

16821727

1683-
1684-
1685-
1686-
1687-
1688-
16891728
#### github.com/google/btree
16901729

16911730
License Identifier: Apache-2.0
@@ -1707,8 +1746,6 @@ License Identifier: Apache-2.0
17071746

17081747

17091748

1710-
1711-
17121749

17131750
#### github.com/pmezard/go-difflib
17141751

@@ -1803,7 +1840,13 @@ SOFTWARE.
18031840

18041841

18051842

1843+
#### go.yaml.in/yaml/v2
18061844

1845+
License Identifier: Apache-2.0
1846+
1847+
#### go.yaml.in/yaml/v3
1848+
1849+
License Identifier: Apache-2.0
18071850

18081851

18091852

@@ -1849,38 +1892,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
18491892

18501893

18511894

1852-
#### golang.org/x/tools
1853-
1854-
License Identifier: BSD-3-Clause
1855-
1856-
Copyright 2009 The Go Authors.
1857-
1858-
Redistribution and use in source and binary forms, with or without
1859-
modification, are permitted provided that the following conditions are
1860-
met:
1861-
1862-
* Redistributions of source code must retain the above copyright
1863-
notice, this list of conditions and the following disclaimer.
1864-
* Redistributions in binary form must reproduce the above
1865-
copyright notice, this list of conditions and the following disclaimer
1866-
in the documentation and/or other materials provided with the
1867-
distribution.
1868-
* Neither the name of Google LLC nor the names of its
1869-
contributors may be used to endorse or promote products derived from
1870-
this software without specific prior written permission.
1871-
1872-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1873-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1874-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1875-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1876-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1877-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1878-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1879-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1880-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1881-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1882-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1883-
18841895

18851896

18861897

@@ -1915,6 +1926,24 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
19151926
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
19161927
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19171928

1929+
1930+
1931+
1932+
1933+
1934+
1935+
1936+
1937+
1938+
1939+
#### sigs.k8s.io/randfill
1940+
1941+
License Identifier: Apache-2.0
1942+
1943+
#### sigs.k8s.io/structured-merge-diff/v6
1944+
1945+
License Identifier: Apache-2.0
1946+
19181947
### github.com/aws/aws-sdk-go
19191948

19201949
License Identifier: Apache-2.0

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ack_generate_info:
2-
build_date: "2026-03-09T22:45:30Z"
2+
build_date: "2026-03-11T22:08:06Z"
33
build_hash: 5ac6c79fbc941c426d8b70cba768820fc9296542
4-
go_version: go1.26.0
4+
go_version: go1.25.7
55
version: v0.58.0
66
api_directory_checksum: d82f4d79382f6fe41728ddbdfb5ec025b658575f
77
api_version: v1alpha1

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/apigateway-controller
9-
newTag: 1.4.1
9+
newTag: 1.4.2

go.mod

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
module github.com/aws-controllers-k8s/apigateway-controller
22

3-
go 1.24.0
4-
5-
toolchain go1.24.1
3+
go 1.25.0
64

75
require (
86
github.com/aws-controllers-k8s/ec2-controller v1.2.15
9-
github.com/aws-controllers-k8s/runtime v0.57.0
7+
github.com/aws-controllers-k8s/runtime v0.58.0
108
github.com/aws/aws-sdk-go v1.55.0
119
github.com/aws/aws-sdk-go-v2 v1.36.0
1210
github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.10
1311
github.com/aws/smithy-go v1.22.2
14-
github.com/go-logr/logr v1.4.2
15-
github.com/spf13/pflag v1.0.5
16-
github.com/stretchr/testify v1.9.0
17-
k8s.io/api v0.32.1
18-
k8s.io/apimachinery v0.32.1
19-
k8s.io/client-go v0.32.1
20-
sigs.k8s.io/controller-runtime v0.20.4
12+
github.com/go-logr/logr v1.4.3
13+
github.com/spf13/pflag v1.0.9
14+
github.com/stretchr/testify v1.11.1
15+
k8s.io/api v0.35.0
16+
k8s.io/apimachinery v0.35.0
17+
k8s.io/client-go v0.35.0
18+
sigs.k8s.io/controller-runtime v0.23.0
2119
)
2220

2321
require (
@@ -36,20 +34,17 @@ require (
3634
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3735
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3836
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
39-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
37+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4038
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
41-
github.com/fsnotify/fsnotify v1.7.0 // indirect
42-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
39+
github.com/fsnotify/fsnotify v1.9.0 // indirect
40+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4341
github.com/go-logr/zapr v1.3.0 // indirect
4442
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4543
github.com/go-openapi/jsonreference v0.20.2 // indirect
4644
github.com/go-openapi/swag v0.23.0 // indirect
47-
github.com/gogo/protobuf v1.3.2 // indirect
48-
github.com/golang/protobuf v1.5.4 // indirect
4945
github.com/google/btree v1.1.3 // indirect
50-
github.com/google/gnostic-models v0.6.8 // indirect
51-
github.com/google/go-cmp v0.6.0 // indirect
52-
github.com/google/gofuzz v1.2.0 // indirect
46+
github.com/google/gnostic-models v0.7.0 // indirect
47+
github.com/google/go-cmp v0.7.0 // indirect
5348
github.com/google/uuid v1.6.0 // indirect
5449
github.com/itchyny/gojq v0.12.6 // indirect
5550
github.com/itchyny/timefmt-go v0.1.3 // indirect
@@ -58,37 +53,39 @@ require (
5853
github.com/josharian/intern v1.0.0 // indirect
5954
github.com/json-iterator/go v1.1.12 // indirect
6055
github.com/mailru/easyjson v0.7.7 // indirect
56+
github.com/micahhausler/aws-iam-policy v0.4.4 // indirect
6157
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
62-
github.com/modern-go/reflect2 v1.0.2 // indirect
58+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6359
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6460
github.com/pkg/errors v0.9.1 // indirect
6561
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
66-
github.com/prometheus/client_golang v1.19.1 // indirect
67-
github.com/prometheus/client_model v0.6.1 // indirect
68-
github.com/prometheus/common v0.55.0 // indirect
69-
github.com/prometheus/procfs v0.15.1 // indirect
70-
github.com/samber/lo v1.37.0 // indirect
62+
github.com/prometheus/client_golang v1.23.2 // indirect
63+
github.com/prometheus/client_model v0.6.2 // indirect
64+
github.com/prometheus/common v0.66.1 // indirect
65+
github.com/prometheus/procfs v0.16.1 // indirect
7166
github.com/x448/float16 v0.8.4 // indirect
7267
go.uber.org/multierr v1.11.0 // indirect
7368
go.uber.org/zap v1.27.0 // indirect
74-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
75-
golang.org/x/net v0.38.0 // indirect
76-
golang.org/x/oauth2 v0.27.0 // indirect
77-
golang.org/x/sync v0.12.0 // indirect
78-
golang.org/x/sys v0.31.0 // indirect
79-
golang.org/x/term v0.30.0 // indirect
80-
golang.org/x/text v0.23.0 // indirect
81-
golang.org/x/time v0.7.0 // indirect
69+
go.yaml.in/yaml/v2 v2.4.3 // indirect
70+
go.yaml.in/yaml/v3 v3.0.4 // indirect
71+
golang.org/x/net v0.47.0 // indirect
72+
golang.org/x/oauth2 v0.30.0 // indirect
73+
golang.org/x/sync v0.18.0 // indirect
74+
golang.org/x/sys v0.38.0 // indirect
75+
golang.org/x/term v0.37.0 // indirect
76+
golang.org/x/text v0.31.0 // indirect
77+
golang.org/x/time v0.9.0 // indirect
8278
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
83-
google.golang.org/protobuf v1.35.1 // indirect
84-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
79+
google.golang.org/protobuf v1.36.8 // indirect
80+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
8581
gopkg.in/inf.v0 v0.9.1 // indirect
8682
gopkg.in/yaml.v3 v3.0.1 // indirect
87-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
83+
k8s.io/apiextensions-apiserver v0.35.0 // indirect
8884
k8s.io/klog/v2 v2.130.1 // indirect
89-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
90-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
91-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
92-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
93-
sigs.k8s.io/yaml v1.4.0 // indirect
85+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
86+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
87+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
88+
sigs.k8s.io/randfill v1.0.0 // indirect
89+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
90+
sigs.k8s.io/yaml v1.6.0 // indirect
9491
)

0 commit comments

Comments
 (0)