Skip to content

Commit e449b29

Browse files
hiddecohiddeco
committed
Bump GOTK API and runtime pkgs to RC versions
This includes the removal of the `internal/testenv` package, as this is now available in `pkg/runtime`. Signed-off-by: Hidde Beydals <hello@hidde.co>
1 parent 272daf9 commit e449b29

10 files changed

+75
-318
lines changed

‎controllers/bucket_controller.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (r *BucketReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
166166
}
167167

168168
// Always record readiness and duration metrics
169-
r.Metrics.RecordReadinessMetric(ctx, obj)
169+
r.Metrics.RecordReadiness(ctx, obj)
170170
r.Metrics.RecordDuration(ctx, obj, start)
171171
}()
172172

@@ -226,7 +226,7 @@ func (r *BucketReconciler) reconcile(ctx context.Context, obj *sourcev1.Bucket)
226226
func (r *BucketReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.Bucket) (ctrl.Result, error) {
227227
// Garbage collect previous advertised artifact(s) from storage
228228
if err := r.garbageCollect(obj); err != nil {
229-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
229+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
230230
}
231231

232232
// Determine if the advertised artifact is still in storage
@@ -263,7 +263,7 @@ func (r *BucketReconciler) reconcileSource(ctx context.Context, obj *sourcev1.Bu
263263
}
264264
if err := r.Client.Get(ctx, name, secret); err != nil {
265265
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to get secret %s: %s", name.String(), err.Error())
266-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
266+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
267267
// Return transient errors but wait for next interval on not found
268268
return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, client.IgnoreNotFound(err)
269269
}
@@ -398,14 +398,14 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
398398
// Record it on the object
399399
obj.Status.Artifact = artifact.DeepCopy()
400400
conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, "ArchivedArtifact", "Compressed source to artifact with revision %s", artifact.Revision)
401-
r.Events.Eventf(ctx, obj, map[string]string{
401+
r.Events.EventWithMetaf(ctx, obj, map[string]string{
402402
"revision": obj.GetArtifact().Revision,
403403
}, events.EventSeverityInfo, sourcev1.GitOperationSucceedReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
404404

405405
// Update symlink on a "best effort" basis
406406
url, err := r.Storage.Symlink(artifact, "latest.tar.gz")
407407
if err != nil {
408-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
408+
r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
409409
}
410410
if url != "" {
411411
obj.Status.URL = url
@@ -420,7 +420,7 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
420420
func (r *BucketReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.Bucket) (ctrl.Result, error) {
421421
// Garbage collect the resource's artifacts
422422
if err := r.garbageCollect(obj); err != nil {
423-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
423+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
424424
// Return the error so we retry the failed garbage collection
425425
return ctrl.Result{}, err
426426
}

‎controllers/gitrepository_controller.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (r *GitRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques
173173
}
174174

175175
// Always record readiness and duration metrics
176-
r.Metrics.RecordReadinessMetric(ctx, obj)
176+
r.Metrics.RecordReadiness(ctx, obj)
177177
r.Metrics.RecordDuration(ctx, obj, start)
178178
}()
179179

@@ -238,7 +238,7 @@ func (r *GitRepositoryReconciler) reconcile(ctx context.Context, obj *sourcev1.G
238238
func (r *GitRepositoryReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.GitRepository) (ctrl.Result, error) {
239239
// Garbage collect previous advertised artifact(s) from storage
240240
if err := r.garbageCollect(obj); err != nil {
241-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
241+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
242242
}
243243

244244
// Determine if the advertised artifact is still in storage
@@ -291,7 +291,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
291291
var secret corev1.Secret
292292
if err = r.Client.Get(ctx, name, &secret); err != nil {
293293
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to get secret %s: %s", name.String(), err.Error())
294-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
294+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
295295
// Return transient errors but wait for next interval on not found
296296
return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, client.IgnoreNotFound(err)
297297
}
@@ -300,7 +300,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
300300
auth, err = authStrategy.Method(secret)
301301
if err != nil {
302302
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to configure auth strategy: %s", err)
303-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
303+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
304304
// Return err as the content of the secret may change
305305
return ctrl.Result{}, err
306306
}
@@ -313,7 +313,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
313313
})
314314
if err != nil {
315315
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.GitOperationFailedReason, "Failed to configure checkout strategy: %s", err)
316-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
316+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
317317
// Do not return err as recovery without changes is impossible
318318
return ctrl.Result{}, nil
319319
}
@@ -324,7 +324,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
324324
commit, revision, err := checkoutStrategy.Checkout(gitCtx, dir, obj.Spec.URL, auth)
325325
if err != nil {
326326
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.GitOperationFailedReason, "Failed to checkout and determine HEAD revision: %s", err)
327-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GitCheckoutFailed", conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
327+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GitCheckoutFailed", conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
328328
// Coin flip on transient or persistent error, requeue
329329
// TODO(hidde): likely better to detect the err type
330330
return ctrl.Result{}, err
@@ -399,14 +399,14 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *so
399399
obj.Status.Artifact = artifact.DeepCopy()
400400
obj.Status.IncludedArtifacts = includes
401401
conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, "ArchivedArtifact", "Compressed source to artifact with revision %s", artifact.Revision)
402-
r.Events.Eventf(ctx, obj, map[string]string{
402+
r.Events.EventWithMetaf(ctx, obj, map[string]string{
403403
"revision": obj.GetArtifact().Revision,
404404
}, events.EventSeverityInfo, sourcev1.GitOperationSucceedReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
405405

406406
// Update symlink on a "best effort" basis
407407
url, err := r.Storage.Symlink(artifact, "latest.tar.gz")
408408
if err != nil {
409-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
409+
r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
410410
}
411411
if url != "" {
412412
obj.Status.URL = url
@@ -475,7 +475,7 @@ func (r *GitRepositoryReconciler) reconcileInclude(ctx context.Context, obj *sou
475475
func (r *GitRepositoryReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.GitRepository) (ctrl.Result, error) {
476476
// Garbage collect the resource's artifacts
477477
if err := r.garbageCollect(obj); err != nil {
478-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
478+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
479479
// Return the error so we retry the failed garbage collection
480480
return ctrl.Result{}, err
481481
}

‎controllers/helmchart_controller.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func (r *HelmChartReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
202202
}
203203

204204
// Always record readiness and duration metrics
205-
r.Metrics.RecordReadinessMetric(ctx, obj)
205+
r.Metrics.RecordReadiness(ctx, obj)
206206
r.Metrics.RecordDuration(ctx, obj, start)
207207
}()
208208

@@ -266,7 +266,7 @@ func (r *HelmChartReconciler) reconcile(ctx context.Context, obj *sourcev1.HelmC
266266
func (r *HelmChartReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.HelmChart) (ctrl.Result, error) {
267267
// Garbage collect previous advertised artifact(s) from storage
268268
if err := r.garbageCollect(obj); err != nil {
269-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
269+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
270270
}
271271

272272
// Determine if the advertised artifact is still in storage
@@ -310,14 +310,14 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
310310
// Record it on the object
311311
obj.Status.Artifact = artifact.DeepCopy()
312312
conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, sourcev1.ChartPackageSucceededReason, "Artifact revision %s", artifact.Revision)
313-
r.Events.Eventf(ctx, obj, map[string]string{
313+
r.Events.EventWithMetaf(ctx, obj, map[string]string{
314314
"revision": obj.GetArtifact().Revision,
315315
}, events.EventSeverityInfo, sourcev1.ChartPackageSucceededReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
316316

317317
// Update symlink on a "best effort" basis
318318
u, err := r.Storage.Symlink(artifact, "latest.tar.gz")
319319
if err != nil {
320-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
320+
r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
321321
}
322322
if u != "" {
323323
obj.Status.URL = u
@@ -329,7 +329,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
329329
func (r *HelmChartReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.HelmChart) (ctrl.Result, error) {
330330
// Garbage collect the resource's artifacts
331331
if err := r.garbageCollect(obj); err != nil {
332-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
332+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
333333
// Return the error so we retry the failed garbage collection
334334
return ctrl.Result{}, err
335335
}

‎controllers/helmchart_controller_chart.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func (r *HelmChartReconciler) mergeChartValuesFiles(ctx context.Context, obj *so
286286
}
287287

288288
conditions.MarkTrue(obj, sourcev1.ValuesFilesMergedCondition, "ModifiedValues", "Replaced chart values with merged values from: %v", valuesFiles)
289-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityInfo, "ModifiedValues", "Replaced chart values with merged values from: %v", valuesFiles)
289+
r.Events.Eventf(ctx, obj, events.EventSeverityInfo, "ModifiedValues", "Replaced chart values with merged values from: %v", valuesFiles)
290290
return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, nil
291291
}
292292

‎controllers/helmchart_controller_source.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func (r *HelmChartReconciler) reconcileFromTarballArtifact(ctx context.Context,
176176
f, err := os.Open(r.Storage.LocalPath(artifact))
177177
if err != nil {
178178
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.StorageOperationFailedReason, "Could not open artifact: %s", err.Error())
179-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
179+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
180180
return ctrl.Result{}, err
181181
}
182182

@@ -190,7 +190,7 @@ func (r *HelmChartReconciler) reconcileFromTarballArtifact(ctx context.Context,
190190
if _, err = untar.Untar(f, dir); err != nil {
191191
f.Close()
192192
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.StorageOperationFailedReason, "Decompression of artifact failed: %s", err.Error())
193-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
193+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
194194
return ctrl.Result{}, err
195195
}
196196
f.Close()

‎controllers/helmrepository_controller.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (r *HelmRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reque
164164
}
165165

166166
// Always record readiness and duration metrics
167-
r.Metrics.RecordReadinessMetric(ctx, obj)
167+
r.Metrics.RecordReadiness(ctx, obj)
168168
r.Metrics.RecordDuration(ctx, obj, start)
169169
}()
170170

@@ -215,7 +215,7 @@ func (r *HelmRepositoryReconciler) reconcile(ctx context.Context, obj *sourcev1.
215215
func (r *HelmRepositoryReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.HelmRepository) (ctrl.Result, error) {
216216
// Purge old artifacts from the storage
217217
if err := r.garbageCollect(obj); err != nil {
218-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
218+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
219219
}
220220

221221
// Determine if the artifact is still in storage
@@ -257,7 +257,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
257257
var secret corev1.Secret
258258
if err := r.Client.Get(ctx, name, &secret); err != nil {
259259
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to get secret %s: %s", name.String(), err.Error())
260-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
260+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
261261
// Return transient errors but wait for next interval on not found
262262
return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, client.IgnoreNotFound(err)
263263
}
@@ -266,14 +266,14 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
266266
tmpDir, err := ioutil.TempDir("", fmt.Sprintf("%s-%s-source-", obj.Name, obj.Namespace))
267267
if err != nil {
268268
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.StorageOperationFailedReason, "Could not create temporary directory for credentials: %s", err.Error())
269-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
269+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
270270
return ctrl.Result{}, err
271271
}
272272
defer os.RemoveAll(tmpDir)
273273
opts, err := helm.ClientOptionsFromSecret(secret, tmpDir)
274274
if err != nil {
275275
conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to configure Helm client with secret data: %s", err)
276-
r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
276+
r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
277277
// Return err as the content of the secret may change
278278
return ctrl.Result{}, err
279279
}
@@ -347,14 +347,14 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
347347
// Record it on the object
348348
obj.Status.Artifact = artifact.DeepCopy()
349349
conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, sourcev1.IndexationSucceededReason, "Artifact revision %s", artifact.Revision)
350-
r.Events.Eventf(ctx, obj, map[string]string{
350+
r.Events.EventWithMetaf(ctx, obj, map[string]string{
351351
"revision": obj.GetArtifact().Revision,
352352
}, events.EventSeverityInfo, sourcev1.GitOperationSucceedReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
353353

354354
// Update symlink on a "best effort" basis
355355
url, err := r.Storage.Symlink(artifact, "index.yaml")
356356
if err != nil {
357-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
357+
r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
358358
}
359359
if url != "" {
360360
obj.Status.URL = url
@@ -369,7 +369,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
369369
func (r *HelmRepositoryReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.HelmRepository) (ctrl.Result, error) {
370370
// Garbage collect the resource's artifacts
371371
if err := r.garbageCollect(obj); err != nil {
372-
r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
372+
r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
373373
// Return the error so we retry the failed garbage collection
374374
return ctrl.Result{}, err
375375
}

‎controllers/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434

3535
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
3636
// +kubebuilder:scaffold:imports
37-
"github.com/fluxcd/source-controller/internal/testenv"
37+
"github.com/fluxcd/pkg/runtime/testenv"
3838
)
3939

4040
// These tests make use of plain Go using Gomega for assertions.

0 commit comments

Comments
 (0)