tweaks

Author: dgrove-oss

CONTRIBUTING.md

@@ -14,15 +14,6 @@ The following should be installed in your working environment:
 ## Basic Overview
 The main entrypoint for the operator is `main.go`
 
-The AppWrapper custom resources are defined under the `api` dir:
- - See `appwraper_types.go`
-
-The AppWrapper resource templates can be found under `config/internal`:
- - Sorted under `appwrapper` subdirs
-
-The code for AppWrapper resource reconcilliation can be found in the `controllers` dir:
- - See `appwrapper_controller.go`
-
 ## Building and Deployment
 If changes are made in the `api` dir, run: `make manifests`
  - This will generate new CRDs and associated files
@@ -53,7 +44,6 @@ The CodeFlare Operator currently has unit tests and pre-commit checks
  - Note that both are required for CI to pass on pull requests
 
 To write and inspect unit tests:
- - AppWrapper unit tests under `appwrapper_controller_test.go` in the `controllers` dir
  - Unit test functions are defined in `suite_test.go` (with utils in `util/util.go`) in the `controllers dir`
  - Test cases defined under `controllers/testdata`
 

README.md

@@ -9,7 +9,7 @@ CodeFlare Stack Compatibility Matrix
 | Component                | Version                                                                                  |
 |--------------------------|------------------------------------------------------------------------------------------|
 | CodeFlare Operator       | [v1.2.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.2.0)    |
-| AppWrapper               | [v0.6.4](https://github.com/project-codeflare/appwrapper/releases/tag/v0.6.3)            |
+| AppWrapper               | [v0.7.2](https://github.com/project-codeflare/appwrapper/releases/tag/v0.7.2)            |
 | CodeFlare-SDK            | [v0.14.0](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.14.0)       |
 | KubeRay                  | [v1.0.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.0.0)                  |
 <!-- Compatibility Matrix end -->

main.go

@@ -194,13 +194,14 @@ func main() {
 		exitOnError(err, "Could not determine if RayCluster CR present on cluster.")
 	}
 
-	v, err = HasAPIResourceForGVK(kubeClient.DiscoveryClient, kueue.GroupVersion.WithKind("Workload"))
-	if v {
+	v1, err1 := HasAPIResourceForGVK(kubeClient.DiscoveryClient, kueue.GroupVersion.WithKind("Workload"))
+	v2, err2 := HasAPIResourceForGVK(kubeClient.DiscoveryClient, mcadv1beta2.GroupVersion.WithKind("AppWrapper"))
+	if v1 && v2 {
 		// Ascynchronous because controllers need to wait for certificate to be ready for webhooks to work
 		go awctrl.SetupControllers(ctx, mgr, cfg.AppWrapper, certsReady, setupLog)
 		exitOnError(awctrl.SetupIndexers(ctx, mgr, cfg.AppWrapper), "unable to setup indexers")
-	} else if err != nil {
-		exitOnError(err, "Could not determine if Workload CR present on cluster.")
+	} else if err1 != nil || err2 != nil {
+		exitOnError(err, "Could not determine if AppWrapper and Workload CRs present on cluster.")
 	}
 
 	exitOnError(awctrl.SetupProbeEndpoints(mgr, certsReady), "unable to setup probe endpoints")