Merge remote-tracking branch 'upstream/main'

Makefile

@@ -12,12 +12,12 @@ VERSION ?= v0.0.0-dev
 BUNDLE_VERSION ?= $(VERSION:v%=%)
 
 # APPWRAPPER_VERSION defines the default version of the AppWrapper controller
-APPWRAPPER_VERSION ?= v0.24.0
+APPWRAPPER_VERSION ?= v0.25.0
 APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
 APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
 
 # KUEUE_VERSION defines the default version of Kueue (used for testing)
-KUEUE_VERSION ?= v0.7.0
+KUEUE_VERSION ?= v0.8.1
 
 USE_RHOAI ?= true
 # KUBERAY_VERSION defines the default version of the KubeRay operator (used for testing)

README.md

@@ -8,11 +8,11 @@ CodeFlare Stack Compatibility Matrix
 
 | Component                    | Version                                                                                           |
 |------------------------------|---------------------------------------------------------------------------------------------------|
-| CodeFlare Operator           | [v1.8.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.8.0)             |
-| CodeFlare-SDK                | [v0.20.2](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.20.2)                |
-| AppWrapper                   | [v0.24.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.24.0)                   |
+| CodeFlare Operator           | [v1.9.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.9.0)             |
+| CodeFlare-SDK                | [v0.21.0](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.21.0)                |
+| AppWrapper                   | [v0.25.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.25.0)                   |
 | KubeRay                      | [v1.1.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.1.0)                           |
-| Kueue                        | [v0.7.0](https://github.com/opendatahub-io/kueue/releases/tag/v0.7.0)                             |
+| Kueue                        | [v0.8.1](https://github.com/opendatahub-io/kueue/releases/tag/v0.8.1)                             |
 <!-- Compatibility Matrix end -->
 
 ## Development

config/crd/appwrapper/kustomization.yaml

@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- github.com/project-codeflare/appwrapper/config/crd?ref=v0.24.0
+- github.com/project-codeflare/appwrapper/config/crd?ref=v0.25.0

config/crd/crd-appwrapper.yml

@@ -26,6 +26,9 @@ spec:
         - jsonPath: .status.conditions[?(@.type=="Unhealthy")].status
           name: Unhealthy
           type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
       name: v1beta2
       schema:
         openAPIV3Schema:

config/manager/params.env

@@ -1,2 +1,2 @@
-codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.8.0
+codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.9.0
 namespace=opendatahub

go.mod

@@ -10,20 +10,20 @@ require (
 	github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0
 	github.com/openshift/api v0.0.0-20230823114715-5fdd7511b790
 	github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
-	github.com/project-codeflare/appwrapper v0.24.0
+	github.com/project-codeflare/appwrapper v0.25.0
 	github.com/project-codeflare/codeflare-common v0.0.0-20240628111341-56c962a09b7e
 	github.com/ray-project/kuberay/ray-operator v1.1.1
 	go.uber.org/zap v1.27.0
-	golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
 	k8s.io/api v0.30.2
-	k8s.io/apiextensions-apiserver v0.29.2
+	k8s.io/apiextensions-apiserver v0.29.6
 	k8s.io/apimachinery v0.30.2
 	k8s.io/client-go v11.0.0+incompatible
 	k8s.io/component-base v0.29.6
-	k8s.io/klog/v2 v2.120.1
+	k8s.io/klog/v2 v2.130.1
 	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
-	sigs.k8s.io/controller-runtime v0.17.3
-	sigs.k8s.io/kueue v0.8.0
+	sigs.k8s.io/controller-runtime v0.17.5
+	sigs.k8s.io/kueue v0.8.1
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -35,10 +35,13 @@ replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.open
 
 replace github.com/jackc/pgx/v4 => github.com/jackc/pgx/v5 v5.5.4
 
-// These replace directives support the backlevel go version required by ODH build
-replace github.com/project-codeflare/appwrapper v0.24.0 => github.com/project-codeflare/appwrapper v0.24.1-0.20240828152845-bfaac68eef30
+// This replace directive supports the backlevel go version required by the ODH build
+replace github.com/project-codeflare/appwrapper v0.25.0 => github.com/project-codeflare/appwrapper v0.25.1-0.20240926155059-30a8af17b8f4
 
-replace sigs.k8s.io/kueue v0.8.0 => github.com/opendatahub-io/kueue v0.7.0-odh-test
+// These replace directives deal with the backlevel ODH kueue version
+replace sigs.k8s.io/kueue v0.8.1 => github.com/opendatahub-io/kueue v0.7.0-odh-2
+
+replace github.com/prometheus/common v0.57.0 => github.com/prometheus/common v0.46.0
 
 require (
 	github.com/aymerick/douceur v0.2.0 // indirect
@@ -50,7 +53,7 @@ require (
 	github.com/distribution/reference v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.8.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -73,6 +76,7 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/kubeflow/training-operator v1.7.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.18 // indirect
@@ -84,29 +88,29 @@ require (
 	github.com/openshift-online/ocm-sdk-go v0.1.411 // indirect
 	github.com/openshift/custom-resource-status v1.1.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_golang v1.20.2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.46.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/common v0.57.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/oauth2 v0.20.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sys v0.23.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.24.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiserver v0.29.6 // indirect
-	k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
+	k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
 	sigs.k8s.io/jobset v0.5.2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect