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

Avoid dropping resourcequota metadata in controller

pull/58/head
Jordan Liggitt 2018-10-19 14:52:53 -04:00
parent 34196ac946
commit fdd87a8872
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/controller/resourcequota/resource_quota_controller.go
View File

@ -347,24 +347,17 @@ func (rq *ResourceQuotaController) syncResourceQuota(resourceQuota *v1.ResourceQ
// Create a usage object that is based on the quota resource version that will handle updates // Create a usage object that is based on the quota resource version that will handle updates
// by default, we preserve the past usage observation, and set hard to the current spec // by default, we preserve the past usage observation, and set hard to the current spec
usage := v1.ResourceQuota{ usage := resourceQuota.DeepCopy()
ObjectMeta: metav1.ObjectMeta{ usage.Status = v1.ResourceQuotaStatus{
Name: resourceQuota.Name, Hard: hardLimits,
Namespace: resourceQuota.Namespace, Used: used,
ResourceVersion: resourceQuota.ResourceVersion,
Labels: resourceQuota.Labels,
Annotations: resourceQuota.Annotations},
Status: v1.ResourceQuotaStatus{
Hard: hardLimits,
Used: used,
},
} }
dirty = dirty || !quota.Equals(usage.Status.Used, resourceQuota.Status.Used) dirty = dirty || !quota.Equals(usage.Status.Used, resourceQuota.Status.Used)
// there was a change observed by this controller that requires we update quota // there was a change observed by this controller that requires we update quota
if dirty { if dirty {
_, err = rq.rqClient.ResourceQuotas(usage.Namespace).UpdateStatus(&usage) _, err = rq.rqClient.ResourceQuotas(usage.Namespace).UpdateStatus(usage)
return err return err
} }
return nil return nil