Skip to content

Commit 6ef824b

Browse files
dgrove-ossopenshift-merge-bot[bot]
dgrove-oss
authored and
openshift-merge-bot[bot]
committed
Update AppWrapper from 1.0.4 to 1.0.7
Significant Changes: + node monitoring: correctly recognize NotReady Nodes as unscheduable + remove stray logging message + enhanced TAS support + Update Kueue from 0.10.1 to 0.10.2
1 parent 9d1836d commit 6ef824b

File tree

5 files changed

+29
-15
lines changed

5 files changed

+29
-15
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ VERSION ?= v0.0.0-dev
1212
BUNDLE_VERSION ?= $(VERSION:v%=%)
1313

1414
# APPWRAPPER_VERSION defines the default version of the AppWrapper controller
15-
APPWRAPPER_VERSION ?= v1.0.4
15+
APPWRAPPER_VERSION ?= v1.0.7
1616
APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
1717
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
1818

1919
# KUEUE_VERSION defines the default version of Kueue (used for testing)
20-
KUEUE_VERSION ?= v0.10.1
20+
KUEUE_VERSION ?= v0.10.2
2121

2222
USE_RHOAI ?= true
2323
# KUBERAY_VERSION defines the default version of the KubeRay operator (used for testing)

‎config/crd/appwrapper/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- github.com/project-codeflare/appwrapper/config/crd?ref=v1.0.4
4+
- github.com/project-codeflare/appwrapper/config/crd?ref=v1.0.7

‎config/crd/crd-appwrapper.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ spec:
148148
items:
149149
description: AppWrapperPodSet describes an homogeneous set of pods
150150
properties:
151+
annotations:
152+
additionalProperties:
153+
type: string
154+
description: |-
155+
Annotations is an unstructured key value map that may be used to store and retrieve
156+
arbitrary metadata about the PodSet to customize its treatment by the AppWrapper controller.
157+
type: object
151158
path:
152159
description: Path is the path Component.Template to the PodTemplateSpec for this PodSet
153160
type: string
@@ -263,6 +270,13 @@ spec:
263270
items:
264271
description: AppWrapperPodSet describes an homogeneous set of pods
265272
properties:
273+
annotations:
274+
additionalProperties:
275+
type: string
276+
description: |-
277+
Annotations is an unstructured key value map that may be used to store and retrieve
278+
arbitrary metadata about the PodSet to customize its treatment by the AppWrapper controller.
279+
type: object
266280
path:
267281
description: Path is the path Component.Template to the PodTemplateSpec for this PodSet
268282
type: string

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0
1111
github.com/openshift/api v0.0.0-20240904015708-69df64132c91
1212
github.com/openshift/client-go v0.0.0-20240904130219-3795e907a202
13-
github.com/project-codeflare/appwrapper v1.0.4
13+
github.com/project-codeflare/appwrapper v1.0.7
1414
github.com/project-codeflare/codeflare-common v0.0.0-20250321141415-67bb8bd932df
1515
github.com/ray-project/kuberay/ray-operator v1.2.2
1616
go.uber.org/zap v1.27.0
17-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
17+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
1818
k8s.io/api v0.31.4
1919
k8s.io/apiextensions-apiserver v0.31.2
2020
k8s.io/apimachinery v0.31.4
@@ -23,7 +23,7 @@ require (
2323
k8s.io/klog/v2 v2.130.1
2424
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2525
sigs.k8s.io/controller-runtime v0.19.3
26-
sigs.k8s.io/kueue v0.10.1
26+
sigs.k8s.io/kueue v0.10.2
2727
sigs.k8s.io/yaml v1.4.0
2828
)
2929

@@ -99,7 +99,7 @@ require (
9999
golang.org/x/term v0.27.0 // indirect
100100
golang.org/x/text v0.21.0 // indirect
101101
golang.org/x/time v0.6.0 // indirect
102-
golang.org/x/tools v0.26.0 // indirect
102+
golang.org/x/tools v0.28.0 // indirect
103103
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
104104
google.golang.org/protobuf v1.35.1 // indirect
105105
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
223223
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
224224
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
225225
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
226-
github.com/project-codeflare/appwrapper v1.0.4 h1:364zQLX0tsi4LvBBYNKZL7PPbNWPbVU7vK6+/kVV/FQ=
227-
github.com/project-codeflare/appwrapper v1.0.4/go.mod h1:A1b6bMFNMX5Btv3ckgeuAHVVZzp1G30pSBe6BE/xJWE=
226+
github.com/project-codeflare/appwrapper v1.0.7 h1:sbSXpyqEnlZJNZrYC8bk5FH88BXd4WQemiVAu0wT8iQ=
227+
github.com/project-codeflare/appwrapper v1.0.7/go.mod h1:m5GmMVTZfMI7kOmvtUZeGXQbaBZOwWKzRY4tSZO6kn8=
228228
github.com/project-codeflare/codeflare-common v0.0.0-20250321141415-67bb8bd932df h1:na2yAFNrALqd1+EtfejXtAMOXNTHJvKb6+8TLKnfopc=
229229
github.com/project-codeflare/codeflare-common v0.0.0-20250321141415-67bb8bd932df/go.mod h1:tu2Wk/RgUlTaSPk7TKadn4DEIjz0qhBCF/qSq2ZqVp0=
230230
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
@@ -276,8 +276,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
276276
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
277277
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
278278
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
279-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
280-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
279+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
280+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
281281
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
282282
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
283283
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -370,8 +370,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
370370
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
371371
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM=
372372
golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
373-
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
374-
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
373+
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
374+
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
375375
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
376376
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
377377
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -469,8 +469,8 @@ sigs.k8s.io/jobset v0.7.1/go.mod h1:cbBuQ6QrTU88x5PrDqcC5AI28YyTSQCIcRTLNTJoHDE=
469469
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
470470
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
471471
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
472-
sigs.k8s.io/kueue v0.10.1 h1:td+Nae1z9L4IrkqJKOIMsKp2TmwUAvk/hWKhSaFupwk=
473-
sigs.k8s.io/kueue v0.10.1/go.mod h1:3yzOvGI0sPOC3VL1ihVIrzc8mkSyCVTL+SrouewwRWw=
472+
sigs.k8s.io/kueue v0.10.2 h1:p0C2zZiSCb6Dt77jCU/DMx2LFujN4etIGjjj7q+Ylao=
473+
sigs.k8s.io/kueue v0.10.2/go.mod h1:3yzOvGI0sPOC3VL1ihVIrzc8mkSyCVTL+SrouewwRWw=
474474
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
475475
sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
476476
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 h1:sCP7Vv3xx/CWIuTPVN38lUPx0uw0lcLfzaiDa8Ja01A=

0 commit comments

Comments
 (0)