Skip to content

Commit 8fc78f1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2205 from shiftstack/k8s
🌱 Bump k8s deps to v1.31.1
2 parents a54f55a + ec609e0 commit 8fc78f1

File tree

172 files changed

+1522
-728
lines changed

Some content is hidden

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

172 files changed

+1522
-728
lines changed

‎api/v1alpha1/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,18 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/scheme"
2525
)
2626

27-
var (
28-
// SchemeGroupVersion is group version used to register these objects.
29-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha1"}
27+
// GroupName is the group name use in this package.
28+
const GroupName = "infrastructure.cluster.x-k8s.io"
29+
30+
// SchemeGroupVersion is group version used to register these objects.
31+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
3032

33+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
34+
func Resource(resource string) schema.GroupResource {
35+
return SchemeGroupVersion.WithResource(resource).GroupResource()
36+
}
37+
38+
var (
3139
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
3240
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3341

‎api/v1alpha6/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,18 @@ import (
2121
"sigs.k8s.io/controller-runtime/pkg/scheme"
2222
)
2323

24-
var (
25-
// SchemeGroupVersion is group version used to register these objects.
26-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha6"}
24+
// GroupName is the group name use in this package.
25+
const GroupName = "infrastructure.cluster.x-k8s.io"
26+
27+
// SchemeGroupVersion is group version used to register these objects.
28+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha6"}
2729

30+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
31+
func Resource(resource string) schema.GroupResource {
32+
return SchemeGroupVersion.WithResource(resource).GroupResource()
33+
}
34+
35+
var (
2836
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
2937
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3038

‎api/v1alpha7/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,18 @@ import (
2121
"sigs.k8s.io/controller-runtime/pkg/scheme"
2222
)
2323

24-
var (
25-
// SchemeGroupVersion is group version used to register these objects.
26-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha7"}
24+
// GroupName is the group name use in this package.
25+
const GroupName = "infrastructure.cluster.x-k8s.io"
26+
27+
// SchemeGroupVersion is group version used to register these objects.
28+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha7"}
2729

30+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
31+
func Resource(resource string) schema.GroupResource {
32+
return SchemeGroupVersion.WithResource(resource).GroupResource()
33+
}
34+
35+
var (
2836
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
2937
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3038

‎api/v1beta1/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,18 @@ import (
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
)
2727

28-
var (
29-
// SchemeGroupVersion is group version used to register these objects.
30-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"}
28+
// GroupName is the group name use in this package.
29+
const GroupName = "infrastructure.cluster.x-k8s.io"
30+
31+
// SchemeGroupVersion is group version used to register these objects.
32+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
3133

34+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
35+
func Resource(resource string) schema.GroupResource {
36+
return SchemeGroupVersion.WithResource(resource).GroupResource()
37+
}
38+
39+
var (
3240
// schemeBuilder is used to add go types to the GroupVersionKind scheme.
3341
schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3442

‎go.mod

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ require (
2020
golang.org/x/crypto v0.26.0
2121
golang.org/x/text v0.19.0
2222
gopkg.in/ini.v1 v1.67.0
23-
k8s.io/api v0.30.3
24-
k8s.io/apiextensions-apiserver v0.30.3
25-
k8s.io/apimachinery v0.30.3
26-
k8s.io/client-go v0.30.3
27-
k8s.io/component-base v0.30.3
23+
k8s.io/api v0.31.1
24+
k8s.io/apiextensions-apiserver v0.31.1
25+
k8s.io/apimachinery v0.31.1
26+
k8s.io/client-go v0.31.1
27+
k8s.io/component-base v0.31.1
2828
k8s.io/klog/v2 v2.130.1
29-
k8s.io/utils v0.0.0-20231127182322-b307cd553661
29+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3030
sigs.k8s.io/cluster-api v1.8.1
3131
sigs.k8s.io/cluster-api/test v1.8.1
32-
sigs.k8s.io/controller-runtime v0.18.5
32+
sigs.k8s.io/controller-runtime v0.19.1
3333
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
3434
sigs.k8s.io/yaml v1.4.0
3535
)
@@ -45,11 +45,11 @@ require (
4545
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
4646
github.com/adrg/xdg v0.5.0 // indirect
4747
github.com/alessio/shellescape v1.4.1 // indirect
48-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
48+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4949
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
5050
github.com/beorn7/perks v1.0.1 // indirect
5151
github.com/blang/semver/v4 v4.0.0 // indirect
52-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
52+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5353
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5454
github.com/cloudflare/circl v1.3.7 // indirect
5555
github.com/distribution/reference v0.6.0 // indirect
@@ -58,10 +58,10 @@ require (
5858
github.com/docker/go-units v0.4.0 // indirect
5959
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
6060
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
61-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6261
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6362
github.com/felixge/httpsnoop v1.0.4 // indirect
6463
github.com/fsnotify/fsnotify v1.7.0 // indirect
64+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6565
github.com/go-logr/stdr v1.2.2 // indirect
6666
github.com/go-logr/zapr v1.3.0 // indirect
6767
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -73,13 +73,13 @@ require (
7373
github.com/gogo/protobuf v1.3.2 // indirect
7474
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7575
github.com/golang/protobuf v1.5.4 // indirect
76-
github.com/google/cel-go v0.17.8 // indirect
76+
github.com/google/cel-go v0.20.1 // indirect
7777
github.com/google/gnostic-models v0.6.8 // indirect
7878
github.com/google/go-github/v53 v53.2.0 // indirect
7979
github.com/google/go-querystring v1.1.0 // indirect
8080
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
8181
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
82-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
82+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
8383
github.com/hashicorp/hcl v1.0.0 // indirect
8484
github.com/huandu/xstrings v1.3.3 // indirect
8585
github.com/imdario/mergo v0.3.15 // indirect
@@ -119,14 +119,15 @@ require (
119119
github.com/subosito/gotenv v1.6.0 // indirect
120120
github.com/ulikunitz/xz v0.5.12 // indirect
121121
github.com/valyala/fastjson v1.6.4 // indirect
122-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
123-
go.opentelemetry.io/otel v1.24.0 // indirect
124-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
125-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
126-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
127-
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
128-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
129-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
122+
github.com/x448/float16 v0.8.4 // indirect
123+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
124+
go.opentelemetry.io/otel v1.28.0 // indirect
125+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
126+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
127+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
128+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
129+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
130+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
130131
go.uber.org/multierr v1.11.0 // indirect
131132
go.uber.org/zap v1.27.0 // indirect
132133
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
@@ -138,22 +139,20 @@ require (
138139
golang.org/x/time v0.5.0 // indirect
139140
golang.org/x/tools v0.24.0 // indirect
140141
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
141-
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
143-
google.golang.org/grpc v1.62.2 // indirect
142+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
143+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
144+
google.golang.org/grpc v1.65.0 // indirect
144145
google.golang.org/protobuf v1.34.2 // indirect
146+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
145147
gopkg.in/inf.v0 v0.9.1 // indirect
146148
gopkg.in/yaml.v2 v2.4.0 // indirect
147149
gopkg.in/yaml.v3 v3.0.1 // indirect
148-
k8s.io/apiserver v0.30.3 // indirect
150+
k8s.io/apiserver v0.31.1 // indirect
149151
k8s.io/cluster-bootstrap v0.30.3 // indirect
150152
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
151-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
153+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
152154
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
153155
sigs.k8s.io/kind v0.23.0 // indirect
154156
)
155157

156158
replace github.com/k-orc/openstack-resource-controller => ./orc
157-
158-
// Remove as soon as commit 4cf22c51d3b540795ccd0dd4bcdcd9cad44d94d4 is included in a release of prometheus/common
159-
replace github.com/prometheus/common => github.com/prometheus/common v0.55.1-0.20240715210123-4cf22c51d3b5

0 commit comments

Comments
 (0)