karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #876 from wawa0210/remove-hpa-works-amap 

remove hpa works object as much as possible
This commit is contained in:
karmada-bot 2021-10-28 11:26:37 +08:00 committed by GitHub
parent 57ec317412 a87b3ca1e8
commit a2f1723c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controllers/hpa/hpa_controller.go
View File

@ -16,6 +16,7 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
controllerruntime "sigs.k8s.io/controller-runtime" controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/kind/pkg/errors"
workv1alpha1 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha1" workv1alpha1 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha1"
workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2" workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
@ -161,6 +162,7 @@ func (c *HorizontalPodAutoscalerController) SetupWithManager(mgr controllerrunti
func (c *HorizontalPodAutoscalerController) deleteWorks(workName string) error { func (c *HorizontalPodAutoscalerController) deleteWorks(workName string) error {
workList := &workv1alpha1.WorkList{} workList := &workv1alpha1.WorkList{}
var errs []error
if err := c.List(context.TODO(), workList); err != nil { if err := c.List(context.TODO(), workList); err != nil {
klog.Errorf("Failed to list works: %v.", err) klog.Errorf("Failed to list works: %v.", err)
return err return err
@ -171,9 +173,12 @@ func (c *HorizontalPodAutoscalerController) deleteWorks(workName string) error {
if workName == work.Name { if workName == work.Name {
if err := c.Client.Delete(context.TODO(), work); err != nil && !apierrors.IsNotFound(err) { if err := c.Client.Delete(context.TODO(), work); err != nil && !apierrors.IsNotFound(err) {
klog.Errorf("Failed to delete work %s/%s: %v.", work.Namespace, work.Name, err) klog.Errorf("Failed to delete work %s/%s: %v.", work.Namespace, work.Name, err)
return err errs = append(errs, err)
} }
} }
} }
if len(errs) > 0 {
return errors.NewAggregate(errs)
}
return nil return nil
} }