Move AppWrapper API to workload.codeflare.dev group

Author: astefanutti

PROJECT

@@ -5,11 +5,11 @@ plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: instascale
-repo: github.ibm.com/project-codeflare/instascale
+repo: github.com/project-codeflare/instascale
 resources:
 - controller: true
-  domain: my.domain
-  group: mcad.ibm.com
+  domain: codeflare.dev
+  group: workload.codeflare.dev
   kind: AppWrapper
   version: v1beta1
 version: "0.0.1"

config/rbac/role.yaml

@@ -24,7 +24,7 @@ rules:
   verbs:
   - get
 - apiGroups:
-  - instascale.ibm.com.instascale.ibm.com
+  - workload.codeflare.dev
   resources:
   - appwrappers
   verbs:
@@ -36,13 +36,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - instascale.ibm.com.instascale.ibm.com
+  - workload.codeflare.dev
   resources:
   - appwrappers/finalizers
   verbs:
   - update
 - apiGroups:
-  - instascale.ibm.com.instascale.ibm.com
+  - workload.codeflare.dev
   resources:
   - appwrappers/status
   verbs:

config/samples/kustomization.yaml

@@ -76,12 +76,12 @@ const (
 	pullSecretAuthKey = "cloud.openshift.com"
 )
 
-//+kubebuilder:rbac:groups=instascale.ibm.com.instascale.ibm.com,resources=appwrappers,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=instascale.ibm.com.instascale.ibm.com,resources=appwrappers/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=instascale.ibm.com.instascale.ibm.com,resources=appwrappers/finalizers,verbs=update
+// +kubebuilder:rbac:groups=workload.codeflare.dev,resources=appwrappers,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=workload.codeflare.dev,resources=appwrappers/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=workload.codeflare.dev,resources=appwrappers/finalizers,verbs=update
 
