Update AppWrapper for Kueue 0.11 (#328)

* remove appwrapper external framework integration
* partially update hack/kueue-config for kueue 0.11
* remove slack cluster queue functionality
* appwrapper will work with a default-configured Kueue 0.11
* Update AppWrapper architecture for Kueue 0.11
* Update CI to use  kueue v0.11.0-rc1

Author: dgrove-oss

.github/workflows/CI-standalone.yaml

@@ -56,7 +56,7 @@ jobs:
     - name: Deploy AppWrapper controller
       run: |
         make kind-push -e GIT_BRANCH=${{ env.GIT_BRANCH }} TAG=${{ env.GIT_BRANCH }}-${{ env.TAG }}
-        make deploy -e GIT_BRANCH=${{ env.GIT_BRANCH }} TAG=${{ env.GIT_BRANCH }}-${{ env.TAG }} ENV=standalone
+        make deploy -e GIT_BRANCH=${{ env.GIT_BRANCH }} TAG=${{ env.GIT_BRANCH }}-${{ env.TAG }} ENV=default
 
     - name: Run E2E tests
       run: LABEL_FILTER="Metrics,Standalone,Webhook" ./hack/run-tests-on-cluster.sh

Makefile

@@ -99,8 +99,6 @@ EXTERNAL_CRDS_DIR ?= $(shell pwd)/dep-crds
 KUEUE_ROOT = $(shell go list -m -mod=readonly -f "{{.Dir}}" sigs.k8s.io/kueue)
 .PHONY: dep-crds
 dep-crds: ## Copy CRDs from external operators to dep-crds directory.
-	mkdir -p $(EXTERNAL_CRDS_DIR)/kueue
-	cp -f $(KUEUE_ROOT)/config/components/crd/bases/* $(EXTERNAL_CRDS_DIR)/kueue
 
 .PHONY: test
 test: manifests generate fmt vet dep-crds envtest ## Run unit tests.

api/v1beta2/groupversion_info.go

@@ -28,6 +28,9 @@ var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "workload.codeflare.dev", Version: "v1beta2"}
 
+	// AppWrapperKind is the kind name
+	AppWrapperKind = "AppWrapper"
+
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 

cmd/main.go

@@ -47,8 +47,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/yaml"
 
-	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
-
 	awv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 	"github.com/project-codeflare/appwrapper/internal/metrics"
 	"github.com/project-codeflare/appwrapper/pkg/config"
@@ -66,7 +64,6 @@ var (
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(kueue.AddToScheme(scheme))
 	utilruntime.Must(awv1beta2.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }

config/default/config.yaml

@@ -4,8 +4,6 @@ metadata:
   name: operator-config
 data:
   config.yaml: |
-    appwrapper:
-      enableKueueIntegrations: true
     controllerManager:
       health:
         bindAddress: ":8081"

config/dev/config.yaml

@@ -4,8 +4,6 @@ metadata:
   name: operator-config
 data:
   config.yaml: |
-    appwrapper:
-      enableKueueIntegrations: false
     controllerManager:
       health:
         bindAddress: "localhost:0"

config/rbac/role.yaml

@@ -4,15 +4,6 @@ kind: ClusterRole
 metadata:
   name: manager-role
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-  - update
-  - watch
 - apiGroups:
   - ""
   resources:
@@ -114,51 +105,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - kueue.x-k8s.io
-  resources:
-  - clusterqueues
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kueue.x-k8s.io
-  resources:
-  - resourceflavors
-  - workloadpriorityclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - kueue.x-k8s.io
-  resources:
-  - workloads
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kueue.x-k8s.io
-  resources:
-  - workloads/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - kueue.x-k8s.io
-  resources:
-  - workloads/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ray.io
   resources:
@@ -172,14 +118,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - scheduling.k8s.io
-  resources:
-  - priorityclasses
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - scheduling.sigs.k8s.io
   - scheduling.x-k8s.io