fix watch resources in each controller #1263

ldpliu · 2024-12-04T09:52:13Z

Summary

We did not watch globalhub applied resources previously, if user changed these resources, we should rollback them.

Related issue(s)

Fixes #

Tests

Unit/function tests have been added and incorporated into make unit-tests.
Integration tests have been added and incorporated into make integration-test.
E2E tests have been added and incorporated into make e2e-test-all.
List other manual tests you have done.
- manually removed the manager role/rolebinding, they will be recreated.

ldpliu · 2024-12-05T06:28:06Z

/test test-integration

ldpliu · 2024-12-05T09:18:49Z

/cc @clyang82 @yanmxa

clyang82 · 2024-12-09T02:40:06Z

operator/pkg/controllers/backup/backup_start.go

 	if backupController != nil {
 		return backupController, nil
 	}
+	log.Infof("start backup controller")
+


move it after IsACMResourceReady

clyang82 · 2024-12-09T02:40:22Z

operator/pkg/controllers/grafana/grafana_reconciler.go

 	if grafanaController != nil {
 		return grafanaController, nil
 	}
+	log.Info("start grafana controller")


clyang82 · 2024-12-09T02:43:28Z

operator/pkg/controllers/inventory/inventory_reconciler.go

 	if !config.WithInventory(initOption.MulticlusterGlobalHub) {
 		return nil, nil
 	}
+	log.Info("start inventory controller")
+


move it after GetStorageConnection

clyang82 · 2024-12-09T02:44:01Z

operator/pkg/controllers/grafana/grafana_reconciler.go

@@ -156,7 +158,17 @@ func (r *GrafanaReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&corev1.ConfigMap{},
 			&handler.EnqueueRequestForObject{}, builder.WithPredicates(configmapPred)).
 		Watches(&appsv1.Deployment{},
-			&handler.EnqueueRequestForObject{}, builder.WithPredicates(deplomentPred))
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(deploymentPred)).
+		Watches(&corev1.Service{},


Need to add more permissions for this controller

clyang82 · 2024-12-09T02:44:23Z

operator/pkg/controllers/managedhub/managedhub_controller.go

 	if managedHubController != nil {
 		return managedHubController, nil
 	}
+	log.Info("start managedhub controller")
+


move it after IsACMResourceReady

clyang82 · 2024-12-09T02:45:47Z

operator/pkg/controllers/manager/manager_reconciler.go

+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.Role{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.RoleBinding{},


add more permissions for this controller

clyang82 · 2024-12-09T02:48:18Z

operator/pkg/controllers/storage/storage_reconciler.go

+
+	if r.enableMetrics {
+		mgrBuilder = mgrBuilder.
+			Watches(&promv1.PrometheusRule{},


Does it work when switch enableMetrics from false to true?

changed to watch the resources when crd exist

clyang82 · 2024-12-09T02:49:11Z

operator/pkg/controllers/transporter/protocol/strimzi_kafka_controller.go

@@ -148,7 +148,7 @@ var kafkaPred = predicate.Funcs{
 }

 func StartKafkaController(ctx context.Context, mgr ctrl.Manager, transporter transport.Transporter) error {
-	log.Info("start kafka controller")
+	log.Debug("start kafka controller")
 	if startedKafkaController {
 		return nil
 	}


Move it after startedKafkaController. Use Info for consistence?

clyang82 · 2024-12-09T02:49:31Z

operator/pkg/controllers/webhook/webhook_controller.go

 	if webhookReconciler != nil {
 		return webhookReconciler, nil
 	}
+	log.Info("start webhook controller")


move it after IsACMResourceReady

Signed-off-by: ldpliu <[email protected]> Signed-off-by: root <[email protected]>

ldpliu · 2024-12-09T12:21:22Z

/retest

clyang82

LGTM

openshift-ci · 2024-12-10T06:56:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: clyang82, ldpliu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [clyang82]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2024-12-10T07:12:11Z

@ldpliu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/test-integration	`e9162d4`	link	unknown	`/test test-integration`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

sonarqubecloud · 2024-12-10T07:13:23Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

openshift-ci bot added the dco-signoff: yes label Dec 4, 2024

ldpliu force-pushed the fix-watch branch 7 times, most recently from 5a7d871 to d3c913a Compare December 5, 2024 06:19

ldpliu force-pushed the fix-watch branch from d3c913a to 8e54d6b Compare December 5, 2024 06:37

openshift-ci bot requested review from clyang82 and yanmxa December 5, 2024 09:18

clyang82 requested changes Dec 9, 2024

View reviewed changes

openshift-ci bot assigned clyang82 Dec 9, 2024

ldpliu force-pushed the fix-watch branch from 8e54d6b to eee18bd Compare December 9, 2024 05:40

fix watch resources in each controller

e9162d4

Signed-off-by: ldpliu <[email protected]> Signed-off-by: root <[email protected]>

ldpliu force-pushed the fix-watch branch from eee18bd to e9162d4 Compare December 9, 2024 08:53

clyang82 approved these changes Dec 10, 2024

View reviewed changes

openshift-ci bot added the lgtm label Dec 10, 2024

openshift-ci bot added the approved label Dec 10, 2024

clyang82 merged commit fbf7e3a into stolostron:main Dec 10, 2024
13 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix watch resources in each controller #1263

fix watch resources in each controller #1263

ldpliu commented Dec 4, 2024 •

edited

Loading

ldpliu commented Dec 5, 2024

ldpliu commented Dec 5, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024 •

edited

Loading

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

clyang82 Dec 9, 2024

ldpliu Dec 9, 2024

ldpliu commented Dec 9, 2024

clyang82 left a comment

openshift-ci bot commented Dec 10, 2024

openshift-ci bot commented Dec 10, 2024

sonarqubecloud bot commented Dec 10, 2024

fix watch resources in each controller #1263

fix watch resources in each controller #1263

Conversation

ldpliu commented Dec 4, 2024 • edited Loading

Summary

Related issue(s)

Tests

ldpliu commented Dec 5, 2024

ldpliu commented Dec 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ldpliu Dec 9, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ldpliu commented Dec 9, 2024

clyang82 left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Dec 10, 2024

openshift-ci bot commented Dec 10, 2024

sonarqubecloud bot commented Dec 10, 2024

Quality Gate passed

ldpliu commented Dec 4, 2024 •

edited

Loading

ldpliu Dec 9, 2024 •

edited

Loading