Merge pull request https://github.com/kubernetes/contrib/pull/1905 from mwielgus/events_delete

Automatic merge from submit-queue

Cluster-autoscaler: publish event on node deletion

Fixes: #1899
This commit is contained in:
Kubernetes Submit Queue 2016-10-24 04:51:51 -07:00 committed by GitHub
commit 4efca79d4e
2 changed files with 8 additions and 2 deletions

View File

@ -305,7 +305,8 @@ func run(_ <-chan struct{}) {
kubeClient,
predicateChecker,
podLocationHints,
usageTracker)
usageTracker,
recorder)
updateDuration("scaledown", scaleDownStart)

View File

@ -24,6 +24,7 @@ import (
"k8s.io/contrib/cluster-autoscaler/cloudprovider"
"k8s.io/contrib/cluster-autoscaler/simulator"
kube_api "k8s.io/kubernetes/pkg/api"
kube_record "k8s.io/kubernetes/pkg/client/record"
kube_client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
@ -113,7 +114,8 @@ func ScaleDown(
client *kube_client.Client,
predicateChecker *simulator.PredicateChecker,
oldHints map[string]string,
usageTracker *simulator.UsageTracker) (ScaleDownResult, error) {
usageTracker *simulator.UsageTracker,
recorder kube_record.EventRecorder) (ScaleDownResult, error) {
now := time.Now()
candidates := make([]*kube_api.Node, 0)
@ -185,5 +187,8 @@ func ScaleDown(
return ScaleDownError, fmt.Errorf("Failed to delete %s: %v", nodeToRemove.Name, err)
}
recorder.Eventf(nodeToRemove, kube_api.EventTypeNormal, "ScaleDown",
"node removed by cluster autoscaler")
return ScaleDownNodeDeleted, nil
}