Skip to content

Commit

Permalink
Call HandleScaledObjectDelete on delete
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmelsayed committed Apr 16, 2019
1 parent 269d56b commit 397686a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
6 changes: 6 additions & 0 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,13 @@ func (c *controller) syncScaledObject(obj interface{}, isUpdate bool) {

func (c *controller) syncDeletedScaledObject(obj interface{}) {
scaledObject := obj.(*kore_v1alpha1.ScaledObject)
if scaledObject == nil {
log.Errorf("Called syncDeletedScaledObject with an invalid scaledObject ptr")
return
}

log.Debugf("Notified about deletion of ScaledObject: %s", scaledObject.GetName())
go c.scaleHandler.HandleScaledObjectDelete(scaledObject)

key, err := cache.MetaNamespaceKeyFunc(scaledObject)
if err != nil {
Expand Down
5 changes: 2 additions & 3 deletions pkg/handler/scale_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (h *ScaleHandler) WatchScaledObjectWithContext(ctx context.Context, scaledO
}

// HandleScaledObjectDelete handles any cleanup when a scaled object is deleted
func (h *ScaleHandler) HandleScaledObjectDelete(ctx context.Context, scaledObject *kore_v1alpha1.ScaledObject) {
func (h *ScaleHandler) HandleScaledObjectDelete(scaledObject *kore_v1alpha1.ScaledObject) {
h.deleteHPAForScaledObject(scaledObject)
}

Expand Down Expand Up @@ -98,11 +98,10 @@ func (h *ScaleHandler) deleteHPAForScaledObject(scaledObject *kore_v1alpha1.Scal
err := h.kubeClient.AutoscalingV2beta1().HorizontalPodAutoscalers(scaledObjectNamespace).Delete(hpaName, deleteOptions)
if apierrors.IsNotFound(err) {
log.Warnf("HPA with namespace %s and name %s is not found", scaledObjectNamespace, hpaName)

} else if err != nil {
log.Errorf("Error deleting HPA with namespace %s and name %s : %s\n", scaledObjectNamespace, hpaName, err)
} else {
log.Debugf("Deleted HPA with namespace %s and name %s", scaledObjectNamespace, hpaName)
log.Infof("Deleted HPA with namespace %s and name %s", scaledObjectNamespace, hpaName)
}
}

Expand Down

0 comments on commit 397686a

Please sign in to comment.