Skip to content

Commit eb0292c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3086 from Nordix/lentzi90/capi-bump
⚠️ CAPI v1.13, controller-runtime v0.23 and k8s.io v0.35
2 parents dd36cf5 + 830c3da commit eb0292c

File tree

172 files changed

+4053
-2311
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

+4053
-2311
lines changed

‎cmd/models-schema/zz_generated.openapi.go‎

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

‎controllers/openstackcluster_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
apierrors "k8s.io/apimachinery/pkg/api/errors"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
kerrors "k8s.io/apimachinery/pkg/util/errors"
34-
"k8s.io/client-go/tools/record"
34+
"k8s.io/client-go/tools/events"
3535
"k8s.io/utils/ptr"
3636
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3737
"sigs.k8s.io/cluster-api/util"
@@ -66,7 +66,7 @@ const (
6666
// OpenStackClusterReconciler reconciles a OpenStackCluster object.
6767
type OpenStackClusterReconciler struct {
6868
Client client.Client
69-
Recorder record.EventRecorder
69+
Recorder events.EventRecorder
7070
WatchFilterValue string
7171
ScopeFactory scope.Factory
7272
CaCertificates []byte // PEM encoded ca certificates.

‎controllers/openstackfloatingippool_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/runtime"
2828
"k8s.io/apimachinery/pkg/util/wait"
29-
"k8s.io/client-go/tools/record"
29+
"k8s.io/client-go/tools/events"
3030
"k8s.io/utils/ptr"
3131
ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
3232
conditions "sigs.k8s.io/cluster-api/util/conditions"
@@ -59,7 +59,7 @@ var backoff = wait.Backoff{
5959
// OpenStackFloatingIPPoolReconciler reconciles a OpenStackFloatingIPPool object.
6060
type OpenStackFloatingIPPoolReconciler struct {
6161
Client client.Client
62-
Recorder record.EventRecorder
62+
Recorder events.EventRecorder
6363
WatchFilterValue string
6464
ScopeFactory scope.Factory
6565
CaCertificates []byte // PEM encoded ca certificates.

‎controllers/openstackmachine_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/api/meta"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
kerrors "k8s.io/apimachinery/pkg/util/errors"
31-
"k8s.io/client-go/tools/record"
31+
"k8s.io/client-go/tools/events"
3232
"k8s.io/utils/ptr"
3333
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3434
ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
@@ -58,7 +58,7 @@ import (
5858
// OpenStackMachineReconciler reconciles a OpenStackMachine object.
5959
type OpenStackMachineReconciler struct {
6060
Client client.Client
61-
Recorder record.EventRecorder
61+
Recorder events.EventRecorder
6262
WatchFilterValue string
6363
ScopeFactory scope.Factory
6464
CaCertificates []byte // PEM encoded ca certificates.

‎controllers/openstackmachinetemplate_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"k8s.io/apimachinery/pkg/api/resource"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
kerrors "k8s.io/apimachinery/pkg/util/errors"
28-
"k8s.io/client-go/tools/record"
28+
"k8s.io/client-go/tools/events"
2929
"sigs.k8s.io/cluster-api/util"
3030
"sigs.k8s.io/cluster-api/util/annotations"
3131
conditions "sigs.k8s.io/cluster-api/util/conditions"
@@ -50,7 +50,7 @@ var newComputeService = compute.NewService
5050
// it only updates the .status field to allow auto-scaling.
5151
type OpenStackMachineTemplateReconciler struct {
5252
Client client.Client
53-
Recorder record.EventRecorder
53+
Recorder events.EventRecorder
5454
WatchFilterValue string
5555
ScopeFactory scope.Factory
5656
CaCertificates []byte // PEM encoded ca certificates.

‎controllers/openstackserver_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime"
3030
"k8s.io/apimachinery/pkg/types"
3131
kerrors "k8s.io/apimachinery/pkg/util/errors"
32-
"k8s.io/client-go/tools/record"
32+
"k8s.io/client-go/tools/events"
3333
"k8s.io/klog/v2"
3434
"k8s.io/utils/ptr"
3535
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -68,7 +68,7 @@ const (
6868
// OpenStackServerReconciler reconciles a OpenStackServer object.
6969
type OpenStackServerReconciler struct {
7070
Client client.Client
71-
Recorder record.EventRecorder
71+
Recorder events.EventRecorder
7272
WatchFilterValue string
7373
ScopeFactory scope.Factory
7474
CaCertificates []byte // PEM encoded ca certificates.
@@ -666,7 +666,7 @@ func (r *OpenStackServerReconciler) reconcileFloatingAddressFromPool(ctx context
666666
return nil, true, err
667667
}
668668
if claim.Status.AddressRef.Name == "" {
669-
r.Recorder.Eventf(openStackServer, corev1.EventTypeNormal, "WaitingForIPAddressClaim", "Waiting for IPAddressClaim %s/%s to be allocated", claim.Namespace, claim.Name)
669+
r.Recorder.Eventf(openStackServer, nil, corev1.EventTypeNormal, "WaitingForIPAddressClaim", "WaitingForIPAddressClaim", "Waiting for IPAddressClaim %s/%s to be allocated", claim.Namespace, claim.Name)
670670
return claim, true, nil
671671
}
672672
conditions.Set(openStackServer, metav1.Condition{
@@ -726,7 +726,7 @@ func (r *OpenStackServerReconciler) getOrCreateIPAddressClaimForFloatingAddress(
726726
return nil, err
727727
}
728728

729-
r.Recorder.Eventf(openStackServer, corev1.EventTypeNormal, "CreatingIPAddressClaim", "Creating IPAddressClaim %s/%s", claim.Namespace, claim.Name)
729+
r.Recorder.Eventf(openStackServer, nil, corev1.EventTypeNormal, "CreatingIPAddressClaim", "CreatingIPAddressClaim", "Creating IPAddressClaim %s/%s", claim.Namespace, claim.Name)
730730
scope.Logger().Info("Created IPAddressClaim", "name", claim.Name)
731731
return claim, nil
732732
}

‎go.mod‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ require (
2020
golang.org/x/crypto v0.49.0
2121
golang.org/x/text v0.35.0
2222
gopkg.in/ini.v1 v1.67.1
23-
k8s.io/api v0.34.5
24-
k8s.io/apiextensions-apiserver v0.34.5
25-
k8s.io/apimachinery v0.34.6
26-
k8s.io/client-go v0.34.5
27-
k8s.io/code-generator v0.34.5
28-
k8s.io/component-base v0.34.5
23+
k8s.io/api v0.35.2
24+
k8s.io/apiextensions-apiserver v0.35.2
25+
k8s.io/apimachinery v0.35.2
26+
k8s.io/client-go v0.35.2
27+
k8s.io/code-generator v0.35.2
28+
k8s.io/component-base v0.35.2
2929
k8s.io/klog/v2 v2.130.1
30-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
31-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32-
sigs.k8s.io/cluster-api v1.12.3
33-
sigs.k8s.io/cluster-api/test v1.12.0
34-
sigs.k8s.io/controller-runtime v0.22.5
30+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
31+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
32+
sigs.k8s.io/cluster-api v1.13.0-beta.0
33+
sigs.k8s.io/cluster-api/test v1.13.0-beta.0
34+
sigs.k8s.io/controller-runtime v0.23.3
3535
sigs.k8s.io/structured-merge-diff/v6 v6.3.2
3636
sigs.k8s.io/yaml v1.6.0
3737
)
@@ -47,14 +47,12 @@ require (
4747
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4848
github.com/Microsoft/go-winio v0.5.0 // indirect
4949
github.com/NYTimes/gziphandler v1.1.1 // indirect
50-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
5150
github.com/adrg/xdg v0.5.3 // indirect
5251
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5352
github.com/beorn7/perks v1.0.1 // indirect
5453
github.com/blang/semver/v4 v4.0.0 // indirect
5554
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
5655
github.com/cespare/xxhash/v2 v2.3.0 // indirect
57-
github.com/cloudflare/circl v1.6.3 // indirect
5856
github.com/containerd/errdefs v1.0.0 // indirect
5957
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6058
github.com/distribution/reference v0.6.0 // indirect
@@ -77,12 +75,11 @@ require (
7775
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
7876
github.com/gobuffalo/flect v1.0.3 // indirect
7977
github.com/gofrs/uuid/v5 v5.3.0 // indirect
80-
github.com/gogo/protobuf v1.3.2 // indirect
8178
github.com/google/btree v1.1.3 // indirect
8279
github.com/google/cel-go v0.26.0 // indirect
8380
github.com/google/gnostic-models v0.7.0 // indirect
84-
github.com/google/go-github/v53 v53.2.0 // indirect
85-
github.com/google/go-querystring v1.1.0 // indirect
81+
github.com/google/go-github/v82 v82.0.0 // indirect
82+
github.com/google/go-querystring v1.2.0 // indirect
8683
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
8784
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
8885
github.com/huandu/xstrings v1.5.0 // indirect
@@ -120,11 +117,11 @@ require (
120117
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
121118
github.com/spf13/afero v1.15.0 // indirect
122119
github.com/spf13/cast v1.10.0 // indirect
123-
github.com/spf13/cobra v1.10.1 // indirect
120+
github.com/spf13/cobra v1.10.2 // indirect
124121
github.com/spf13/viper v1.21.0 // indirect
125122
github.com/stoewer/go-strcase v1.3.0 // indirect
126123
github.com/subosito/gotenv v1.6.0 // indirect
127-
github.com/valyala/fastjson v1.6.4 // indirect
124+
github.com/valyala/fastjson v1.6.10 // indirect
128125
github.com/x448/float16 v0.8.4 // indirect
129126
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
130127
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
@@ -137,31 +134,30 @@ require (
137134
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
138135
go.uber.org/multierr v1.11.0 // indirect
139136
go.uber.org/zap v1.27.1 // indirect
140-
go.yaml.in/yaml/v2 v2.4.2 // indirect
137+
go.yaml.in/yaml/v2 v2.4.3 // indirect
141138
go.yaml.in/yaml/v3 v3.0.4 // indirect
142139
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
143140
golang.org/x/mod v0.33.0 // indirect
144-
golang.org/x/net v0.51.0 // indirect
145-
golang.org/x/oauth2 v0.34.0 // indirect
141+
golang.org/x/net v0.52.0 // indirect
142+
golang.org/x/oauth2 v0.36.0 // indirect
146143
golang.org/x/sync v0.20.0 // indirect
147144
golang.org/x/sys v0.42.0 // indirect
148145
golang.org/x/term v0.41.0 // indirect
149146
golang.org/x/time v0.9.0 // indirect
150147
golang.org/x/tools v0.42.0 // indirect
151-
golang.org/x/tools/go/expect v0.1.0-deprecated // indirect
152148
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
153149
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
154150
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
155151
google.golang.org/grpc v1.79.3 // indirect
156152
google.golang.org/protobuf v1.36.11 // indirect
157-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
153+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
158154
gopkg.in/inf.v0 v0.9.1 // indirect
159155
gopkg.in/yaml.v3 v3.0.1 // indirect
160-
k8s.io/apiserver v0.34.5 // indirect
161-
k8s.io/cluster-bootstrap v0.34.2 // indirect
162-
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
156+
k8s.io/apiserver v0.35.2 // indirect
157+
k8s.io/cluster-bootstrap v0.35.2 // indirect
158+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
163159
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
164-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
165-
sigs.k8s.io/kind v0.30.0 // indirect
160+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
161+
sigs.k8s.io/kind v0.31.0 // indirect
166162
sigs.k8s.io/randfill v1.0.0 // indirect
167163
)

0 commit comments

Comments
 (0)