Skip to content

Commit 54e316c

Browse files
committed
chore(*) update KTF, GWAPI, and GDR
Update KTF to to v0.46. This in turn requires migrating from deck to go-database-reconciler and migrating (most) Gateway API imports from v1beta to v1. Use stub values for FillIDs workspaces. This does not include the complete fix from 0314607 and retains the original bug from 2.x. Same name entities across workspaces will still conflict.
1 parent 956f457 commit 54e316c

File tree

108 files changed

+2412
-2354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+2412
-2354
lines changed

go.mod

Lines changed: 84 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/kong/kubernetes-ingress-controller/v2
22

3-
go 1.21
3+
go 1.21.1
4+
5+
toolchain go1.22.1
46

57
// TODO: this is disabled by FOSSA action doesn't support go 1.21's toolchain clause:
68
//
@@ -19,72 +21,87 @@ go 1.21
1921
// toolchain go1.21.0
2022

2123
require (
22-
cloud.google.com/go/container v1.26.0
24+
cloud.google.com/go/container v1.33.1
2325
github.com/Masterminds/sprig/v3 v3.2.3
24-
github.com/avast/retry-go/v4 v4.5.0
26+
github.com/avast/retry-go/v4 v4.5.1
2527
github.com/blang/semver/v4 v4.0.0
2628
github.com/bombsimon/logrusr/v4 v4.0.0
27-
github.com/go-logr/logr v1.2.4
29+
github.com/go-logr/logr v1.4.1
2830
github.com/goccy/go-json v0.10.2
2931
github.com/google/go-cmp v0.6.0
30-
github.com/google/uuid v1.4.0
32+
github.com/google/uuid v1.6.0
3133
github.com/jpillora/backoff v1.0.0
32-
github.com/kong/deck v1.26.1
33-
github.com/kong/go-kong v0.48.0
34+
github.com/kong/go-database-reconciler v1.8.0
35+
github.com/kong/go-kong v0.51.1-0.20240125175037-0c077f5b9ac7
3436
github.com/kong/kubernetes-telemetry v0.1.1
35-
github.com/kong/kubernetes-testing-framework v0.39.1
37+
github.com/kong/kubernetes-testing-framework v0.46.0
3638
github.com/lithammer/dedent v1.1.0
3739
github.com/miekg/dns v1.1.56
3840
github.com/mitchellh/mapstructure v1.5.0
3941
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
4042
github.com/oapi-codegen/runtime v1.0.0
4143
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
42-
github.com/prometheus/client_golang v1.16.0
43-
github.com/prometheus/common v0.44.0
44-
github.com/samber/lo v1.38.1
44+
github.com/prometheus/client_golang v1.18.0
45+
github.com/prometheus/common v0.45.0
46+
github.com/samber/lo v1.39.0
4547
github.com/samber/mo v1.8.0
4648
github.com/sethvargo/go-password v0.2.0
4749
github.com/sirupsen/logrus v1.9.3
48-
github.com/spf13/cobra v1.7.0
50+
github.com/spf13/cobra v1.8.0
4951
github.com/spf13/pflag v1.0.5
50-
github.com/stretchr/testify v1.8.4
51-
google.golang.org/api v0.142.0
52-
k8s.io/api v0.28.2
53-
k8s.io/apiextensions-apiserver v0.28.2
54-
k8s.io/apimachinery v0.28.2
55-
k8s.io/client-go v0.28.2
56-
k8s.io/component-base v0.28.2
52+
github.com/stretchr/testify v1.9.0
53+
google.golang.org/api v0.171.0
54+
k8s.io/api v0.29.3
55+
k8s.io/apiextensions-apiserver v0.29.3
56+
k8s.io/apimachinery v0.29.3
57+
k8s.io/client-go v0.29.3
58+
k8s.io/component-base v0.29.3
5759
knative.dev/networking v0.0.0-20230718160410-75dcd54d9510
5860
knative.dev/pkg v0.0.0-20230718152110-aef227e72ead
59-
sigs.k8s.io/controller-runtime v0.16.2
60-
sigs.k8s.io/gateway-api v0.8.1
61-
sigs.k8s.io/kustomize/api v0.14.0
62-
sigs.k8s.io/kustomize/kyaml v0.14.3
61+
sigs.k8s.io/controller-runtime v0.17.2
62+
sigs.k8s.io/gateway-api v1.0.0
63+
sigs.k8s.io/kustomize/api v0.16.0
64+
sigs.k8s.io/kustomize/kyaml v0.16.0
6365
sigs.k8s.io/yaml v1.4.0
6466
)
6567

6668
require (
69+
dario.cat/mergo v1.0.0 // indirect
6770
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
6871
github.com/blendle/zapdriver v1.3.1 // indirect
6972
github.com/bombsimon/logrusr/v3 v3.1.0 // indirect
73+
github.com/distribution/reference v0.5.0 // indirect
74+
github.com/felixge/httpsnoop v1.0.4 // indirect
7075
github.com/gammazero/deque v0.2.0 // indirect
7176
github.com/gammazero/workerpool v1.1.3 // indirect
77+
github.com/go-logr/stdr v1.2.2 // indirect
7278
github.com/google/gnostic-models v0.6.8 // indirect
7379
github.com/google/go-containerregistry v0.13.0 // indirect
7480
github.com/google/s2a-go v0.1.7 // indirect
81+
github.com/gorilla/websocket v1.5.0 // indirect
82+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
83+
github.com/moby/docker-image-spec v1.3.1 // indirect
84+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7585
github.com/onsi/ginkgo v1.16.4 // indirect
7686
github.com/puzpuzpuz/xsync/v2 v2.5.1 // indirect
7787
github.com/shoenig/go-m1cpu v0.1.6 // indirect
88+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
90+
go.opentelemetry.io/otel v1.24.0 // indirect
91+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
92+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
7893
go.uber.org/atomic v1.10.0 // indirect
79-
go.uber.org/zap v1.25.0 // indirect
80-
golang.org/x/net v0.17.0 // indirect
81-
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
82-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
83-
k8s.io/klog/v2 v2.100.1 // indirect
94+
go.uber.org/zap v1.26.0 // indirect
95+
go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28 // indirect
96+
golang.org/x/net v0.22.0 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
99+
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
100+
k8s.io/klog/v2 v2.110.1 // indirect
84101
)
85102

86103
require (
87-
cloud.google.com/go/compute v1.23.0 // indirect
104+
cloud.google.com/go/compute v1.24.0 // indirect
88105
cloud.google.com/go/compute/metadata v0.2.3 // indirect
89106
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
90107
github.com/Kong/go-diff v1.2.2 // indirect
@@ -99,39 +116,38 @@ require (
99116
github.com/cespare/xxhash/v2 v2.2.0 // indirect
100117
github.com/chai2010/gettext-go v1.0.2 // indirect
101118
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
102-
github.com/docker/distribution v2.8.2+incompatible // indirect
103-
github.com/docker/docker v24.0.6+incompatible
119+
github.com/docker/docker v26.0.0+incompatible
104120
github.com/docker/go-connections v0.4.0 // indirect
105121
github.com/docker/go-units v0.5.0 // indirect
106-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
107-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
108-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
122+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
123+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
124+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
109125
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
110126
github.com/fatih/camelcase v1.0.0 // indirect
111127
github.com/fatih/color v1.15.0 // indirect
112-
github.com/fsnotify/fsnotify v1.6.0 // indirect
128+
github.com/fsnotify/fsnotify v1.7.0 // indirect
113129
github.com/fvbommel/sortorder v1.1.0 // indirect
114130
github.com/go-errors/errors v1.4.2 // indirect
115131
github.com/go-ole/go-ole v1.2.6 // indirect
116-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
117-
github.com/go-openapi/jsonreference v0.20.2 // indirect
118-
github.com/go-openapi/swag v0.22.4 // indirect
132+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
133+
github.com/go-openapi/jsonreference v0.20.4 // indirect
134+
github.com/go-openapi/swag v0.22.7 // indirect
119135
github.com/gogo/protobuf v1.3.2 // indirect
120136
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
121-
github.com/golang/protobuf v1.5.3 // indirect
137+
github.com/golang/protobuf v1.5.4 // indirect
122138
github.com/google/btree v1.1.2 // indirect
123139
github.com/google/go-github/v48 v48.2.0 // indirect
124140
github.com/google/go-querystring v1.1.0 // indirect
125141
github.com/google/gofuzz v1.2.0 // indirect
126142
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
127-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
128-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
143+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
144+
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
129145
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
130146
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
131147
github.com/hashicorp/go-hclog v1.2.0 // indirect
132148
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
133149
github.com/hashicorp/go-memdb v1.3.4 // indirect
134-
github.com/hashicorp/go-retryablehttp v0.7.4
150+
github.com/hashicorp/go-retryablehttp v0.7.5
135151
github.com/hashicorp/golang-lru v0.5.4 // indirect
136152
github.com/hexops/gotextdiff v1.0.3 // indirect
137153
github.com/huandu/xstrings v1.4.0 // indirect
@@ -144,8 +160,7 @@ require (
144160
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
145161
github.com/mailru/easyjson v0.7.7 // indirect
146162
github.com/mattn/go-colorable v0.1.13 // indirect
147-
github.com/mattn/go-isatty v0.0.19 // indirect
148-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
163+
github.com/mattn/go-isatty v0.0.20 // indirect
149164
github.com/mitchellh/copystructure v1.2.0 // indirect
150165
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
151166
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -161,52 +176,51 @@ require (
161176
github.com/pkg/errors v0.9.1 // indirect
162177
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
163178
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
164-
github.com/prometheus/client_model v0.4.0 // indirect
165-
github.com/prometheus/procfs v0.10.1 // indirect
179+
github.com/prometheus/client_model v0.5.0 // indirect
180+
github.com/prometheus/procfs v0.12.0 // indirect
166181
github.com/russross/blackfriday/v2 v2.1.0 // indirect
167-
github.com/shirou/gopsutil/v3 v3.23.7 // indirect
182+
github.com/shirou/gopsutil/v3 v3.24.2 // indirect
168183
github.com/shopspring/decimal v1.2.0 // indirect
169184
github.com/sourcegraph/conc v0.3.0
170-
github.com/spf13/cast v1.5.1 // indirect
185+
github.com/spf13/cast v1.6.0 // indirect
171186
github.com/ssgelm/cookiejarparser v1.0.1 // indirect
172187
github.com/tidwall/gjson v1.17.0 // indirect
173188
github.com/tidwall/match v1.1.1 // indirect
174189
github.com/tidwall/pretty v1.2.1 // indirect
175-
github.com/tklauser/go-sysconf v0.3.11 // indirect
190+
github.com/tklauser/go-sysconf v0.3.12 // indirect
176191
github.com/tklauser/numcpus v0.6.1 // indirect
177192
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
178193
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
179194
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
180195
github.com/xlab/treeprint v1.2.0 // indirect
181196
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
182-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
197+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
183198
go.opencensus.io v0.24.0 // indirect
184199
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
185200
go.uber.org/multierr v1.11.0 // indirect
186-
golang.org/x/crypto v0.14.0 // indirect
187-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
188-
golang.org/x/mod v0.12.0 // indirect
189-
golang.org/x/oauth2 v0.12.0 // indirect
190-
golang.org/x/sync v0.3.0
191-
golang.org/x/sys v0.13.0 // indirect
192-
golang.org/x/term v0.13.0 // indirect
193-
golang.org/x/text v0.13.0 // indirect
194-
golang.org/x/time v0.3.0 // indirect
195-
golang.org/x/tools v0.13.0 // indirect
201+
golang.org/x/crypto v0.21.0 // indirect
202+
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
203+
golang.org/x/mod v0.14.0 // indirect
204+
golang.org/x/oauth2 v0.18.0 // indirect
205+
golang.org/x/sync v0.6.0
206+
golang.org/x/sys v0.18.0 // indirect
207+
golang.org/x/term v0.18.0 // indirect
208+
golang.org/x/text v0.14.0 // indirect
209+
golang.org/x/time v0.5.0 // indirect
210+
golang.org/x/tools v0.16.1 // indirect
196211
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
197-
google.golang.org/appengine v1.6.7 // indirect
198-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
199-
google.golang.org/grpc v1.58.2
200-
google.golang.org/protobuf v1.31.0 // indirect
212+
google.golang.org/appengine v1.6.8 // indirect
213+
google.golang.org/grpc v1.62.1
214+
google.golang.org/protobuf v1.33.0 // indirect
201215
gopkg.in/inf.v0 v0.9.1 // indirect
202216
gopkg.in/yaml.v2 v2.4.0 // indirect
203217
gopkg.in/yaml.v3 v3.0.1 // indirect
204-
k8s.io/cli-runtime v0.28.2
205-
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect
206-
k8s.io/kubectl v0.28.2
207-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
218+
k8s.io/cli-runtime v0.29.3
219+
k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect
220+
k8s.io/kubectl v0.29.3
221+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
208222
knative.dev/serving v0.38.1
209223
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
210-
sigs.k8s.io/kind v0.20.0 // indirect
211-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
224+
sigs.k8s.io/kind v0.22.0 // indirect
225+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
212226
)

0 commit comments

Comments
 (0)