Skip to content

Commit c8c2eec

Browse files
stefanprodanstefanprodan
committed
Update fluxcd/pkg/runtime to v0.1.0
Signed-off-by: Stefan Prodan <[email protected]>
1 parent 198303a commit c8c2eec

File tree

7 files changed

+28
-31
lines changed

7 files changed

+28
-31
lines changed

‎controllers/bucket_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"sigs.k8s.io/controller-runtime/pkg/client"
4040
"sigs.k8s.io/controller-runtime/pkg/controller"
4141

42-
"github.com/fluxcd/pkg/recorder"
42+
"github.com/fluxcd/pkg/runtime/events"
4343
"github.com/fluxcd/pkg/runtime/predicates"
4444

4545
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
@@ -52,7 +52,7 @@ type BucketReconciler struct {
5252
Scheme *runtime.Scheme
5353
Storage *Storage
5454
EventRecorder kuberecorder.EventRecorder
55-
ExternalEventRecorder *recorder.EventRecorder
55+
ExternalEventRecorder *events.Recorder
5656
}
5757

5858
// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=buckets,verbs=get;list;watch;create;update;patch;delete
@@ -87,7 +87,7 @@ func (r *BucketReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
8787
if containsString(bucket.ObjectMeta.Finalizers, sourcev1.SourceFinalizer) {
8888
// Our finalizer is still present, so lets handle garbage collection
8989
if err := r.gc(bucket, true); err != nil {
90-
r.event(bucket, recorder.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
90+
r.event(bucket, events.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
9191
// Return the error so we retry the failed garbage collection
9292
return ctrl.Result{}, err
9393
}
@@ -126,13 +126,13 @@ func (r *BucketReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
126126

127127
// if reconciliation failed, record the failure and requeue immediately
128128
if reconcileErr != nil {
129-
r.event(reconciledBucket, recorder.EventSeverityError, reconcileErr.Error())
129+
r.event(reconciledBucket, events.EventSeverityError, reconcileErr.Error())
130130
return ctrl.Result{Requeue: true}, reconcileErr
131131
}
132132

133133
// emit revision change event
134134
if bucket.Status.Artifact == nil || reconciledBucket.Status.Artifact.Revision != bucket.Status.Artifact.Revision {
135-
r.event(reconciledBucket, recorder.EventSeverityInfo, sourcev1.BucketReadyMessage(reconciledBucket))
135+
r.event(reconciledBucket, events.EventSeverityInfo, sourcev1.BucketReadyMessage(reconciledBucket))
136136
}
137137

138138
log.Info(fmt.Sprintf("Reconciliation finished in %s, next run in %s",

‎controllers/gitrepository_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"sigs.k8s.io/controller-runtime/pkg/client"
3838
"sigs.k8s.io/controller-runtime/pkg/controller"
3939

40-
"github.com/fluxcd/pkg/recorder"
40+
"github.com/fluxcd/pkg/runtime/events"
4141
"github.com/fluxcd/pkg/runtime/predicates"
4242

4343
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
@@ -51,7 +51,7 @@ type GitRepositoryReconciler struct {
5151
Scheme *runtime.Scheme
5252
Storage *Storage
5353
EventRecorder kuberecorder.EventRecorder
54-
ExternalEventRecorder *recorder.EventRecorder
54+
ExternalEventRecorder *events.Recorder
5555
}
5656

5757
// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories,verbs=get;list;watch;create;update;patch;delete
@@ -86,7 +86,7 @@ func (r *GitRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
8686
if containsString(repository.ObjectMeta.Finalizers, sourcev1.SourceFinalizer) {
8787
// Our finalizer is still present, so lets handle garbage collection
8888
if err := r.gc(repository, true); err != nil {
89-
r.event(repository, recorder.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
89+
r.event(repository, events.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
9090
// Return the error so we retry the failed garbage collection
9191
return ctrl.Result{}, err
9292
}
@@ -125,13 +125,13 @@ func (r *GitRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
125125

126126
// if reconciliation failed, record the failure and requeue immediately
127127
if reconcileErr != nil {
128-
r.event(reconciledRepository, recorder.EventSeverityError, reconcileErr.Error())
128+
r.event(reconciledRepository, events.EventSeverityError, reconcileErr.Error())
129129
return ctrl.Result{Requeue: true}, reconcileErr
130130
}
131131

132132
// emit revision change event
133133
if repository.Status.Artifact == nil || reconciledRepository.Status.Artifact.Revision != repository.Status.Artifact.Revision {
134-
r.event(reconciledRepository, recorder.EventSeverityInfo, sourcev1.GitRepositoryReadyMessage(reconciledRepository))
134+
r.event(reconciledRepository, events.EventSeverityInfo, sourcev1.GitRepositoryReadyMessage(reconciledRepository))
135135
}
136136

137137
log.Info(fmt.Sprintf("Reconciliation finished in %s, next run in %s",

‎controllers/helmchart_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"sigs.k8s.io/controller-runtime/pkg/client"
4141
"sigs.k8s.io/controller-runtime/pkg/controller"
4242

43-
"github.com/fluxcd/pkg/recorder"
43+
"github.com/fluxcd/pkg/runtime/events"
4444
"github.com/fluxcd/pkg/runtime/predicates"
4545
"github.com/fluxcd/pkg/untar"
4646

@@ -56,7 +56,7 @@ type HelmChartReconciler struct {
5656
Storage *Storage
5757
Getters getter.Providers
5858
EventRecorder kuberecorder.EventRecorder
59-
ExternalEventRecorder *recorder.EventRecorder
59+
ExternalEventRecorder *events.Recorder
6060
}
6161

6262
// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmcharts,verbs=get;list;watch;create;update;patch;delete
@@ -91,7 +91,7 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
9191
if containsString(chart.ObjectMeta.Finalizers, sourcev1.SourceFinalizer) {
9292
// Our finalizer is still present, so lets handle garbage collection
9393
if err := r.gc(chart, true); err != nil {
94-
r.event(chart, recorder.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
94+
r.event(chart, events.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
9595
// Return the error so we retry the failed garbage collection
9696
return ctrl.Result{}, err
9797
}
@@ -163,13 +163,13 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
163163

164164
// If reconciliation failed, record the failure and requeue immediately
165165
if reconcileErr != nil {
166-
r.event(reconciledChart, recorder.EventSeverityError, reconcileErr.Error())
166+
r.event(reconciledChart, events.EventSeverityError, reconcileErr.Error())
167167
return ctrl.Result{Requeue: true}, reconcileErr
168168
}
169169

170170
// Emit an event if we did not have an artifact before, or the revision has changed
171171
if chart.Status.Artifact == nil || reconciledChart.Status.Artifact.Revision != chart.Status.Artifact.Revision {
172-
r.event(reconciledChart, recorder.EventSeverityInfo, sourcev1.HelmChartReadyMessage(reconciledChart))
172+
r.event(reconciledChart, events.EventSeverityInfo, sourcev1.HelmChartReadyMessage(reconciledChart))
173173
}
174174

175175
log.Info(fmt.Sprintf("Reconciliation finished in %s, next run in %s",

‎controllers/helmrepository_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"sigs.k8s.io/controller-runtime/pkg/controller"
3838
"sigs.k8s.io/yaml"
3939

40-
"github.com/fluxcd/pkg/recorder"
40+
"github.com/fluxcd/pkg/runtime/events"
4141
"github.com/fluxcd/pkg/runtime/predicates"
4242

4343
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
@@ -52,7 +52,7 @@ type HelmRepositoryReconciler struct {
5252
Storage *Storage
5353
Getters getter.Providers
5454
EventRecorder kuberecorder.EventRecorder
55-
ExternalEventRecorder *recorder.EventRecorder
55+
ExternalEventRecorder *events.Recorder
5656
}
5757

5858
// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmrepositories,verbs=get;list;watch;create;update;patch;delete
@@ -88,7 +88,7 @@ func (r *HelmRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
8888
if containsString(repository.ObjectMeta.Finalizers, sourcev1.SourceFinalizer) {
8989
// Our finalizer is still present, so lets handle garbage collection
9090
if err := r.gc(repository, true); err != nil {
91-
r.event(repository, recorder.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
91+
r.event(repository, events.EventSeverityError, fmt.Sprintf("garbage collection for deleted resource failed: %s", err.Error()))
9292
// Return the error so we retry the failed garbage collection
9393
return ctrl.Result{}, err
9494
}
@@ -127,13 +127,13 @@ func (r *HelmRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
127127

128128
// if reconciliation failed, record the failure and requeue immediately
129129
if reconcileErr != nil {
130-
r.event(reconciledRepository, recorder.EventSeverityError, reconcileErr.Error())
130+
r.event(reconciledRepository, events.EventSeverityError, reconcileErr.Error())
131131
return ctrl.Result{Requeue: true}, reconcileErr
132132
}
133133

134134
// emit revision change event
135135
if repository.Status.Artifact == nil || reconciledRepository.Status.Artifact.Revision != repository.Status.Artifact.Revision {
136-
r.event(reconciledRepository, recorder.EventSeverityInfo, sourcev1.HelmRepositoryReadyMessage(reconciledRepository))
136+
r.event(reconciledRepository, events.EventSeverityInfo, sourcev1.HelmRepositoryReadyMessage(reconciledRepository))
137137
}
138138

139139
log.Info(fmt.Sprintf("Reconciliation finished in %s, next run in %s",

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ require (
1010
github.com/fluxcd/pkg/gittestserver v0.0.2
1111
github.com/fluxcd/pkg/helmtestserver v0.0.1
1212
github.com/fluxcd/pkg/lockedfile v0.0.5
13-
github.com/fluxcd/pkg/recorder v0.0.6
14-
github.com/fluxcd/pkg/runtime v0.0.6
13+
github.com/fluxcd/pkg/runtime v0.1.0
1514
github.com/fluxcd/pkg/ssh v0.0.5
1615
github.com/fluxcd/pkg/untar v0.0.5
1716
github.com/fluxcd/source-controller/api v0.1.0

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,8 @@ github.com/fluxcd/pkg/helmtestserver v0.0.1 h1:8RcLZdg7Zr9ZqyijsIIASjjMXQtF4UWP4
212212
github.com/fluxcd/pkg/helmtestserver v0.0.1/go.mod h1:GR8LriiU7PqZSTH4Xe6Cimpig2VVPB29PeUXJjNJYfA=
213213
github.com/fluxcd/pkg/lockedfile v0.0.5 h1:C3T8wfdff1UY1bvplmCkGOLrdMWJHO8Q8+tdlEXJYzQ=
214214
github.com/fluxcd/pkg/lockedfile v0.0.5/go.mod h1:uAtPUBId6a2RqO84MTH5HKGX0SbM1kNW3Wr/FhYyDVA=
215-
github.com/fluxcd/pkg/recorder v0.0.6 h1:me/n8syeeGXz50OXoPX3jgIj9AtinvhHdKT9Dy+MbHs=
216-
github.com/fluxcd/pkg/recorder v0.0.6/go.mod h1:IfQxfVRSNsWs3B0Yp5B6ObEWwKHILlAx8N7XkoDdhFg=
217-
github.com/fluxcd/pkg/runtime v0.0.6 h1:m7qwr2wRePs1vzVlM0Y88vitXSsv1lb3QCJflRpa3qQ=
218-
github.com/fluxcd/pkg/runtime v0.0.6/go.mod h1:iLjncjktQVpqpb1NsY2fW+UYDFOtVyt+yJrxqrrK8A0=
215+
github.com/fluxcd/pkg/runtime v0.1.0 h1:mCLj5GlQZqWtK3tvtZTmfgFOLsTUY1iqg3CmEyS1nRs=
216+
github.com/fluxcd/pkg/runtime v0.1.0/go.mod h1:OXkrYtDLw3GhclbzvnzfSktUyxRmC3FFhXj0tVVaIX8=
219217
github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A=
220218
github.com/fluxcd/pkg/ssh v0.0.5/go.mod h1:7jXPdXZpc0ttMNz2kD9QuMi3RNn/e0DOFbj0Tij/+Hs=
221219
github.com/fluxcd/pkg/testserver v0.0.2 h1:SoaMtO9cE5p/wl2zkGudzflnEHd9mk68CGjZOo7w0Uk=
@@ -407,8 +405,8 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh
407405
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
408406
github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
409407
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
410-
github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
411-
github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
408+
github.com/hashicorp/go-retryablehttp v0.6.7 h1:8/CAEZt/+F7kR7GevNHulKkUjLht3CPmn7egmhieNKo=
409+
github.com/hashicorp/go-retryablehttp v0.6.7/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
412410
github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
413411
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
414412
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=

‎main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
3434
ctrl "sigs.k8s.io/controller-runtime"
3535

36-
"github.com/fluxcd/pkg/recorder"
36+
"github.com/fluxcd/pkg/runtime/events"
3737
"github.com/fluxcd/pkg/runtime/logger"
3838

3939
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
@@ -88,9 +88,9 @@ func main() {
8888

8989
ctrl.SetLogger(logger.NewLogger(logLevel, logJSON))
9090

91-
var eventRecorder *recorder.EventRecorder
91+
var eventRecorder *events.Recorder
9292
if eventsAddr != "" {
93-
if er, err := recorder.NewEventRecorder(eventsAddr, "source-controller"); err != nil {
93+
if er, err := events.NewRecorder(eventsAddr, "source-controller"); err != nil {
9494
setupLog.Error(err, "unable to create event recorder")
9595
os.Exit(1)
9696
} else {

0 commit comments

Comments
 (0)