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>

controllers/bucket_controller.go

@@ -166,7 +166,7 @@ func (r *BucketReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
  }
 
  // Always record readiness and duration metrics
- r.Metrics.RecordReadinessMetric(ctx, obj)
+ r.Metrics.RecordReadiness(ctx, obj)
  r.Metrics.RecordDuration(ctx, obj, start)
  }()
 
@@ -226,7 +226,7 @@ func (r *BucketReconciler) reconcile(ctx context.Context, obj *sourcev1.Bucket)
 func (r *BucketReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.Bucket) (ctrl.Result, error) {
  // Garbage collect previous advertised artifact(s) from storage
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
  }
 
  // Determine if the advertised artifact is still in storage
@@ -263,7 +263,7 @@ func (r *BucketReconciler) reconcileSource(ctx context.Context, obj *sourcev1.Bu
  }
  if err := r.Client.Get(ctx, name, secret); err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to get secret %s: %s", name.String(), err.Error())
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  // Return transient errors but wait for next interval on not found
  return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, client.IgnoreNotFound(err)
  }
@@ -398,14 +398,14 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
  // Record it on the object
  obj.Status.Artifact = artifact.DeepCopy()
  conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, "ArchivedArtifact", "Compressed source to artifact with revision %s", artifact.Revision)
- r.Events.Eventf(ctx, obj, map[string]string{
+ r.Events.EventWithMetaf(ctx, obj, map[string]string{
  "revision": obj.GetArtifact().Revision,
  }, events.EventSeverityInfo, sourcev1.GitOperationSucceedReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
 
  // Update symlink on a "best effort" basis
  url, err := r.Storage.Symlink(artifact, "latest.tar.gz")
  if err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
  }
  if url != "" {
  obj.Status.URL = url
@@ -420,7 +420,7 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
 func (r *BucketReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.Bucket) (ctrl.Result, error) {
  // Garbage collect the resource's artifacts
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
  // Return the error so we retry the failed garbage collection
  return ctrl.Result{}, err
  }

controllers/gitrepository_controller.go

@@ -173,7 +173,7 @@ func (r *GitRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques
  }
 
  // Always record readiness and duration metrics
- r.Metrics.RecordReadinessMetric(ctx, obj)
+ r.Metrics.RecordReadiness(ctx, obj)
  r.Metrics.RecordDuration(ctx, obj, start)
  }()
 
@@ -238,7 +238,7 @@ func (r *GitRepositoryReconciler) reconcile(ctx context.Context, obj *sourcev1.G
 func (r *GitRepositoryReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.GitRepository) (ctrl.Result, error) {
  // Garbage collect previous advertised artifact(s) from storage
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
  }
 
  // Determine if the advertised artifact is still in storage
@@ -291,7 +291,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
  var secret corev1.Secret
  if err = r.Client.Get(ctx, name, &secret); err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to get secret %s: %s", name.String(), err.Error())
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  // Return transient errors but wait for next interval on not found
  return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, client.IgnoreNotFound(err)
  }
@@ -300,7 +300,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
  auth, err = authStrategy.Method(secret)
  if err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to configure auth strategy: %s", err)
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  // Return err as the content of the secret may change
  return ctrl.Result{}, err
  }
@@ -313,7 +313,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
  })
  if err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.GitOperationFailedReason, "Failed to configure checkout strategy: %s", err)
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  // Do not return err as recovery without changes is impossible
  return ctrl.Result{}, nil
  }
@@ -324,7 +324,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, obj *sour
  commit, revision, err := checkoutStrategy.Checkout(gitCtx, dir, obj.Spec.URL, auth)
  if err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.GitOperationFailedReason, "Failed to checkout and determine HEAD revision: %s", err)
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GitCheckoutFailed", conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GitCheckoutFailed", conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  // Coin flip on transient or persistent error, requeue
  // TODO(hidde): likely better to detect the err type
  return ctrl.Result{}, err
