diff --git a/api/go.mod b/api/go.mod index 235bc7a..94600dc 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,7 +3,7 @@ module github.com/fluxcd/notification-controller/api go 1.15 require ( - github.com/fluxcd/pkg/apis/meta v0.0.2 + github.com/fluxcd/pkg/apis/meta v0.1.0 k8s.io/api v0.18.9 k8s.io/apimachinery v0.18.9 sigs.k8s.io/controller-runtime v0.6.3 diff --git a/api/go.sum b/api/go.sum index 4262a68..5a2c57a 100644 --- a/api/go.sum +++ b/api/go.sum @@ -61,8 +61,8 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/pkg/apis/meta v0.0.2 h1:kyA4Y0IzNjf1joBOnFqpWG7aNDHvtLExZcaHQM7qhRI= -github.com/fluxcd/pkg/apis/meta v0.0.2/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU= +github.com/fluxcd/pkg/apis/meta v0.1.0 h1:CfOYHYaHslhcb3QlzgKCOXl4ziCbA5zG/fUa1qFlHis= +github.com/fluxcd/pkg/apis/meta v0.1.0/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= diff --git a/go.mod b/go.mod index e93c999..7be56d8 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ replace github.com/fluxcd/notification-controller/api => ./api require ( github.com/fluxcd/notification-controller/api v0.1.2 - github.com/fluxcd/pkg/apis/meta v0.0.2 + github.com/fluxcd/pkg/apis/meta v0.1.0 github.com/fluxcd/pkg/recorder v0.0.6 - github.com/fluxcd/pkg/runtime v0.1.0 + github.com/fluxcd/pkg/runtime v0.1.2 github.com/fluxcd/source-controller/api v0.1.1 github.com/go-logr/logr v0.1.0 github.com/google/go-github/v32 v32.0.0 diff --git a/go.sum b/go.sum index 6090db6..d8acd7a 100644 --- a/go.sum +++ b/go.sum @@ -68,10 +68,12 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fluxcd/pkg/apis/meta v0.0.2 h1:kyA4Y0IzNjf1joBOnFqpWG7aNDHvtLExZcaHQM7qhRI= github.com/fluxcd/pkg/apis/meta v0.0.2/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU= +github.com/fluxcd/pkg/apis/meta v0.1.0 h1:CfOYHYaHslhcb3QlzgKCOXl4ziCbA5zG/fUa1qFlHis= +github.com/fluxcd/pkg/apis/meta v0.1.0/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU= github.com/fluxcd/pkg/recorder v0.0.6 h1:me/n8syeeGXz50OXoPX3jgIj9AtinvhHdKT9Dy+MbHs= github.com/fluxcd/pkg/recorder v0.0.6/go.mod h1:IfQxfVRSNsWs3B0Yp5B6ObEWwKHILlAx8N7XkoDdhFg= -github.com/fluxcd/pkg/runtime v0.1.0 h1:mCLj5GlQZqWtK3tvtZTmfgFOLsTUY1iqg3CmEyS1nRs= -github.com/fluxcd/pkg/runtime v0.1.0/go.mod h1:OXkrYtDLw3GhclbzvnzfSktUyxRmC3FFhXj0tVVaIX8= +github.com/fluxcd/pkg/runtime v0.1.2 h1:bKhjJGVOJgTQTWjqhwasyt69lBItq1ZWjX04rUkiypo= +github.com/fluxcd/pkg/runtime v0.1.2/go.mod h1:HXYTNdkK8ulcT1mhuGhio9tsX65ACKaealtd/MsnkhM= github.com/fluxcd/source-controller/api v0.1.1 h1:BYxl9qc8pCx3/Bn1885TlkJPwvXqz+rAL9mzpnCrj9A= github.com/fluxcd/source-controller/api v0.1.1/go.mod h1:1ac/vj49YVPKF+xBHTo/9pfFj64TcLc1RLaxi4MwVEM= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= diff --git a/internal/server/receiver_handlers.go b/internal/server/receiver_handlers.go index 9cc7053..3829d16 100644 --- a/internal/server/receiver_handlers.go +++ b/internal/server/receiver_handlers.go @@ -225,7 +225,7 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource v1beta1.CrossNam if source.Annotations == nil { source.Annotations = make(map[string]string) } - source.Annotations[meta.ReconcileAtAnnotation] = metav1.Now().String() + source.Annotations[meta.ReconcileRequestAnnotation] = metav1.Now().String() if err := s.kubeClient.Update(ctx, &source); err != nil { return fmt.Errorf("unable to annotate Bucket '%s' error: %w", resourceName, err) } @@ -237,7 +237,7 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource v1beta1.CrossNam if source.Annotations == nil { source.Annotations = make(map[string]string) } - source.Annotations[meta.ReconcileAtAnnotation] = metav1.Now().String() + source.Annotations[meta.ReconcileRequestAnnotation] = metav1.Now().String() if err := s.kubeClient.Update(ctx, &source); err != nil { return fmt.Errorf("unable to annotate GitRepository '%s' error: %w", resourceName, err) } @@ -249,7 +249,7 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource v1beta1.CrossNam if source.Annotations == nil { source.Annotations = make(map[string]string) } - source.Annotations[meta.ReconcileAtAnnotation] = metav1.Now().String() + source.Annotations[meta.ReconcileRequestAnnotation] = metav1.Now().String() if err := s.kubeClient.Update(ctx, &source); err != nil { return fmt.Errorf("unable to annotate HelmRepository '%s' error: %w", resourceName, err) }