Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: annotations mask #98

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Fix: annotations mask #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ace16
fix(sentry): set annotations of object to nil
powerfooI Nov 14, 2023
7fde770
fix: comments and owns
powerfooI Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/controller/obcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ func (r *OBClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
func (r *OBClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&v1alpha1.OBCluster{}).
Owns(&v1alpha1.OBZone{}).
WithEventFilter(preds).
Complete(r)
}
1 change: 1 addition & 0 deletions pkg/controller/obzone_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ func (r *OBZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
func (r *OBZoneReconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&v1alpha1.OBZone{}).
Owns(&v1alpha1.OBServer{}).
WithEventFilter(preds).
Complete(r)
}
4 changes: 2 additions & 2 deletions pkg/resource/coordinator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
)

const (
// If no task flow, requeue after 60 sec.
// If no task flow, requeue after 30 sec.
NormalRequeueDuration = 30 * time.Second
// In task flow, requeue after 500 ms.
// In task flow, requeue after 1 sec.
ExecutionRequeueDuration = 1 * time.Second
)

Expand Down
1 change: 1 addition & 0 deletions pkg/telemetry/sentry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func objectSentry(object any) {
if metaObj, ok := object.(metav1.Object); ok {
// remove managed fields which are of no interest
metaObj.SetManagedFields(nil)
metaObj.SetAnnotations(nil) // annotations may be privacy sensitive
}

if cluster, ok := object.(*v1alpha1.OBCluster); ok {
Expand Down