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.

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

Hub metrics collector feature #1340

Merged
merged 55 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
bce7f5d
Hub Metrics Collection (#1339)
coleenquadros Feb 20, 2024
e81ffae
Update placementrule_controller.go
coleenquadros Feb 20, 2024
085a0bb
lint (#1341)
coleenquadros Feb 20, 2024
5f29b51
lint
coleenquadros Feb 21, 2024
a6a0eb8
lint
coleenquadros Feb 21, 2024
2855e48
change server ca cert
coleenquadros Feb 21, 2024
35c77a6
lint
coleenquadros Feb 21, 2024
2b34f77
make sure hub metrics collection resources are properly cleaned up
coleenquadros Feb 21, 2024
41c0e5f
lint
coleenquadros Feb 21, 2024
4e1e7bd
remove obs add on for local-cluster
coleenquadros Feb 21, 2024
8b24bb7
cleanup when mco cr is removed
coleenquadros Feb 21, 2024
be9add4
test cleanup
coleenquadros Feb 21, 2024
5690944
remove additional watch for hub endpoint
coleenquadros Feb 21, 2024
f8c53f6
typo
coleenquadros Feb 21, 2024
5c4c566
delete resources refactor
coleenquadros Feb 21, 2024
9ca99c0
typo
coleenquadros Feb 21, 2024
f88af72
support local-cluster labels in rbac-query-proxy
subbarao-meduri Feb 22, 2024
d6ffcb7
metrics collector replica
coleenquadros Feb 22, 2024
4026fa9
comment proxy chnages for local-cluster
coleenquadros Feb 22, 2024
7cccdbc
add back proxy changes
coleenquadros Feb 22, 2024
c0f3a5b
cleanup
coleenquadros Feb 22, 2024
bddb159
cleanup ocp configs
coleenquadros Feb 22, 2024
a97435d
refactor
coleenquadros Feb 22, 2024
b1c78be
remove unused var
coleenquadros Feb 22, 2024
aa5c23b
fix resource requests setting for hub metrics collector
coleenquadros Feb 22, 2024
8284931
lint
coleenquadros Feb 22, 2024
9ca8d87
get resource requirements refactor
coleenquadros Feb 22, 2024
01934f6
test clean
coleenquadros Feb 22, 2024
06c1051
refactor hub metrics collector resource
coleenquadros Feb 22, 2024
59cc17f
resource refactor
coleenquadros Feb 22, 2024
55bdd1b
resource refactor
coleenquadros Feb 22, 2024
3357667
remove proxy changes
coleenquadros Feb 23, 2024
d3d05e2
only watch endpoint
coleenquadros Feb 23, 2024
fb59175
refactor hub metrics resource logic
coleenquadros Feb 23, 2024
0c621a4
clean resources
coleenquadros Feb 23, 2024
f773555
Do not access mco resource after delete is initiated
subbarao-meduri Feb 26, 2024
f2aafdb
RHOBS-1009: Instrument metrics-collector properly and add ServiceMoni…
saswatamcode Feb 26, 2024
25efdbf
cleanup refactor
coleenquadros Feb 26, 2024
2693231
cleanup
coleenquadros Feb 26, 2024
2afe4a8
lint
coleenquadros Feb 26, 2024
4dc0162
lint
coleenquadros Feb 26, 2024
50a6145
refactor obsadd on delete
coleenquadros Feb 26, 2024
0d37d37
refactor obsadd on delete
coleenquadros Feb 26, 2024
7755e8e
cleanup
coleenquadros Feb 26, 2024
0546947
Add roles for monitoring addon-obs ns
saswatamcode Feb 26, 2024
f7ea1c2
Cleanup and some fixes
saswatamcode Feb 26, 2024
504f29e
ensure MCO terminates with proper cleanup
coleenquadros Feb 26, 2024
25b15b9
ensure MCO terminates with proper cleanup
coleenquadros Feb 26, 2024
d5b6276
add special case for collector
coleenquadros Feb 26, 2024
73b1f86
ensure hub metrics collection's resources are updated when spec differs
coleenquadros Feb 26, 2024
1a833a8
cleanup
coleenquadros Feb 26, 2024
241aea6
cleanup
coleenquadros Feb 26, 2024
b9adc74
cleanup
coleenquadros Feb 26, 2024
5c6619e
cleanup
coleenquadros Feb 26, 2024
d7af621
fix e2e test failures
subbarao-meduri Feb 27, 2024
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
Prev Previous commit
Next Next commit
cleanup
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
  • Loading branch information
coleenquadros authored and subbarao-meduri committed Feb 26, 2024
commit 7755e8ee03dab61c41daba5a10902aa44fc441bb
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ func (r *PlacementRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
UpdateFunc: func(e event.UpdateEvent) bool {
if e.ObjectNew.GetName() == obsAddonName &&
e.ObjectNew.GetLabels()[ownerLabelKey] == ownerLabelValue &&
e.ObjectNew.GetNamespace() != config.GetDefaultNamespace() &&
e.ObjectNew.GetNamespace() != localClusterName &&
!reflect.DeepEqual(e.ObjectNew.(*mcov1beta1.ObservabilityAddon).Status.Conditions,
e.ObjectOld.(*mcov1beta1.ObservabilityAddon).Status.Conditions) {
return true
Expand All @@ -615,7 +615,7 @@ func (r *PlacementRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
DeleteFunc: func(e event.DeleteEvent) bool {
if e.Object.GetName() == obsAddonName &&
e.Object.GetLabels()[ownerLabelKey] == ownerLabelValue &&
e.Object.GetNamespace() != config.GetDefaultNamespace() {
e.Object.GetNamespace() != localClusterName {
log.Info(
"DeleteFunc",
"obsAddonNamespace",
Expand Down
1 change: 0 additions & 1 deletion operators/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const (
UwlMetricsConfigMapKey = "uwl_metrics_list.yaml"
PrometheusUserWorkload = "prometheus-user-workload"
MetricsOcp311ConfigMapKey = "ocp311_metrics_list.yaml"
ClusterRoleBindingName = "metrics-collector-view"
CaConfigmapName = "metrics-collector-serving-certs-ca-bundle"
HubMetricsCollectorMtlsCert = "observability-controller-open-cluster-management.io-observability-signer-client-cert"
ClientCACertificateCN = "observability-client-ca-certificate"
Expand Down