add default quota

Author: asm582

pkg/controller/queuejob/queuejob_controller_ex.go

@@ -1270,15 +1270,21 @@ func (qjm *XController) ScheduleNext() {
 				// All non-quota submission AWs will consume quota from default node.
 
 				//Find if AW has label named "quota_context"
-				allLabels := qj.Labels
+				allLabels := qj.DeepCopy().Labels
 				quotaSetForAw := false
 				for labelk, _ := range allLabels {
 					if labelk == "quota_context" {
 						quotaSetForAw = true
 					}
 				}
+				//When label "quota_context" not found add it
+				//this will only work for quota tree and not quota forest
 				if quotaSetForAw == false {
-					qj.Labels["quota_context"] = "default"
+					if len(allLabels) == 0 {
+						allLabels = make(map[string]string)
+					}
+					allLabels["quota_context"] = "default"
+					qj.SetLabels(allLabels)
 					if err := qjm.updateEtcd(qj, "ScheduleNext - setDefaultQuota"); err == nil {
 						klog.V(3).Infof("[ScheduleNext] Default quota added to AW %v", qj.Name)
 					}

test/e2e-kuttl/install-quota-subtree.yaml

@@ -53,5 +53,16 @@ spec:
       quotas:
         hardLimit: true
         requests:
+<<<<<<< HEAD:test/e2e-kuttl/install-quota-subtree.yaml
           cpu: 900m
-          memory: 300Mi
+          memory: 300Mi
+=======
+          cpu: 900
+          memory: 300
+    - name: default
+      quotas:
+        hardLimit: true
+        requests:
+          cpu: 1075
+          memory: 1045
+>>>>>>> 9c356c9f (add default quota):test/e2e-kuttl/quota-forest/01-install.yaml