-//+kubebuilder:rbac:groups=apps,resources=machineset,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=apps,resources=machineset/status,verbs=get
+// +kubebuilder:rbac:groups=apps,resources=machineset,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=apps,resources=machineset/status,verbs=get
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -99,7 +99,7 @@ func (r *AppWrapperReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	var appwrapper arbv1.AppWrapper
 	if err := r.Get(ctx, req.NamespacedName, &appwrapper); err != nil {
 		if apierrors.IsNotFound(err) {
-			//ignore not-found errors, since we can get them on delete requests.
+			// ignore not-found errors, since we can get them on delete requests.
 			return ctrl.Result{}, nil
 		}
 		klog.Error(err, "unable to fetch appwrapper")
@@ -128,7 +128,7 @@ func (r *AppWrapperReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if !cache.WaitForCacheSync(stopper, informer.HasSynced) {
 		klog.Info("Wait for cache to sync")
 	}
-	//TODO: do we need dual sync??
+	// TODO: do we need dual sync??
 	msInformerHasSynced = informer.HasSynced()
 	addAppwrappersThatNeedScaling()
 	<-stopper
@@ -206,7 +206,7 @@ func addAppwrappersThatNeedScaling() {
 	if err != nil {
 		klog.Fatalf("Error creating client: %v", err)
 	}
-	queueJobInformer := arbinformersFactory.NewSharedInformerFactory(awJobClient, 0).Mcad().V1beta1().AppWrappers()
+	queueJobInformer := arbinformersFactory.NewSharedInformerFactory(awJobClient, 0).Workload().V1beta1().AppWrappers()
 	queueJobInformer.Informer().AddEventHandler(
 		cache.FilteringResourceEventHandler{
 			FilterFunc: func(obj interface{}) bool {
@@ -241,7 +241,7 @@ func onAdd(obj interface{}) {
 	if ok {
 		klog.Infof("Found Appwrapper named %s that has status %v", aw.Name, aw.Status.State)
 		if aw.Status.State == arbv1.AppWrapperStateEnqueued || aw.Status.State == "" && aw.Labels["orderedinstance"] != "" {
-			//scaledAppwrapper = append(scaledAppwrapper, aw.Name)
+			// scaledAppwrapper = append(scaledAppwrapper, aw.Name)
 			demandPerInstanceType := discoverInstanceTypes(aw)
 
 			if demandPerInstanceType != nil {
@@ -314,9 +314,9 @@ func canScaleMachinepool(demandPerInstanceType map[string]int) bool {
 
 func scaleUp(aw *arbv1.AppWrapper, demandMapPerInstanceType map[string]int) {
 	if msInformerHasSynced {
-		//Assumption is made that the cluster has machineset configure that AW needs
+		// Assumption is made that the cluster has machineset configure that AW needs
 		for userRequestedInstanceType := range demandMapPerInstanceType {
-			//TODO: get unique machineset
+			// TODO: get unique machineset
 			replicas := demandMapPerInstanceType[userRequestedInstanceType]
 
 			if useMachineSets {
@@ -328,7 +328,6 @@ func scaleUp(aw *arbv1.AppWrapper, demandMapPerInstanceType map[string]int) {
 		klog.Infof("Completed Scaling for %v", aw.Name)
 		scaledAppwrapper = append(scaledAppwrapper, aw.Name)
 	}
-
 }
 
 func IsAwPending() (false bool, aw *arbv1.AppWrapper) {
@@ -338,7 +337,7 @@ func IsAwPending() (false bool, aw *arbv1.AppWrapper) {
 	}
 
 	for _, aw := range queuedJobs {
-		//skip
+		// skip
 		if contains(scaledAppwrapper, aw.Name) {
 			continue
 		}
@@ -414,7 +413,7 @@ func scaleDown(aw *arbv1.AppWrapper) {
 		deleteMachineSet(aw)
 	}
 
-	//make a separate slice
+	// make a separate slice
 	for idx := range scaledAppwrapper {
 		if scaledAppwrapper[idx] == aw.Name {
 			scaledAppwrapper[idx] = ""

controllers/appwrapper_controller.go

@@ -7,7 +7,7 @@ require (
 	github.com/openshift-online/ocm-sdk-go v0.1.327
 	github.com/openshift/api v0.0.0-20220411210816-c3bb724c282a
 	github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
-	github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.0
+	github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.1-0.20230831150053-05b1af83014c
 	k8s.io/api v0.26.2
 	k8s.io/apimachinery v0.26.2
 	k8s.io/client-go v0.26.2

go.mod

@@ -408,10 +408,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.1-0.20230809102455-ab92337aadff h1:FFjhRjektX6FbuQ1ygzgjQraj1vGSUXCmDQHlA3ncsA=
-github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.1-0.20230809102455-ab92337aadff/go.mod h1:h4dPKbrJwBYvnSZFxGrVRZHfMUROaBO8YgdHFfDsSD8=
-github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.0 h1:4J3vW+vuCBHyocd3huZy3FJhOw5acaBHFLYwutkTE/E=
-github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.0/go.mod h1:gtTl8Tsl+X+bGhqVudLoveINR6IkN+sVvH0J+VZIP40=
+github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.1-0.20230831150053-05b1af83014c h1:LjCgRcjtkd9byePczvxGBLjdM22M2BCTB76FoEk2fkU=
+github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.1-0.20230831150053-05b1af83014c/go.mod h1:gtTl8Tsl+X+bGhqVudLoveINR6IkN+sVvH0J+VZIP40=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=

go.sum

@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-batch-1
@@ -9,7 +9,6 @@ metadata:
 spec:
   priority: 9
   resources:
-    Items: []
     GenericItems:
     - replicas: 1
       #new addition

hack/sample/aw-batch-1.yaml

@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-batch-2
@@ -9,7 +9,6 @@ metadata:
 spec:
   priority: 9
   resources:
-    Items: []
     GenericItems:
     - replicas: 1
       #new addition