diff --git a/Makefile b/Makefile index 203b02d17..06e06d2cf 100644 --- 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.12.0 + APPWRAPPER_VERSION ?= v0.13.0 APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper # Upstream AppWrapper is currently only creating release tags of the form `vX.Y.Z` (i.e the version) APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION} diff --git a/config/crd/appwrapper/kustomization.yaml b/config/crd/appwrapper/kustomization.yaml index 994e183b3..96bf81803 100644 --- 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.12.0 +- github.com/project-codeflare/appwrapper/config/crd?ref=v0.13.0 diff --git a/config/crd/crd-appwrapper.yml b/config/crd/crd-appwrapper.yml index f8cbd4e6d..5eaf8c019 100644 --- a/config/crd/crd-appwrapper.yml +++ b/config/crd/crd-appwrapper.yml @@ -125,7 +125,7 @@ spec: type: object type: array podSets: - description: PodSets contained in the Component + description: DeclaredPodSets for the Component (optional for known PodCreating GVKs) items: description: AppWrapperPodSet describes an homogeneous set of pods properties: @@ -243,10 +243,27 @@ spec: name: description: Name is the name of the Component type: string + podSets: + description: PodSets is the validated PodSets for the Component (either from AppWrapperComponent.DeclaredPodSets or inferred by the controller) + items: + description: AppWrapperPodSet describes an homogeneous set of pods + properties: + path: + description: Path is the path Component.Template to the PodTemplateSpec for this PodSet + type: string + replicas: + description: Replicas is the number of pods in this PodSet + format: int32 + type: integer + required: + - path + type: object + type: array required: - apiVersion - kind - name + - podSets type: object type: array conditions: diff --git a/go.mod b/go.mod index 2fd0a7aa8..daa82682c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,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.12.0 + github.com/project-codeflare/appwrapper v0.13.0 github.com/project-codeflare/codeflare-common v0.0.0-20240528061920-68eadc29b5b0 github.com/ray-project/kuberay/ray-operator v1.1.0 go.uber.org/zap v1.26.0 diff --git a/go.sum b/go.sum index 8901492a0..eaf6c3d1d 100644 --- a/go.sum +++ b/go.sum @@ -242,8 +242,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.12.0 h1:QMxryBPK6ir3VK6Qx4NWOA05/s4xU6uDHI/nXmLznvw= -github.com/project-codeflare/appwrapper v0.12.0/go.mod h1:sH9j/rXX6WIlZzFXUOuqK5pagASPZNhuCtdFK+3BDkw= +github.com/project-codeflare/appwrapper v0.13.0 h1:2Br8BPsdHEstw5x0KKAyEbVQJPIspA0/xqbje1dx9OI= +github.com/project-codeflare/appwrapper v0.13.0/go.mod h1:sH9j/rXX6WIlZzFXUOuqK5pagASPZNhuCtdFK+3BDkw= github.com/project-codeflare/codeflare-common v0.0.0-20240528061920-68eadc29b5b0 h1:3Vz7D9/TwzrBNujHQZGb4L6UKu3siAWwVP4Bj3ByUrU= github.com/project-codeflare/codeflare-common v0.0.0-20240528061920-68eadc29b5b0/go.mod h1:tlPi2e1HZQuf7AAFc7keWdVUNcxV+Gfh6Ss4KAQs1O0= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=