Merge pull request #147 from dmatch01/quota-management-quota-lib-int-03-add-qm-bknd

Quota management Part 03 quota management (qm) lib integration add qm backend

Author: dmatch01

CONTROLLER_VERSION

@@ -1 +1 @@
-1.29.27
+1.29.28

Makefile

@@ -91,7 +91,7 @@ endif
 
 mcad-controller-private: init generate-code
 $(info Compiling controller)
-CGO_ENABLED=0 GOARCH=amd64 GOPRIVATE=github.ibm.com/ai-foundation/quota-manager go build -modfile ./private.mod -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
+CGO_ENABLED=0 GOARCH=amd64 GOPRIVATE=github.ibm.com/* go build -tags private -modfile ./private.mod -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
 
 coverage:
 #KUBE_COVER=y hack/make-rules/test.sh $(WHAT) $(TESTS)

deployment/mcad-controller/templates/configmap.yaml

@@ -5,6 +5,7 @@ metadata:
  name: {{ .Values.configMap.name }}
  namespace: kube-system
 data:
+ QUOTA_ENABLED: {{ .Values.configMap.quotaEnabled }}
  DISPATCHER_MODE: {{ .Values.configMap.dispatcherMode }}
  DISPATCHER_AGENT_CONFIGS: {{ .Values.configMap.agentConfigs }}
  QUOTA_REST_URL: {{ .Values.configMap.quotaRestUrl }}

deployment/mcad-controller/templates/deployment.yaml

@@ -32,7 +32,7 @@ spec:
  nodePort: 30082
 #{{ end }}
 ---
-#{{ if .Values.configMap.multiCluster }}
+#{{ if (eq .Values.configMap.multiCluster "true") }}
 apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:

deployment/mcad-controller/values.yaml

@@ -41,10 +41,11 @@ nodeSelector:
 
 configMap:
  name:
- multiCluster: false
- dispatcherMode: "false"
- agentConfigs:
- quoteRestUrl:
+ quotaEnabled: '"false"'
+ multiCluster: '"false"'
+ dispatcherMode: '"false"'
+ agentConfigs: ""
+ quoteRestUrl: ""
 
 volumes:
  hostPath:

pkg/controller/queuejob/queuejob_controller_ex.go

@@ -1675,7 +1675,7 @@ func (cc *XController) manageQueueJob(qj *arbv1.AppWrapper, podPhaseChanges bool
 klog.Errorf("[Dispatcher Controller] AppWrapper %s not found in dispatcher mapping." , qj.Name)
 }
 if klog.V(10).Enabled() {
-current_time:=time.Now()
+current_time := time.Now()
 klog.V(10).Infof("[Dispatcher Controller] XQJ %s has Overhead After Dispatching: %s", qj.Name,current_time.Sub(qj.CreationTimestamp.Time))
 klog.V(10).Infof("[TTime] %s, %s: WorkerAfterDispatch", qj.Name, time.Now().Sub(qj.CreationTimestamp.Time))
 }