Merge pull request #591 from fluxcd/event-annotations

stefanprodan · web-flow · commit 59c8d7b17337 · 2022-03-24T08:20:29.000+02:00
Ensure annotations are prefixed with Group FQDN
diff --git a/controllers/kustomization_controller.go b/controllers/kustomization_controller.go
@@ -283,7 +283,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		kustomization.Spec.Interval.Duration.String())
 	log.Info(msg, "revision", source.GetArtifact().Revision)
 	r.event(ctx, reconciledKustomization, source.GetArtifact().Revision, events.EventSeverityInfo,
-		msg, map[string]string{"commit_status": "update"})
+		msg, map[string]string{kustomizev1.GroupVersion.Group + "/commit_status": "update"})
 	return ctrl.Result{RequeueAfter: kustomization.Spec.Interval.Duration}, nil
 }
 
diff --git a/go.mod b/go.mod
@@ -194,7 +194,7 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 )
 
-// pin kustomize to v4.4.1
+// pin kustomize to v4.5.2
 replace (
 	sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.10.1
 	sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.0

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques`
`283`	`283`	`kustomization.Spec.Interval.Duration.String())`
`284`	`284`	`log.Info(msg, "revision", source.GetArtifact().Revision)`
`285`	`285`	`r.event(ctx, reconciledKustomization, source.GetArtifact().Revision, events.EventSeverityInfo,`
`286`		`- msg, map[string]string{"commit_status": "update"})`
	`286`	`+ msg, map[string]string{kustomizev1.GroupVersion.Group + "/commit_status": "update"})`
`287`	`287`	`return ctrl.Result{RequeueAfter: kustomization.Spec.Interval.Duration}, nil`
`288`	`288`	`}`
`289`	`289`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ require (`
`194`	`194`	`sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect`
`195`	`195`	`)`
`196`	`196`
`197`		`-// pin kustomize to v4.4.1`
	`197`	`+// pin kustomize to v4.5.2`
`198`	`198`	`replace (`
`199`	`199`	`sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.10.1`
`200`	`200`	`sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.0`