Merge remote-tracking branch 'upstream/main'

red-hat-data-services · Oct 17, 2024 · 9d7b418 · 9d7b418
2 parents d6b1270 + 0a10ff5
commit 9d7b418
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ VERSION ?= v0.0.0-dev
 BUNDLE_VERSION ?= $(VERSION:v%=%)
 
 # APPWRAPPER_VERSION defines the default version of the AppWrapper controller
-APPWRAPPER_VERSION ?= v0.25.0
+APPWRAPPER_VERSION ?= v0.26.0
 APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
 APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
 

diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@ CodeFlare Stack Compatibility Matrix
 
 | Component                    | Version                                                                                           |
 |------------------------------|---------------------------------------------------------------------------------------------------|
-| 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)                   |
+| CodeFlare Operator           | [v1.10.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.10.0)             |
+| CodeFlare-SDK                | [v0.22.0](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.22.0)                |
+| AppWrapper                   | [v0.26.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.26.0)                   |
 | KubeRay                      | [v1.1.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.1.0)                           |
 | Kueue                        | [v0.8.1](https://github.com/opendatahub-io/kueue/releases/tag/v0.8.1)                             |
 <!-- Compatibility Matrix end -->

diff --git a/config/crd/appwrapper/kustomization.yaml b/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.25.0
+- github.com/project-codeflare/appwrapper/config/crd?ref=v0.26.0
diff --git a/config/crd/crd-appwrapper.yml b/config/crd/crd-appwrapper.yml
@@ -152,6 +152,9 @@ spec:
                       - template
                     type: object
                   type: array
+                managedBy:
+                  description: ManagedBy is used to indicate the controller or entity that manages the AppWrapper.
+                  type: string
                 suspend:
                   description: Suspend suspends the AppWrapper when set to true
                   type: boolean

diff --git a/config/manager/params.env b/config/manager/params.env
@@ -1,2 +1,2 @@
-codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.9.0
+codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.10.0
 namespace=opendatahub
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ 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.25.0
+	github.com/project-codeflare/appwrapper v0.26.0
 	github.com/project-codeflare/codeflare-common v0.0.0-20240930133152-11fd6e3be6b3
 	github.com/ray-project/kuberay/ray-operator v1.1.1
 	go.uber.org/zap v1.27.0
@@ -36,7 +36,7 @@ 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
 
 // 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 github.com/project-codeflare/appwrapper v0.26.0 => github.com/project-codeflare/appwrapper v0.26.1-0.20241016213414-d3825c270f61
 
 // 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

diff --git a/go.sum b/go.sum
@@ -247,8 +247,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/appwrapper v0.25.1-0.20240926155059-30a8af17b8f4 h1:XYjq50WpGxagELHurCXyiirvdM9OzxTnCMcQC9gebnQ=
-github.com/project-codeflare/appwrapper v0.25.1-0.20240926155059-30a8af17b8f4/go.mod h1:zDALq3/gn+eiczpD7TBZWWbAVuwcCGDFuN/77oh+CDw=
+github.com/project-codeflare/appwrapper v0.26.1-0.20241016213414-d3825c270f61 h1:jSqZDG4RihAkBaQp2fYFbp6EO4EGMv0pxfvO+6C2Cis=
+github.com/project-codeflare/appwrapper v0.26.1-0.20241016213414-d3825c270f61/go.mod h1:zDALq3/gn+eiczpD7TBZWWbAVuwcCGDFuN/77oh+CDw=
 github.com/project-codeflare/codeflare-common v0.0.0-20240930133152-11fd6e3be6b3 h1:Eupu9yxaGTddtoxb9SjrYJlokRHEYU5NNVRQmdXSNVs=
 github.com/project-codeflare/codeflare-common v0.0.0-20240930133152-11fd6e3be6b3/go.mod h1:v7XKwaDoCspsHQlWJNarO7gOpR+iumSS+c1bWs3kJOI=
 github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=