Skip to content

Commit b2e4f11

Browse files
dependabot[bot]shreddedbacon
dependabot[bot]
and
shreddedbacon
authored
chore(deps): bump the gomod group with 6 updates (#38)
* chore(deps): bump the gomod group with 6 updates Bumps the gomod group with 6 updates: | Package | From | To | | --- | --- | --- | | [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.27.3` | `2.28.1` | | [github.com/onsi/gomega](https://github.com/onsi/gomega) | `1.38.2` | `1.39.0` | | [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) | `0.22.4` | `0.23.1` | | [github.com/lib/pq](https://github.com/lib/pq) | `1.10.9` | `1.11.1` | | [go.mongodb.org/mongo-driver](https://github.com/mongodb/mongo-go-driver) | `1.17.6` | `1.17.8` | | [golang.org/x/text](https://github.com/golang/text) | `0.31.0` | `0.33.0` | Updates `github.com/onsi/ginkgo/v2` from 2.27.3 to 2.28.1 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.27.3...v2.28.1) Updates `github.com/onsi/gomega` from 1.38.2 to 1.39.0 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.38.2...v1.39.0) Updates `sigs.k8s.io/controller-runtime` from 0.22.4 to 0.23.1 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.22.4...v0.23.1) Updates `github.com/lib/pq` from 1.10.9 to 1.11.1 - [Release notes](https://github.com/lib/pq/releases) - [Changelog](https://github.com/lib/pq/blob/master/CHANGELOG.md) - [Commits](lib/pq@v1.10.9...v1.11.1) Updates `go.mongodb.org/mongo-driver` from 1.17.6 to 1.17.8 - [Release notes](https://github.com/mongodb/mongo-go-driver/releases) - [Commits](mongodb/mongo-go-driver@v1.17.6...v1.17.8) Updates `golang.org/x/text` from 0.31.0 to 0.33.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.31.0...v0.33.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.28.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gomod - dependency-name: github.com/onsi/gomega dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gomod - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.23.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gomod - dependency-name: github.com/lib/pq dependency-version: 1.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gomod - dependency-name: go.mongodb.org/mongo-driver dependency-version: 1.17.8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gomod - dependency-name: golang.org/x/text dependency-version: 0.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gomod ... Signed-off-by: dependabot[bot] <support@github.com> * chore: fix lint issue with deprecated method --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: shreddedbacon <shreddedbacon@users.noreply.github.com>
1 parent 42657b3 commit b2e4f11

8 files changed

+80
-101
lines changed

‎go.mod‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module github.com/uselagoon/dbaas-controller
33
go 1.25.0
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.27.3
7-
github.com/onsi/gomega v1.38.2
6+
github.com/onsi/ginkgo/v2 v2.28.1
7+
github.com/onsi/gomega v1.39.0
88
github.com/prometheus/client_golang v1.23.2
99
k8s.io/api v0.35.0
1010
k8s.io/apimachinery v0.35.0
1111
k8s.io/client-go v0.35.0
12-
sigs.k8s.io/controller-runtime v0.22.4
12+
sigs.k8s.io/controller-runtime v0.23.1
1313
)
1414

1515
require (
@@ -29,12 +29,12 @@ require (
2929
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
3030
go.yaml.in/yaml/v2 v2.4.3 // indirect
3131
go.yaml.in/yaml/v3 v3.0.4 // indirect
32-
golang.org/x/crypto v0.45.0 // indirect
33-
golang.org/x/mod v0.29.0 // indirect
34-
golang.org/x/sync v0.18.0 // indirect
32+
golang.org/x/crypto v0.47.0 // indirect
33+
golang.org/x/mod v0.32.0 // indirect
34+
golang.org/x/sync v0.19.0 // indirect
3535
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
3636
sigs.k8s.io/randfill v1.0.0 // indirect
37-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
37+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
3838
)
3939

4040
require (
@@ -50,14 +50,13 @@ require (
5050
github.com/go-openapi/jsonreference v0.21.0 // indirect
5151
github.com/go-openapi/swag v0.23.0 // indirect
5252
github.com/go-sql-driver/mysql v1.9.3
53-
github.com/gogo/protobuf v1.3.2 // indirect
5453
github.com/google/gnostic-models v0.7.0 // indirect
5554
github.com/google/go-cmp v0.7.0
56-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
55+
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
5756
github.com/google/uuid v1.6.0 // indirect
5857
github.com/josharian/intern v1.0.0 // indirect
5958
github.com/json-iterator/go v1.1.12 // indirect
60-
github.com/lib/pq v1.10.9
59+
github.com/lib/pq v1.11.1
6160
github.com/mailru/easyjson v0.9.0 // indirect
6261
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6362
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
@@ -66,21 +65,21 @@ require (
6665
github.com/prometheus/common v0.66.1 // indirect
6766
github.com/prometheus/procfs v0.16.1 // indirect
6867
github.com/spf13/pflag v1.0.9 // indirect
69-
go.mongodb.org/mongo-driver v1.17.6
68+
go.mongodb.org/mongo-driver v1.17.8
7069
go.uber.org/multierr v1.11.0 // indirect
7170
go.uber.org/zap v1.27.0 // indirect
72-
golang.org/x/net v0.47.0 // indirect
71+
golang.org/x/net v0.49.0 // indirect
7372
golang.org/x/oauth2 v0.30.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
73+
golang.org/x/sys v0.40.0 // indirect
74+
golang.org/x/term v0.39.0 // indirect
75+
golang.org/x/text v0.33.0
7776
golang.org/x/time v0.9.0 // indirect
78-
golang.org/x/tools v0.38.0 // indirect
77+
golang.org/x/tools v0.41.0 // indirect
7978
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8079
google.golang.org/protobuf v1.36.8 // indirect
8180
gopkg.in/inf.v0 v0.9.1 // indirect
8281
gopkg.in/yaml.v3 v3.0.1 // indirect
83-
k8s.io/apiextensions-apiserver v0.34.1 // indirect
82+
k8s.io/apiextensions-apiserver v0.35.0 // indirect
8483
k8s.io/klog/v2 v2.130.1 // indirect
8584
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
8685
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect

‎go.sum‎

Lines changed: 32 additions & 54 deletions
Large diffs are not rendered by default.

‎internal/controller/databaserequest_controller.go‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/runtime"
3232
"k8s.io/apimachinery/pkg/types"
33-
"k8s.io/client-go/tools/record"
33+
"k8s.io/client-go/tools/events"
3434
ctrl "sigs.k8s.io/controller-runtime"
3535
"sigs.k8s.io/controller-runtime/pkg/client"
3636
"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -84,7 +84,7 @@ var (
8484
type DatabaseRequestReconciler struct {
8585
client.Client
8686
Scheme *runtime.Scheme
87-
Recorder record.EventRecorder
87+
Recorder events.EventRecorder
8888
RelationalDatabaseClient database.RelationalDatabaseInterface
8989
Locks sync.Map
9090
}
@@ -144,7 +144,7 @@ func (r *DatabaseRequestReconciler) Reconcile(ctx context.Context, req ctrl.Requ
144144
if databaseRequest.Status.Conditions != nil && meta.IsStatusConditionTrue(databaseRequest.Status.Conditions, "Ready") {
145145
if databaseRequest.Status.ObservedGeneration >= databaseRequest.Generation {
146146
logger.Info("No updates to reconcile")
147-
r.Recorder.Event(databaseRequest, v1.EventTypeNormal, "ReconcileSkipped", "No updates to reconcile")
147+
r.Recorder.Eventf(databaseRequest, databaseRequest, v1.EventTypeNormal, "ReconcileSkipped", "No updates to reconcile", "No updates to reconcile")
148148
return ctrl.Result{}, nil
149149
}
150150
}
@@ -235,7 +235,7 @@ func (r *DatabaseRequestReconciler) Reconcile(ctx context.Context, req ctrl.Requ
235235
return r.handleError(ctx, databaseRequest, "update-status", err, false)
236236
}
237237
}
238-
r.Recorder.Event(databaseRequest, "Normal", "DatabaseRequestUpdated", "The database request has been updated")
238+
r.Recorder.Eventf(databaseRequest, databaseRequest, "Normal", "DatabaseRequestUpdated", "The database request has been updated", "The database request has been updated")
239239
} else {
240240
// set the status condition to true if the database request has been created
241241
if meta.SetStatusCondition(&databaseRequest.Status.Conditions, metav1.Condition{
@@ -248,7 +248,7 @@ func (r *DatabaseRequestReconciler) Reconcile(ctx context.Context, req ctrl.Requ
248248
return r.handleError(ctx, databaseRequest, "update-status", err, false)
249249
}
250250
}
251-
r.Recorder.Event(databaseRequest, "Normal", "DatabaseRequestUnchanged", "The database request has been created")
251+
r.Recorder.Eventf(databaseRequest, databaseRequest, "Normal", "DatabaseRequestUnchanged", "The database request has been created", "The database request has been created")
252252
}
253253
return ctrl.Result{}, nil
254254
}
@@ -264,7 +264,7 @@ func (r *DatabaseRequestReconciler) handleError(
264264
promDatabaseRequestReconcileErrorCounter.With(
265265
promLabels(databaseRequest, promErr)).Inc()
266266
promDatabaseRequestReconcileStatus.With(promLabels(databaseRequest, "")).Set(0)
267-
r.Recorder.Event(databaseRequest, v1.EventTypeWarning, "ReconcileError", err.Error())
267+
r.Recorder.Eventf(databaseRequest, databaseRequest, v1.EventTypeWarning, "ReconcileError", err.Error(), err.Error())
268268

269269
// set status condition to false
270270
meta.SetStatusCondition(&databaseRequest.Status.Conditions, metav1.Condition{
@@ -365,7 +365,7 @@ func (r *DatabaseRequestReconciler) handleService(
365365
}, service); err != nil {
366366
if apierrors.IsNotFound(err) {
367367
log.FromContext(ctx).Info("Creating service", "service", serviceName)
368-
r.Recorder.Event(databaseRequest, "Normal", "CreateService", "Creating service")
368+
r.Recorder.Eventf(databaseRequest, databaseRequest, "Normal", "CreateService", "Creating service", "Creating service")
369369
service = &v1.Service{
370370
ObjectMeta: metav1.ObjectMeta{
371371
Name: serviceName,
@@ -390,7 +390,7 @@ func (r *DatabaseRequestReconciler) handleService(
390390
// update the service if the hostname has changed
391391
if service.Spec.ExternalName != dbInfo.hostName {
392392
log.FromContext(ctx).Info("Updating service", "service", service.Name, "hostname", dbInfo.hostName)
393-
r.Recorder.Event(databaseRequest, "Normal", "UpdateService", "Updating service")
393+
r.Recorder.Eventf(databaseRequest, databaseRequest, "Normal", "UpdateService", "Updating service", "Updating service")
394394
service.Spec.ExternalName = dbInfo.hostName
395395
if err := r.Update(ctx, service); err != nil {
396396
return false, fmt.Errorf("failed to update service %s: %w", serviceName, err)
@@ -414,7 +414,7 @@ func (r *DatabaseRequestReconciler) handleSecret(
414414
}, secret); err != nil {
415415
if apierrors.IsNotFound(err) {
416416
log.FromContext(ctx).Info("Creating secret", "secret", databaseRequest.Name)
417-
r.Recorder.Event(databaseRequest, "Normal", "CreateSecret", "Creating secret")
417+
r.Recorder.Eventf(databaseRequest, databaseRequest, "Normal", "CreateSecret", "Creating secret", "Creating secret")
418418
secret = &v1.Secret{
419419
ObjectMeta: metav1.ObjectMeta{
420420
Name: databaseRequest.Name,
@@ -436,7 +436,7 @@ func (r *DatabaseRequestReconciler) handleSecret(
436436
diff := cmp.Diff(secret.Data, dbInfo.getSecretData(databaseRequest.Spec.Name, serviceName))
437437
if diff != "" {
438438
log.FromContext(ctx).Info("Updating secret due to diff")
439-
r.Recorder.Event(databaseRequest, "Normal", "UpdateSecret", "Updating secret")
439+
r.Recorder.Eventf(databaseRequest, databaseRequest, "Normal", "UpdateSecret", "Updating secret", "Updating secret")
440440
secret.Data = dbInfo.getSecretData(databaseRequest.Spec.Name, serviceName)
441441
if err := r.Update(ctx, secret); err != nil {
442442
return false, fmt.Errorf("failed to update secret %s, %w", databaseRequest.Name, err)
@@ -498,11 +498,13 @@ func (r *DatabaseRequestReconciler) deleteDatabase(
498498
}
499499
}
500500
// record the event
501-
r.Recorder.Event(
501+
r.Recorder.Eventf(
502+
databaseRequest,
502503
databaseRequest,
503504
v1.EventTypeNormal,
504505
"DeletedDatabase",
505506
fmt.Sprintf("Deleted database %s/%s", databaseRequest.Namespace, databaseRequest.Name),
507+
fmt.Sprintf("Deleted database %s/%s", databaseRequest.Namespace, databaseRequest.Name),
506508
)
507509
// cleanup metrics
508510
promDatabaseRequestReconcileStatus.DeletePartialMatch(prometheus.Labels{
@@ -585,7 +587,7 @@ func (r *DatabaseRequestReconciler) SetupWithManager(mgr ctrl.Manager, maxConcur
585587
promDatabaseRequestReconcileErrorCounter,
586588
promDatabaseRequestReconcileStatus,
587589
)
588-
r.Recorder = mgr.GetEventRecorderFor("DatabaseRequestReconciler")
590+
r.Recorder = mgr.GetEventRecorder("DatabaseRequestReconciler")
589591
return ctrl.NewControllerManagedBy(mgr).
590592
For(&crdv1alpha1.DatabaseRequest{}).
591593
// do only reconcile on spec changes

‎internal/controller/databaserequest_controller_test.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/errors"
2626
"k8s.io/apimachinery/pkg/labels"
2727
"k8s.io/apimachinery/pkg/types"
28-
"k8s.io/client-go/tools/record"
28+
"k8s.io/client-go/tools/events"
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3131

@@ -147,7 +147,7 @@ var _ = Describe("DatabaseRequest Controller", func() {
147147

148148
It("should successfully reconcile the resource", func() {
149149
By("Reconciling the created resource")
150-
fakeRecoder := record.NewFakeRecorder(100)
150+
fakeRecoder := events.NewFakeRecorder(100)
151151
controllerReconciler := &DatabaseRequestReconciler{
152152
Client: k8sClient,
153153
Scheme: k8sClient.Scheme(),

‎internal/controller/mongodbprovider_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/api/meta"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/runtime"
27-
"k8s.io/client-go/tools/record"
27+
"k8s.io/client-go/tools/events"
2828
ctrl "sigs.k8s.io/controller-runtime"
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030
"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -74,7 +74,7 @@ var (
7474
type MongoDBProviderReconciler struct {
7575
client.Client
7676
Scheme *runtime.Scheme
77-
Recorder record.EventRecorder
77+
Recorder events.EventRecorder
7878
MongoDBClient mongodb.MongoDBInterface
7979
}
8080

@@ -124,7 +124,7 @@ func (r *MongoDBProviderReconciler) Reconcile(ctx context.Context, req ctrl.Requ
124124
if instance.Status.Conditions != nil && meta.IsStatusConditionTrue(instance.Status.Conditions, "Ready") {
125125
if instance.Status.ObservedGeneration >= instance.Generation {
126126
logger.Info("Skipping reconcile: generation has not changed")
127-
r.Recorder.Event(instance, v1.EventTypeNormal, "ReconcileSkipped", "No updates to reconcile")
127+
r.Recorder.Eventf(instance, instance, v1.EventTypeNormal, "ReconcileSkipped", "No updates to reconcile", "No updates to reconcile")
128128
return ctrl.Result{}, nil
129129
}
130130
}
@@ -262,7 +262,7 @@ func (r *MongoDBProviderReconciler) Reconcile(ctx context.Context, req ctrl.Requ
262262
return ctrl.Result{}, err
263263
}
264264

265-
r.Recorder.Event(instance, v1.EventTypeNormal, "Reconciled", "MongoDBProvider reconciled")
265+
r.Recorder.Eventf(instance, instance, v1.EventTypeNormal, "Reconciled", "MongoDBProvider reconciled", "MongoDBProvider reconciled")
266266
promMongoDBProviderStatus.WithLabelValues(req.Name, instance.Spec.Selector).Set(1)
267267
return ctrl.Result{}, nil
268268
}
@@ -275,7 +275,7 @@ func (r *MongoDBProviderReconciler) handleError(
275275
) (ctrl.Result, error) {
276276
promMongoDBProviderReconcileErrorCounter.WithLabelValues(instance.Name, instance.Spec.Selector, promErr).Inc()
277277
promMongoDBProviderStatus.WithLabelValues(instance.Name, instance.Spec.Selector).Set(0)
278-
r.Recorder.Event(instance, v1.EventTypeWarning, errTypeToEventReason(promErr), err.Error())
278+
r.Recorder.Eventf(instance, instance, v1.EventTypeWarning, errTypeToEventReason(promErr), err.Error(), err.Error())
279279

280280
// set the status condition
281281
meta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
@@ -308,7 +308,7 @@ func (r *MongoDBProviderReconciler) SetupWithManager(mgr ctrl.Manager) error {
308308
promMongoDBProviderStatus,
309309
promMongoDBProviderConnectionVersion,
310310
)
311-
r.Recorder = mgr.GetEventRecorderFor("mongodbprovider-controller")
311+
r.Recorder = mgr.GetEventRecorder("mongodbprovider-controller")
312312
return ctrl.NewControllerManagedBy(mgr).
313313
For(&crdv1alpha1.MongoDBProvider{}).
314314
WithEventFilter(predicate.GenerationChangedPredicate{}).

‎internal/controller/mongodbprovider_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
v1 "k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/errors"
2626
"k8s.io/apimachinery/pkg/types"
27-
"k8s.io/client-go/tools/record"
27+
"k8s.io/client-go/tools/events"
2828
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2929

3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -104,7 +104,7 @@ var _ = Describe("MongoDBProvider Controller", func() {
104104
})
105105
It("should successfully reconcile the resource", func() {
106106
By("Reconciling the created resource")
107-
fakeRecorder := record.NewFakeRecorder(100)
107+
fakeRecorder := events.NewFakeRecorder(100)
108108
controllerReconciler := &MongoDBProviderReconciler{
109109
Client: k8sClient,
110110
Scheme: k8sClient.Scheme(),

‎internal/controller/relationaldatabaseprovider_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/runtime"
2727
"k8s.io/apimachinery/pkg/types"
28-
"k8s.io/client-go/tools/record"
28+
"k8s.io/client-go/tools/events"
2929
ctrl "sigs.k8s.io/controller-runtime"
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -75,7 +75,7 @@ var (
7575
type RelationalDatabaseProviderReconciler struct {
7676
client.Client
7777
Scheme *runtime.Scheme
78-
Recorder record.EventRecorder
78+
Recorder events.EventRecorder
7979
RelDBClient database.RelationalDatabaseInterface
8080
}
8181

@@ -121,7 +121,7 @@ func (r *RelationalDatabaseProviderReconciler) Reconcile(ctx context.Context, re
121121
if instance.Status.Conditions != nil && meta.IsStatusConditionTrue(instance.Status.Conditions, "Ready") {
122122
if instance.Status.ObservedGeneration >= instance.Generation {
123123
logger.Info("No updates to reconcile")
124-
r.Recorder.Event(instance, v1.EventTypeNormal, "ReconcileSkipped", "No updates to reconcile")
124+
r.Recorder.Eventf(instance, instance, v1.EventTypeNormal, "ReconcileSkipped", "No updates to reconcile", "No updates to reconcile")
125125
return ctrl.Result{}, nil
126126
}
127127
}
@@ -279,7 +279,7 @@ func (r *RelationalDatabaseProviderReconciler) Reconcile(ctx context.Context, re
279279
return ctrl.Result{}, err
280280
}
281281

282-
r.Recorder.Event(instance, "Normal", "Reconciled", "RelationalDatabaseProvider reconciled")
282+
r.Recorder.Eventf(instance, instance, "Normal", "Reconciled", "RelationalDatabaseProvider reconciled", "RelationalDatabaseProvider reconciled")
283283
promRelationalDatabaseProviderStatus.WithLabelValues(instance.Spec.Type, req.Name, instance.Spec.Selector).Set(1)
284284
return ctrl.Result{}, nil
285285
}
@@ -294,7 +294,7 @@ func (r *RelationalDatabaseProviderReconciler) handleError(
294294
promRelationalDatabaseProviderReconcileErrorCounter.WithLabelValues(
295295
instance.Spec.Type, instance.Name, instance.Spec.Selector, promErr).Inc()
296296
promRelationalDatabaseProviderStatus.WithLabelValues(instance.Spec.Type, instance.Name, instance.Spec.Selector).Set(0)
297-
r.Recorder.Event(instance, v1.EventTypeWarning, errTypeToEventReason(promErr), err.Error())
297+
r.Recorder.Eventf(instance, instance, v1.EventTypeWarning, errTypeToEventReason(promErr), err.Error(), err.Error())
298298

299299
// set the status condition to false
300300
meta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
@@ -355,7 +355,7 @@ func (r *RelationalDatabaseProviderReconciler) SetupWithManager(mgr ctrl.Manager
355355
promRelationalDatabaseProviderStatus,
356356
promRelationalDatabaseProviderConnectionVersion,
357357
)
358-
r.Recorder = mgr.GetEventRecorderFor("relationaldatabaseprovider_controller")
358+
r.Recorder = mgr.GetEventRecorder("relationaldatabaseprovider_controller")
359359
return ctrl.NewControllerManagedBy(mgr).
360360
For(&crdv1alpha1.RelationalDatabaseProvider{}).
361361
WithEventFilter(predicate.GenerationChangedPredicate{}).

‎internal/controller/relationaldatabaseprovider_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
v1 "k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/errors"
2626
"k8s.io/apimachinery/pkg/types"
27-
"k8s.io/client-go/tools/record"
27+
"k8s.io/client-go/tools/events"
2828
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2929

3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -113,7 +113,7 @@ var _ = Describe("RelationalDatabaseProvider Controller", func() {
113113
})
114114
It("should successfully reconcile the resource", func() {
115115
By("Reconciling the created resource")
116-
fakeRecorder := record.NewFakeRecorder(100)
116+
fakeRecorder := events.NewFakeRecorder(100)
117117
controllerReconciler := &RelationalDatabaseProviderReconciler{
118118
Client: k8sClient,
119119
Scheme: k8sClient.Scheme(),

0 commit comments

Comments
 (0)