@@ -399,14 +399,14 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *so
  obj.Status.Artifact = artifact.DeepCopy()
  obj.Status.IncludedArtifacts = includes
  conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, "ArchivedArtifact", "Compressed source to artifact with revision %s", artifact.Revision)
- r.Events.Eventf(ctx, obj, map[string]string{
+ r.Events.EventWithMetaf(ctx, obj, map[string]string{
  "revision": obj.GetArtifact().Revision,
  }, events.EventSeverityInfo, sourcev1.GitOperationSucceedReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
 
  // Update symlink on a "best effort" basis
  url, err := r.Storage.Symlink(artifact, "latest.tar.gz")
  if err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
  }
  if url != "" {
  obj.Status.URL = url
@@ -475,7 +475,7 @@ func (r *GitRepositoryReconciler) reconcileInclude(ctx context.Context, obj *sou
 func (r *GitRepositoryReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.GitRepository) (ctrl.Result, error) {
  // Garbage collect the resource's artifacts
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
  // Return the error so we retry the failed garbage collection
  return ctrl.Result{}, err
  }

controllers/helmchart_controller.go

@@ -202,7 +202,7 @@ func (r *HelmChartReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
  }
 
  // Always record readiness and duration metrics
- r.Metrics.RecordReadinessMetric(ctx, obj)
+ r.Metrics.RecordReadiness(ctx, obj)
  r.Metrics.RecordDuration(ctx, obj, start)
  }()
 
@@ -266,7 +266,7 @@ func (r *HelmChartReconciler) reconcile(ctx context.Context, obj *sourcev1.HelmC
 func (r *HelmChartReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.HelmChart) (ctrl.Result, error) {
  // Garbage collect previous advertised artifact(s) from storage
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
  }
 
  // Determine if the advertised artifact is still in storage
@@ -310,14 +310,14 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
  // Record it on the object
  obj.Status.Artifact = artifact.DeepCopy()
  conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, sourcev1.ChartPackageSucceededReason, "Artifact revision %s", artifact.Revision)
- r.Events.Eventf(ctx, obj, map[string]string{
+ r.Events.EventWithMetaf(ctx, obj, map[string]string{
  "revision": obj.GetArtifact().Revision,
  }, events.EventSeverityInfo, sourcev1.ChartPackageSucceededReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
 
  // Update symlink on a "best effort" basis
  u, err := r.Storage.Symlink(artifact, "latest.tar.gz")
  if err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
  }
  if u != "" {
  obj.Status.URL = u
@@ -329,7 +329,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
 func (r *HelmChartReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.HelmChart) (ctrl.Result, error) {
  // Garbage collect the resource's artifacts
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
  // Return the error so we retry the failed garbage collection
  return ctrl.Result{}, err
  }

controllers/helmchart_controller_chart.go

@@ -286,7 +286,7 @@ func (r *HelmChartReconciler) mergeChartValuesFiles(ctx context.Context, obj *so
  }
 
  conditions.MarkTrue(obj, sourcev1.ValuesFilesMergedCondition, "ModifiedValues", "Replaced chart values with merged values from: %v", valuesFiles)
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityInfo, "ModifiedValues", "Replaced chart values with merged values from: %v", valuesFiles)
+ r.Events.Eventf(ctx, obj, events.EventSeverityInfo, "ModifiedValues", "Replaced chart values with merged values from: %v", valuesFiles)
  return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, nil
 }
 

controllers/helmchart_controller_source.go

@@ -176,7 +176,7 @@ func (r *HelmChartReconciler) reconcileFromTarballArtifact(ctx context.Context,
  f, err := os.Open(r.Storage.LocalPath(artifact))
  if err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.StorageOperationFailedReason, "Could not open artifact: %s", err.Error())
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  return ctrl.Result{}, err
  }
 
@@ -190,7 +190,7 @@ func (r *HelmChartReconciler) reconcileFromTarballArtifact(ctx context.Context,
  if _, err = untar.Untar(f, dir); err != nil {
  f.Close()
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.StorageOperationFailedReason, "Decompression of artifact failed: %s", err.Error())
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  return ctrl.Result{}, err
  }
  f.Close()

controllers/helmrepository_controller.go

@@ -164,7 +164,7 @@ func (r *HelmRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reque
  }
 
  // Always record readiness and duration metrics
- r.Metrics.RecordReadinessMetric(ctx, obj)
+ r.Metrics.RecordReadiness(ctx, obj)
  r.Metrics.RecordDuration(ctx, obj, start)
  }()
 
@@ -215,7 +215,7 @@ func (r *HelmRepositoryReconciler) reconcile(ctx context.Context, obj *sourcev1.
 func (r *HelmRepositoryReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.HelmRepository) (ctrl.Result, error) {
  // Purge old artifacts from the storage
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection failed: %s", err)
  }
 
  // Determine if the artifact is still in storage
@@ -257,7 +257,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
  var secret corev1.Secret
  if err := r.Client.Get(ctx, name, &secret); err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to get secret %s: %s", name.String(), err.Error())
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  // Return transient errors but wait for next interval on not found
  return ctrl.Result{RequeueAfter: obj.Spec.Interval.Duration}, client.IgnoreNotFound(err)
  }
@@ -266,14 +266,14 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
  tmpDir, err := ioutil.TempDir("", fmt.Sprintf("%s-%s-source-", obj.Name, obj.Namespace))
  if err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.StorageOperationFailedReason, "Could not create temporary directory for credentials: %s", err.Error())
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  return ctrl.Result{}, err
  }
  defer os.RemoveAll(tmpDir)
  opts, err := helm.ClientOptionsFromSecret(secret, tmpDir)
  if err != nil {
  conditions.MarkFalse(obj, sourcev1.SourceAvailableCondition, sourcev1.AuthenticationFailedReason, "Failed to configure Helm client with secret data: %s", err)
- r.Events.Event(ctx, obj, nil, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
+ r.Events.Event(ctx, obj, events.EventSeverityError, sourcev1.AuthenticationFailedReason, conditions.Get(obj, sourcev1.SourceAvailableCondition).Message)
  // Return err as the content of the secret may change
  return ctrl.Result{}, err
  }
@@ -347,14 +347,14 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
  // Record it on the object
  obj.Status.Artifact = artifact.DeepCopy()
  conditions.MarkTrue(obj, sourcev1.ArtifactAvailableCondition, sourcev1.IndexationSucceededReason, "Artifact revision %s", artifact.Revision)
- r.Events.Eventf(ctx, obj, map[string]string{
+ r.Events.EventWithMetaf(ctx, obj, map[string]string{
  "revision": obj.GetArtifact().Revision,
  }, events.EventSeverityInfo, sourcev1.GitOperationSucceedReason, conditions.Get(obj, sourcev1.ArtifactAvailableCondition).Message)
 
  // Update symlink on a "best effort" basis
  url, err := r.Storage.Symlink(artifact, "index.yaml")
  if err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, sourcev1.StorageOperationFailedReason, "Failed to update status URL symlink: %s", err)
  }
  if url != "" {
  obj.Status.URL = url
@@ -369,7 +369,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
 func (r *HelmRepositoryReconciler) reconcileDelete(ctx context.Context, obj *sourcev1.HelmRepository) (ctrl.Result, error) {
  // Garbage collect the resource's artifacts
  if err := r.garbageCollect(obj); err != nil {
- r.Events.Eventf(ctx, obj, nil, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
+ r.Events.Eventf(ctx, obj, events.EventSeverityError, "GarbageCollectionFailed", "Garbage collection for deleted resource failed: %s", err)
  // Return the error so we retry the failed garbage collection
  return ctrl.Result{}, err
  }

controllers/suite_test.go

@@ -34,7 +34,7 @@ import (
 
  sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
  // +kubebuilder:scaffold:imports
- "github.com/fluxcd/source-controller/internal/testenv"
+ "github.com/fluxcd/pkg/runtime/testenv"
 )
 
 // These tests make use of plain Go using Gomega for assertions.