Skip to content

Commit faa6fe0

Browse files
stefanprodanstefanprodan
authored
Merge pull request #67 from fluxcd/runtime-v0.1.2
Use reconcile request annotation
2 parents 4e03190 + e02c336 commit faa6fe0

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

‎api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/fluxcd/notification-controller/api
33
go 1.15
44

55
require (
6-
github.com/fluxcd/pkg/apis/meta v0.0.2
6+
github.com/fluxcd/pkg/apis/meta v0.1.0
77
k8s.io/api v0.18.9
88
k8s.io/apimachinery v0.18.9
99
sigs.k8s.io/controller-runtime v0.6.3

‎api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
6161
github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
6262
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
6363
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
64-
github.com/fluxcd/pkg/apis/meta v0.0.2 h1:kyA4Y0IzNjf1joBOnFqpWG7aNDHvtLExZcaHQM7qhRI=
65-
github.com/fluxcd/pkg/apis/meta v0.0.2/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU=
64+
github.com/fluxcd/pkg/apis/meta v0.1.0 h1:CfOYHYaHslhcb3QlzgKCOXl4ziCbA5zG/fUa1qFlHis=
65+
github.com/fluxcd/pkg/apis/meta v0.1.0/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU=
6666
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
6767
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
6868
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ replace github.com/fluxcd/notification-controller/api => ./api
66

77
require (
88
github.com/fluxcd/notification-controller/api v0.1.2
9-
github.com/fluxcd/pkg/apis/meta v0.0.2
9+
github.com/fluxcd/pkg/apis/meta v0.1.0
1010
github.com/fluxcd/pkg/recorder v0.0.6
11-
github.com/fluxcd/pkg/runtime v0.1.0
11+
github.com/fluxcd/pkg/runtime v0.1.2
1212
github.com/fluxcd/source-controller/api v0.1.1
1313
github.com/go-logr/logr v0.1.0
1414
github.com/google/go-github/v32 v32.0.0

‎go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
6868
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
6969
github.com/fluxcd/pkg/apis/meta v0.0.2 h1:kyA4Y0IzNjf1joBOnFqpWG7aNDHvtLExZcaHQM7qhRI=
7070
github.com/fluxcd/pkg/apis/meta v0.0.2/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU=
71+
github.com/fluxcd/pkg/apis/meta v0.1.0 h1:CfOYHYaHslhcb3QlzgKCOXl4ziCbA5zG/fUa1qFlHis=
72+
github.com/fluxcd/pkg/apis/meta v0.1.0/go.mod h1:nCNps5JJOcEQr3MNDmZqI4o0chjePSUYL6Q2ktDtotU=
7173
github.com/fluxcd/pkg/recorder v0.0.6 h1:me/n8syeeGXz50OXoPX3jgIj9AtinvhHdKT9Dy+MbHs=
7274
github.com/fluxcd/pkg/recorder v0.0.6/go.mod h1:IfQxfVRSNsWs3B0Yp5B6ObEWwKHILlAx8N7XkoDdhFg=
73-
github.com/fluxcd/pkg/runtime v0.1.0 h1:mCLj5GlQZqWtK3tvtZTmfgFOLsTUY1iqg3CmEyS1nRs=
74-
github.com/fluxcd/pkg/runtime v0.1.0/go.mod h1:OXkrYtDLw3GhclbzvnzfSktUyxRmC3FFhXj0tVVaIX8=
75+
github.com/fluxcd/pkg/runtime v0.1.2 h1:bKhjJGVOJgTQTWjqhwasyt69lBItq1ZWjX04rUkiypo=
76+
github.com/fluxcd/pkg/runtime v0.1.2/go.mod h1:HXYTNdkK8ulcT1mhuGhio9tsX65ACKaealtd/MsnkhM=
7577
github.com/fluxcd/source-controller/api v0.1.1 h1:BYxl9qc8pCx3/Bn1885TlkJPwvXqz+rAL9mzpnCrj9A=
7678
github.com/fluxcd/source-controller/api v0.1.1/go.mod h1:1ac/vj49YVPKF+xBHTo/9pfFj64TcLc1RLaxi4MwVEM=
7779
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

‎internal/server/receiver_handlers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource v1beta1.CrossNam
225225
if source.Annotations == nil {
226226
source.Annotations = make(map[string]string)
227227
}
228-
source.Annotations[meta.ReconcileAtAnnotation] = metav1.Now().String()
228+
source.Annotations[meta.ReconcileRequestAnnotation] = metav1.Now().String()
229229
if err := s.kubeClient.Update(ctx, &source); err != nil {
230230
return fmt.Errorf("unable to annotate Bucket '%s' error: %w", resourceName, err)
231231
}
@@ -237,7 +237,7 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource v1beta1.CrossNam
237237
if source.Annotations == nil {
238238
source.Annotations = make(map[string]string)
239239
}
240-
source.Annotations[meta.ReconcileAtAnnotation] = metav1.Now().String()
240+
source.Annotations[meta.ReconcileRequestAnnotation] = metav1.Now().String()
241241
if err := s.kubeClient.Update(ctx, &source); err != nil {
242242
return fmt.Errorf("unable to annotate GitRepository '%s' error: %w", resourceName, err)
243243
}
@@ -249,7 +249,7 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource v1beta1.CrossNam
249249
if source.Annotations == nil {
250250
source.Annotations = make(map[string]string)
251251
}
252-
source.Annotations[meta.ReconcileAtAnnotation] = metav1.Now().String()
252+
source.Annotations[meta.ReconcileRequestAnnotation] = metav1.Now().String()
253253
if err := s.kubeClient.Update(ctx, &source); err != nil {
254254
return fmt.Errorf("unable to annotate HelmRepository '%s' error: %w", resourceName, err)
255255
}

0 commit comments

Comments
 (0)