Commit Graph

33 Commits

Author SHA1 Message Date
Jian Zhu
b506d16cf8 🐛 Fix ManagedClusterAddons not removed when ClusterManagementAddon is deleted (#1160)
Some checks failed
Post / coverage (push) Failing after 38s
Post / images (amd64, addon-manager) (push) Failing after 33s
Post / images (amd64, placement) (push) Failing after 41s
Post / images (amd64, registration) (push) Failing after 40s
Post / images (amd64, registration-operator) (push) Failing after 38s
Post / images (amd64, work) (push) Failing after 36s
Post / images (arm64, addon-manager) (push) Failing after 35s
Post / images (arm64, placement) (push) Failing after 39s
Post / images (arm64, registration) (push) Failing after 34s
Post / images (arm64, registration-operator) (push) Failing after 33s
Post / images (arm64, work) (push) Failing after 35s
Post / image manifest (addon-manager) (push) Has been skipped
Post / image manifest (placement) (push) Has been skipped
Post / image manifest (registration) (push) Has been skipped
Post / image manifest (registration-operator) (push) Has been skipped
Post / image manifest (work) (push) Has been skipped
Post / trigger clusteradm e2e (push) Has been skipped
Scorecard supply-chain security / Scorecard analysis (push) Failing after 41s
Close stale issues and PRs / stale (push) Failing after 27s
* Fix ManagedClusterAddons not removed when ClusterManagementAddon is deleted

The addon template controller was stopping addon managers immediately when
ClusterManagementAddon was deleted, without waiting for pre-delete jobs
to complete or ManagedClusterAddons to be cleaned up via owner reference
cascading deletion.

This change implements the TODO at line 105 by checking if all
ManagedClusterAddons are deleted before stopping the manager. The controller
now uses field selectors to efficiently query for remaining ManagedClusterAddons
and requeues after 10 seconds if any still exist, allowing time for proper
cleanup.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* add e2e test

Signed-off-by: zhujian <jiazhu@redhat.com>

* return err when stopUnusedManagers failed

Signed-off-by: zhujian <jiazhu@redhat.com>

* Address review comments for addon manager deletion fix

- Use lister instead of API client for better performance
- Add named constant for requeue delay
- Fix test cache synchronization issues
- Improve test coverage from 74.7% to 75.6%

Addresses review feedback from Qiujian16 and CodeRabbit.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Fix e2e test timeout for configmap deletion check

Add explicit 180s timeout for pre-delete job configmap cleanup.
The default 90s timeout was insufficient for the deletion workflow.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Improve error logging in template agent

- Replace utilruntime.HandleError with structured logging in CSR functions
- Add more context to error messages for better debugging
- Use logger.Info for template retrieval errors to provide better visibility

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Use ManagedClusterAddonByName index for efficient lookup

- Replace inefficient list-and-filter with indexed lookup
- Add managedClusterAddonIndexer field to controller struct
- Update comment to accurately describe functionality
- Fix unit tests to properly set up the required index

This addresses the PR review feedback to use the existing index
instead of listing all ManagedClusterAddOns and filtering by name.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Remove unused mcaLister field

Since we now use managedClusterAddonIndexer for efficient lookup,
the mcaLister field is no longer needed. This cleanup reduces
memory usage and simplifies the controller structure.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Replace inefficient list-and-filter with indexed lookup in runController

Use managedClusterAddonIndexer.ByIndex() instead of listing all ManagedClusterAddOns
and filtering by name. This provides O(1) indexed lookup instead of O(n) linear scan.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Fix review comments for addon manager deletion

- Fix closure capture bug in controller test by using captured variables
- Fix typo 'copyiedConfig' to 'copiedConfig' in e2e tests

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Optimize ManagedClusterAddOn event handling in addon template controller

Replace filtered event handling with custom event handlers that only trigger
reconciliation when AddOnTemplate configReferences actually change. This
reduces unnecessary reconciliation cycles by using reflect.DeepEqual to
compare config references between old and new objects.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: zhujian <jiazhu@redhat.com>

* Revert "Optimize ManagedClusterAddOn event handling in addon template controller"

This reverts commit 4649d1b9ac.

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
2025-09-10 01:30:19 +00:00
Jian Qiu
567caa2fe9 Bump API to v1.0.0 (#1036)
Some checks failed
Scorecard supply-chain security / Scorecard analysis (push) Failing after 2m12s
Post / coverage (push) Failing after 36m53s
Post / images (amd64) (push) Failing after 8m37s
Post / images (arm64) (push) Failing after 7m58s
Post / image manifest (push) Has been skipped
Post / trigger clusteradm e2e (push) Has been skipped
Signed-off-by: Jian Qiu <jqiu@redhat.com>
2025-06-16 01:05:30 +00:00
Ankit Kurmi
cd8827572e feat: updated golang to v1.23.6 and related k8s.io packages (#870)
Signed-off-by: Ankit152 <ankitkurmi152@gmail.com>
2025-04-09 07:46:27 +00:00
Jian Zhu
67d9d2a5d3 Support configuring resource requirements for addon agents (#932)
* Support configuring resource requirements for addon agents

Signed-off-by: zhujian <jiazhu@redhat.com>

* Add unit tests

Signed-off-by: zhujian <jiazhu@redhat.com>

* Add e2e

Signed-off-by: zhujian <jiazhu@redhat.com>

* remove mod replace

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2025-04-08 02:26:49 +00:00
Jian Zhu
3f9b8867eb Add a configmap to handle the proxy ca bundle (#772)
* Add a configmap to handle the proxy ca bundle

Signed-off-by: zhujian <jiazhu@redhat.com>

* Use contextual logger

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2024-12-19 03:29:03 +00:00
Jian Zhu
3493630ad2 Support configuring proxy for addons (#760)
* Support configuring proxy for addons

Signed-off-by: zhujian <jiazhu@redhat.com>

* Add tests for addon proxy setting

Signed-off-by: zhujian <jiazhu@redhat.com>

* Add e2e test for signer namespace

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2024-12-16 08:01:34 +00:00
Jian Zhu
ddc5024596 Allow Custom Signer signingCA to Specify Namespace in AddOnTemplate (#747)
* Allow Custom Signer signingCA to Specify Namespace in AddOnTemplate

Signed-off-by: zhujian <jiazhu@redhat.com>

* Add e2e test for signer namespace

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2024-12-10 09:16:26 +00:00
Jian Zhu
80935909c0 🐛 Only bind the agent role for the addon group (#721)
* Only bind the agent role for the addon group

Signed-off-by: zhujian <jiazhu@redhat.com>

* Update addon rolebinding

Signed-off-by: zhujian <jiazhu@redhat.com>

* Tigger registration reconcile after start

Signed-off-by: zhujian <jiazhu@redhat.com>

* Address code review comments

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2024-12-03 02:18:34 +00:00
Jian Qiu
8d1fdc297f Add trimmed release version to env (#648)
Signed-off-by: Jian Qiu <jqiu@redhat.com>
2024-10-16 04:32:19 +00:00
Qing Hao
43c3500738 upgrade framework and check configured condition in addon template (#641)
Signed-off-by: haoqing0110 <qhao@redhat.com>
2024-10-09 12:53:45 +00:00
Jian Zhu
41197e576b Set the first daemonset namespace to registration namespace (#536)
Signed-off-by: zhujian <jiazhu@redhat.com>
2024-06-21 03:13:02 +00:00
Jian Zhu
3b2601dcfb Support daemonSet with AddOnTemplate (#521)
Signed-off-by: zhujian <jiazhu@redhat.com>
2024-06-19 15:57:46 +00:00
Jian Zhu
c5729ae335 Add install namespace to built in values (#533)
Signed-off-by: zhujian <jiazhu@redhat.com>
2024-06-19 11:03:20 +00:00
Jian Zhu
ea839f1369 🐛 Check if template is nil when getting the addon agent registration namespace (#500)
* Check if template is nil when getting the addon agent registration namespace

Signed-off-by: zhujian <jiazhu@redhat.com>

* Fix typo

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2024-06-05 13:43:44 +00:00
Jian Zhu
fd65f371d6 Only decorate namespace for namespaced resources (#462)
Signed-off-by: zhujian <jiazhu@redhat.com>
2024-05-15 02:01:56 +00:00
Jian Qiu
08cfa4f20d Set name of namespace in namespace decorator (#440)
Signed-off-by: Jian Qiu <jqiu@redhat.com>
2024-04-24 06:37:39 +00:00
Jian Zhu
fe6e75fc0d Refactor template addon get values func (#438)
Signed-off-by: zhujian <jiazhu@redhat.com>
2024-04-23 02:02:47 +00:00
Jian Qiu
a7adf5d517 Set install namespace of addonTemplate from config (#417)
* Set install namespace of addonTemplate from config

Signed-off-by: Jian Qiu <jqiu@redhat.com>

* Add an e2e test case

Signed-off-by: Jian Qiu <jqiu@redhat.com>

---------

Signed-off-by: Jian Qiu <jqiu@redhat.com>
2024-04-22 08:32:44 +00:00
Jian Qiu
37693a4c58 Get default registration namespace from template manifest (#427)
Signed-off-by: Jian Qiu <jqiu@redhat.com>
2024-04-17 09:42:28 +00:00
Jian Zhu
917539a129 🐛 Set a fixed agent name for the template type addon (#413)
Signed-off-by: zhujian <jiazhu@redhat.com>
2024-04-10 13:20:38 +00:00
Qing Hao
ff77abd312 upgrade addon-framework (#383)
Signed-off-by: haoqing0110 <qhao@redhat.com>
2024-03-28 03:15:15 +00:00
Qing Hao
b4bf3d0609 update the addon-framework and getSpechHash algorithm (#371)
Signed-off-by: haoqing0110 <qhao@redhat.com>
2024-03-12 07:46:27 +00:00
Jian Zhu
5d99f4bf50 Check the template type addon status immediately when the cluster status changes (#350)
Signed-off-by: zhujian <jiazhu@redhat.com>
2024-01-22 01:20:48 +00:00
Jian Zhu
6571a8a4d9 Support setting manifest work config by addon template (#308)
*  Support setting manifest work config by addon template

Signed-off-by: zhujian <jiazhu@redhat.com>

* add unit tests

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2023-11-20 14:09:38 +00:00
Jian Zhu
e6443b6523 Update permission config in addontemplate (#285)
Signed-off-by: zhujian <jiazhu@redhat.com>
2023-09-21 22:08:17 -04:00
Jian Zhu
90c1dcb5bc set agent install namespace from addon deployment config for template type addons (#266)
Signed-off-by: zhujian <jiazhu@redhat.com>
2023-09-12 09:42:06 +02:00
Nitish Chauhan
9dd935b525 adding contextual logging in addon pkg (#255)
Signed-off-by: ntishchauhan0022 <nitishchauhan0022@gmail.com>
2023-08-24 04:29:59 -04:00
Jian Zhu
a9dae607f6 Support override addon images by the cluster's annotation (#231)
*  Support override addon images by the cluster's annotation

Signed-off-by: zhujian <jiazhu@redhat.com>

* Add tests for addon image override

Signed-off-by: zhujian <jiazhu@redhat.com>

* upgrade ocm api

Signed-off-by: zhujian <jiazhu@redhat.com>

* refactor integration tests

Signed-off-by: zhujian <jiazhu@redhat.com>

* Upgrade addon framework to watch cluster when deploy addon agent

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2023-08-03 08:57:05 +02:00
Jian Qiu
e810520961 🌱 Refactor code to fix lint warning (#218)
* Refactor code to fix lint warning

Signed-off-by: Jian Qiu <jqiu@redhat.com>

* enable lint for testing files

Signed-off-by: Jian Qiu <jqiu@redhat.com>

---------

Signed-off-by: Jian Qiu <jqiu@redhat.com>
2023-07-25 07:12:34 +02:00
Jian Zhu
21ee8d4c88 use DeploymentAvailability to check addon health (#212)
Signed-off-by: zhujian <jiazhu@redhat.com>
2023-07-05 10:25:55 -04:00
Jian Zhu
40bc557c47 🐛 make the custom sign ca secret namespace fixed (#205)
* update vendor ocm api

Signed-off-by: zhujian <jiazhu@redhat.com>

* make the custom sign ca secret name fixed

Signed-off-by: zhujian <jiazhu@redhat.com>

* make the custom sign ca secret namespace fixed

Signed-off-by: zhujian <jiazhu@redhat.com>

* format go import for test files

Signed-off-by: zhujian <jiazhu@redhat.com>

* update vendor ocm api

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2023-07-04 00:01:23 -04:00
Jian Zhu
9450d14759 🌱 add e2e tests for addon manager (#199)
* add e2e tests for addon manager

Signed-off-by: zhujian <jiazhu@redhat.com>

* test image override and node placement for addon manager

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2023-06-28 15:45:43 +02:00
Jian Zhu
a78d9f457d 🌱 Move addon manager from addon-framework to ocm repo (#196)
* update vendor to add addon-framework

Signed-off-by: zhujian <jiazhu@redhat.com>

* Move addon manager from addon-framework to ocm repo

Signed-off-by: zhujian <jiazhu@redhat.com>

* add integration tests for addon manager

Signed-off-by: zhujian <jiazhu@redhat.com>

* push addon manager image post commit

Signed-off-by: zhujian <jiazhu@redhat.com>

* use library-go to refactor addon controllers

Signed-off-by: zhujian <jiazhu@redhat.com>

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
2023-06-27 03:59:54 +02:00