github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-22 00:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

🌱 Refactor code to fix lint warning (#218)

Browse Source 
* 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>
This commit is contained in:
Jian Qiu
2023-07-25 13:12:34 +08:00
committed by GitHub
parent e22faa4545
commit e810520961
145 changed files with 1218 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller.go
View File

@@ -55,7 +55,7 @@ func NewBootstrapController(
secretInformers: secretInformers,
}
return factory.New().WithSync(controller.sync).
WithInformersQueueKeyFunc(bootstrapSecretQueueKeyFunc(controller.klusterletLister),
WithInformersQueueKeysFunc(bootstrapSecretQueueKeyFunc(controller.klusterletLister),
secretInformers[helpers.HubKubeConfig].Informer(),
secretInformers[helpers.BootstrapHubKubeConfig].Informer(),
secretInformers[helpers.ExternalManagedKubeConfig].Informer()).
@@ -110,6 +110,7 @@ func (k *bootstrapController) sync(ctx context.Context, controllerContext factor
return nil
}
// #nosec G101
hubKubeconfigSecret, err := k.secretInformers[helpers.HubKubeConfig].Lister().Secrets(agentNamespace).Get(helpers.HubKubeConfig)
switch {
case errors.IsNotFound(err):
@@ -203,28 +204,28 @@ func (k *bootstrapController) loadKubeConfig(secret *corev1.Secret) (*clientcmda
return cluster, nil
}
func bootstrapSecretQueueKeyFunc(klusterletLister operatorlister.KlusterletLister) factory.ObjectQueueKeyFunc {
return func(obj runtime.Object) string {
func bootstrapSecretQueueKeyFunc(klusterletLister operatorlister.KlusterletLister) factory.ObjectQueueKeysFunc {
return func(obj runtime.Object) []string {
accessor, err := meta.Accessor(obj)
if err != nil {
return ""
return []string{}
}
name := accessor.GetName()
if name != helpers.BootstrapHubKubeConfig {
return ""
return []string{}
}
namespace := accessor.GetNamespace()
klusterlets, err := klusterletLister.List(labels.Everything())
if err != nil {
return ""
return []string{}
}
if klusterlet := helpers.FindKlusterletByNamespace(klusterlets, namespace); klusterlet != nil {
return namespace + "/" + klusterlet.Name
return []string{namespace + "/" + klusterlet.Name}
}
return ""
return []string{}
}
}