|
8 | 8 | "github.com/openshift/library-go/pkg/operator/events"
|
9 | 9 | "k8s.io/apimachinery/pkg/api/errors"
|
10 | 10 | metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
11 |
| - "k8s.io/apimachinery/pkg/labels" |
12 | 11 | utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
13 | 12 | "k8s.io/client-go/dynamic/dynamicinformer"
|
14 | 13 | kubeinformers "k8s.io/client-go/informers"
|
@@ -131,9 +130,10 @@ func (c *addonTemplateController) stopUnusedManagers(
|
131 | 130 |
|
132 | 131 | stopFunc, ok := c.addonManagers[addOnName]
|
133 | 132 | if ok {
|
| 133 | + logger.Info("Sart to stop the manager for addon", "addonName", addOnName) |
134 | 134 | stopFunc()
|
135 | 135 | delete(c.addonManagers, addOnName)
|
136 |
| - logger.Info("Stopping the manager for addon", "addonName", addOnName) |
| 136 | + logger.Info("The manager for addon stopped", "addonName", addOnName) |
137 | 137 | }
|
138 | 138 | return nil
|
139 | 139 | }
|
@@ -249,13 +249,14 @@ func (c *addonTemplateController) runController(ctx context.Context, addonName s
|
249 | 249 | kubeInformers.Start(ctx.Done())
|
250 | 250 |
|
251 | 251 | // trigger the manager to reconcile for the existing managed cluster addons
|
252 |
| - mcas, err := c.addonInformers.Addon().V1alpha1().ManagedClusterAddOns().Lister().List(labels.Everything()) |
| 252 | + mcas, err := c.managedClusterAddonIndexer.ByIndex(addonindex.ManagedClusterAddonByName, addonName) |
253 | 253 | if err != nil {
|
254 |
| - logger.Info("Failed to list ManagedClusterAddOns", "error", err) |
| 254 | + logger.Info("Failed to list ManagedClusterAddOns by index", "error", err) |
255 | 255 | } else {
|
256 | 256 | for _, mca := range mcas {
|
257 |
| - if mca.Name == addonName { |
258 |
| - mgr.Trigger(mca.Namespace, addonName) |
| 257 | + addon, ok := mca.(*addonv1alpha1.ManagedClusterAddOn) |
| 258 | + if ok { |
| 259 | + mgr.Trigger(addon.Namespace, addonName) |
259 | 260 | }
|
260 | 261 | }
|
261 | 262 | }
|
|
0 commit comments