Skip to content

Commit ea23398

Browse files
adds gotk events recorder to ag reconciler
Signed-off-by: Renato Vassão <renato.vassao@mindbodyonline.com>
1 parent af0fa4f commit ea23398

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

cmd/main.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2828
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
2929
_ "k8s.io/client-go/plugin/pkg/client/auth"
30+
"k8s.io/client-go/tools/record"
3031
"k8s.io/utils/ptr"
3132
ctrlruntime "sigs.k8s.io/controller-runtime"
3233
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
@@ -41,6 +42,7 @@ import (
4142
gotkacl "github.com/fluxcd/pkg/runtime/acl"
4243
gotkclient "github.com/fluxcd/pkg/runtime/client"
4344
gotkctrl "github.com/fluxcd/pkg/runtime/controller"
45+
gotkevents "github.com/fluxcd/pkg/runtime/events"
4446
gotkfeatures "github.com/fluxcd/pkg/runtime/features"
4547
gotkjitter "github.com/fluxcd/pkg/runtime/jitter"
4648
gotkelection "github.com/fluxcd/pkg/runtime/leaderelection"
@@ -184,13 +186,15 @@ func main() {
184186
// check will continue to fail until this controller instance is elected leader.
185187
gotkprobes.SetupChecks(mgr, setupLog)
186188

189+
eventRecorder := mustSetupEventRecorder(mgr, eventsAddr, controllerName)
190+
187191
// Register the ArtifactGenerator controller with the manager.
188192
if err = (&controller.ArtifactGeneratorReconciler{
189193
ControllerName: controllerName,
190194
Client: mgr.GetClient(),
191195
APIReader: mgr.GetAPIReader(),
192196
Scheme: mgr.GetScheme(),
193-
EventRecorder: mgr.GetEventRecorderFor(controllerName),
197+
EventRecorder: eventRecorder,
194198
Storage: artifactStorage,
195199
ArtifactFetchRetries: httpRetry,
196200
DependencyRequeueInterval: requeueDependency,
@@ -225,3 +229,12 @@ func main() {
225229
os.Exit(1)
226230
}
227231
}
232+
233+
func mustSetupEventRecorder(mgr ctrlruntime.Manager, eventsAddr, controllerName string) record.EventRecorder {
234+
eventRecorder, err := gotkevents.NewRecorder(mgr, ctrlruntime.Log, eventsAddr, controllerName)
235+
if err != nil {
236+
setupLog.Error(err, "unable to create event recorder")
237+
os.Exit(1)
238+
}
239+
return eventRecorder
240+
}

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ require (
4949
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
5050
github.com/fluxcd/cli-utils v0.37.1-flux.1 // indirect
5151
github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
52+
github.com/fluxcd/pkg/apis/event v0.22.0 // indirect
5253
github.com/fluxcd/pkg/lockedfile v0.7.0 // indirect
5354
github.com/fluxcd/pkg/oci v0.59.0 // indirect
5455
github.com/fluxcd/pkg/sourceignore v0.16.0 // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ github.com/fluxcd/cli-utils v0.37.1-flux.1 h1:WnG2mHxCPZMj/soIq/S/1zvbrGCJN3GJGb
6565
github.com/fluxcd/cli-utils v0.37.1-flux.1/go.mod h1:aND5wX3LuTFtB7eUT7vsWr8mmxRVSPR2Wkvbn0SqPfw=
6666
github.com/fluxcd/pkg/apis/acl v0.9.0 h1:wBpgsKT+jcyZEcM//OmZr9RiF8klL3ebrDp2u2ThsnA=
6767
github.com/fluxcd/pkg/apis/acl v0.9.0/go.mod h1:TttNS+gocsGLwnvmgVi3/Yscwqrjc17+vhgYfqkfrV4=
68+
github.com/fluxcd/pkg/apis/event v0.22.0 h1:nCW0TnneMnscSnj9NlaSKcvyC+436MbY1GyKn/4YnII=
69+
github.com/fluxcd/pkg/apis/event v0.22.0/go.mod h1:Hoi4DejaNKVahGkRXqGBjT9h1aKmhc7RCYcsgoTieqc=
6870
github.com/fluxcd/pkg/apis/meta v1.25.0 h1:fmZgMoe7yITGfhFqdOs7w2GOu3Y/2Vvz4+4p/eay3eA=
6971
github.com/fluxcd/pkg/apis/meta v1.25.0/go.mod h1:1D92RqAet0/n/cH5S0khBXweirHWkw9rCO0V4NCY6xc=
7072
github.com/fluxcd/pkg/artifact v0.7.0 h1:gACHm8Xn8K9RcZ+TuJKCYf3Av3Le3iBW7tpnxVDuHmw=

0 commit comments

Comments
 (0)