Fixed compiler failures.

Author: z103cb

pkg/quotaplugins/quota-simple-rest/quota_rest_manager.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/project-codeflare/multi-cluster-app-dispatcher/cmd/kar-controllers/app/options"
 	arbv1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
-	listersv1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers/controller/v1"
+	listersv1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers/controller/v1beta1"
 	clusterstateapi "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/controller/clusterstate/api"
 	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/controller/quota"
 	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/quotaplugins/util"
@@ -119,7 +119,7 @@ func createId(ns string, n string) string {
 func NewQuotaManager(dispatchedAWDemands map[string]*clusterstateapi.Resource, dispatchedAWs map[string]*arbv1.AppWrapper,
 	awJobLister listersv1.AppWrapperLister, config *rest.Config,
 	serverOptions *options.ServerOption) (*QuotaManager, error) {
-	if serverOptions.QuotaEnabled == false {
+	if !serverOptions.QuotaEnabled {
 		klog.Infof("[NewQuotaManager] Quota management is not enabled.")
 		return nil, nil
 	}
@@ -304,6 +304,11 @@ func (qm *QuotaManager) Fits(aw *arbv1.AppWrapper, awResDemands *clusterstateapi
 	var preemptIds []*arbv1.AppWrapper
 	klog.V(4).Infof("[Fits] Sending request: %v in buffer: %v, buffer size: %v, to uri: %s", req, buf, buf.Len(), uri)
 	response, err := http.Post(uri, "application/json; charset=utf-8", buf)
+	if err != nil {
+		klog.Errorf("[Fits] Fail to add access quotaforestmanager: %s, err=%#v.", uri, err)
+		preemptIds = nil
+		return false, preemptIds, err.Error()
+	}
 	defer response.Body.Close()
 	dump, err := httputil.DumpResponse(response, true)
 	klog.V(10).Infof("[getQuotaTreeIDs] POST Response dump: %q", dump)

test/e2e/queue.go

@@ -297,7 +297,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		Expect(err).NotTo(HaveOccurred())
 		pass := false
 		for true {
-			aw1, err := context.karclient.ArbV1().AppWrappers(aw.Namespace).Get(aw.Name, metav1.GetOptions{})
+			aw1, err := context.karclient.McadV1beta1().AppWrappers(aw.Namespace).Get(context.ctx, aw.Name, metav1.GetOptions{})
 			if err != nil {
 				fmt.Fprint(GinkgoWriter, "Error getting status")
 			}
@@ -470,7 +470,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		// Make sure pods from AW aw-deployment-1-850-cpu have preempted
 		var pass = false
 		for true {
-			aw2Update, err := context.karclient.ArbV1().AppWrappers(aw2.Namespace).Get(aw2.Name, metav1.GetOptions{})
+			aw2Update, err := context.karclient.McadV1beta1().AppWrappers(aw2.Namespace).Get(context.ctx, aw2.Name, metav1.GetOptions{})
 			if err != nil {
 				fmt.Fprintf(GinkgoWriter, "[e2e] MCAD Scheduling Fail Fast Preemption Test - Error getting AW update %v", err)
 			}
@@ -557,7 +557,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		err1 := waitAWPodsReady(context, aw)
 		Expect(err1).NotTo(HaveOccurred(), "Expecting pods to be ready for app wrapper: aw-test-jobtimeout-with-comp-1")
 		time.Sleep(90 * time.Second)
-		aw1, err := context.karclient.ArbV1().AppWrappers(aw.Namespace).Get(aw.Name, metav1.GetOptions{})
+		aw1, err := context.karclient.McadV1beta1().AppWrappers(aw.Namespace).Get(context.ctx, aw.Name, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred(), "Expecting no error when getting app wrapper status")
 		fmt.Fprintf(GinkgoWriter, "[e2e] status of app wrapper: %v.\n", aw1.Status)
 		Expect(aw1.Status.State).To(Equal(arbv1.AppWrapperStateFailed), "Expecting a failed state")
@@ -575,7 +575,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		err1 := waitAWPodsReady(context, aw)
 		Expect(err1).NotTo(HaveOccurred())
 		time.Sleep(1 * time.Minute)
-		aw1, err := context.karclient.ArbV1().AppWrappers(aw.Namespace).Get(aw.Name, metav1.GetOptions{})
+		aw1, err := context.karclient.McadV1beta1().AppWrappers(aw.Namespace).Get(context.ctx, aw.Name, metav1.GetOptions{})
 		if err != nil {
 			fmt.Fprintf(GinkgoWriter, "Error getting status, %v\n", err)
 		}
@@ -597,7 +597,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		err1 := waitAWPodsReady(context, aw)
 		Expect(err1).NotTo(HaveOccurred(), "Expecting pods to be ready for app wrapper: 'aw-test-job-with-comp-ms-21'")
 		time.Sleep(1 * time.Minute)
-		aw1, err := context.karclient.ArbV1().AppWrappers(aw.Namespace).Get(aw.Name, metav1.GetOptions{})
+		aw1, err := context.karclient.McadV1beta1().AppWrappers(aw.Namespace).Get(context.ctx, aw.Name, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred(), "No error is expected when getting status")
 		fmt.Fprintf(GinkgoWriter, "[e2e] MCAD Multi-Item Job Completion Test status of AW %v.\n", aw1.Status)
 		Expect(aw1.Status.State).To(Equal(arbv1.AppWrapperStateCompleted), "Expecting a completed app wrapper status")
@@ -655,7 +655,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		err1 := waitAWPodsReady(context, aw)
 		Expect(err1).NotTo(HaveOccurred())
 		time.Sleep(1 * time.Minute)
-		aw1, err := context.karclient.ArbV1().AppWrappers(aw.Namespace).Get(aw.Name, metav1.GetOptions{})
+		aw1, err := context.karclient.McadV1beta1().AppWrappers(aw.Namespace).Get(context.ctx, aw.Name, metav1.GetOptions{})
 		if err != nil {
 			fmt.Fprintf(GinkgoWriter, "Error getting status, %v", err)
 		}
@@ -704,7 +704,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		time.Sleep(30 * time.Second)
 		err1 := waitAWPodsReady(context, aw)
 		Expect(err1).NotTo(HaveOccurred(), "Expecting pods to be ready for app wrapper: aw-deployment-rhc")
-		aw1, err := context.karclient.ArbV1().AppWrappers(aw.Namespace).Get(aw.Name, metav1.GetOptions{})
+		aw1, err := context.karclient.McadV1beta1().AppWrappers(aw.Namespace).Get(context.ctx, aw.Name, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred(), "Expecting to get app wrapper status")
 		fmt.Fprintf(GinkgoWriter, "[e2e] status of AW %v.\n", aw1.Status.State)
 		Expect(aw1.Status.State).To(Equal(arbv1.AppWrapperStateRunningHoldCompletion))
@@ -722,7 +722,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		time.Sleep(1 * time.Minute)
 		err1 := waitAWPodsReady(context, aw)
 		Expect(err1).NotTo(HaveOccurred())
-		aw1, err := context.karclient.ArbV1().AppWrappers(aw.Namespace).Get(aw.Name, metav1.GetOptions{})
+		aw1, err := context.karclient.McadV1beta1().AppWrappers(aw.Namespace).Get(context.ctx, aw.Name, metav1.GetOptions{})
 		if err != nil {
 			fmt.Fprintf(GinkgoWriter, "Error getting status, %v", err)
 		}