Skip to content

Generate MCAD clients using clientgen tools #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 2, 2023
Merged

Generate MCAD clients using clientgen tools #533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e14c341
Generate MCAD clients using clientgen tools
z103cb Aug 1, 2023
5530dfc
Added missing files.
z103cb Aug 1, 2023
0a3b9ce
Added quota management package to the generation
z103cb Aug 1, 2023
87bb27c
Removed previously obsoleted code
z103cb Aug 2, 2023
630df6d
Fixed compiler failures.
z103cb Aug 2, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixed compiler failures.
  • Loading branch information
@z103cb
z103cb committed Aug 2, 2023
commit 630df6d108e4b86c809c1dbb9f06f4cd1cf6459b
9 changes: 7 additions & 2 deletions pkg/quotaplugins/quota-simple-rest/quota_rest_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions test/e2e/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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")
Expand All @@ -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)
}
Expand All @@ -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")
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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))
Expand All @@ -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)
}
Expand Down
Loading