Use MetaDigestKey from event API

Signed-off-by: Hidde Beydals <hello@hidde.co>
fluxcd · Feb 10, 2023 · 30bb2f7 · 30bb2f7
1 parent c90ca49
commit 30bb2f7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/controllers/bucket_controller.go b/controllers/bucket_controller.go
@@ -331,7 +331,7 @@ func (r *BucketReconciler) notify(ctx context.Context, oldObj, newObj *sourcev1.
  fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
  }
  if newObj.Status.Artifact.Digest != "" {
- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
  }
 
  var oldChecksum string

diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
@@ -328,7 +328,7 @@ func (r *GitRepositoryReconciler) notify(ctx context.Context, oldObj, newObj *so
  fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
  }
  if newObj.Status.Artifact.Digest != "" {
- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
  }
 
  var oldChecksum string

diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -334,7 +334,7 @@ func (r *HelmChartReconciler) notify(ctx context.Context, oldObj, newObj *source
  fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
  }
  if newObj.Status.Artifact.Digest != "" {
- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
  }
 
  var oldChecksum string

diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -294,7 +294,7 @@ func (r *HelmRepositoryReconciler) notify(ctx context.Context, oldObj, newObj *s
  fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
  }
  if newObj.Status.Artifact.Digest != "" {
- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
  }
 
  humanReadableSize := "unknown size"

diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
  github.com/docker/cli v20.10.23+incompatible
  github.com/docker/go-units v0.5.0
  github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
- github.com/fluxcd/pkg/apis/event v0.3.0
+ github.com/fluxcd/pkg/apis/event v0.4.0
  github.com/fluxcd/pkg/apis/meta v0.19.0
  github.com/fluxcd/pkg/git v0.8.0
  github.com/fluxcd/pkg/git/gogit v0.5.0

diff --git a/go.sum b/go.sum
@@ -523,8 +523,8 @@ github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4 h1:Gm5sGGk+/Wq6Rh
 github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
 github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
 github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
-github.com/fluxcd/pkg/apis/event v0.3.0 h1:B+IXmfSniUGfoczheNAH0YULgS+ejxMl58RyWlvLa1c=
-github.com/fluxcd/pkg/apis/event v0.3.0/go.mod h1:xYOOlf+9gCBSYcs93N2XAbJvSVwuVBDBUzqhR+cAo7M=
+github.com/fluxcd/pkg/apis/event v0.4.0 h1:UPCC269KjgKgkmtiCiBq/DNue/EpXy8Tq1zFx7oRXZM=
+github.com/fluxcd/pkg/apis/event v0.4.0/go.mod h1:xYOOlf+9gCBSYcs93N2XAbJvSVwuVBDBUzqhR+cAo7M=
 github.com/fluxcd/pkg/apis/meta v0.19.0 h1:CX75e/eaRWZDTzNdMSWomY1InlssLKcS8GQDSg/aopI=
 github.com/fluxcd/pkg/apis/meta v0.19.0/go.mod h1:7b6prDPsViyAzoY7eRfSPS0/MbXpGGsOMvRq2QrTKa4=
 github.com/fluxcd/pkg/git v0.8.1-0.20230207231111-3217c53f5e07 h1:a0jO6tAuXbDKUjInc0FqewkMSj09hR6R3VMAzARQhJM=