Skip to content

Commit 03d5bee

Browse files
dgrove-ossopenshift-merge-bot[bot]
dgrove-oss
authored and
openshift-merge-bot[bot]
committed
Update AppWrappers to v0.21.1
Highlights: * Update to Kueue 0.7.1 * Remove ChildAdmissionController only needed by Kueue 0.6 * Flexible configuration of Kueue's GenericJob Reconciller * Correctly handle wrapped resources that use generateName Full Changelog: project-codeflare/appwrapper@v0.20.2...v0.21.1
1 parent a8b6591 commit 03d5bee

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ 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 ?= v0.20.2
15+
APPWRAPPER_VERSION ?= v0.21.1
1616
APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
17-
# Upstream AppWrapper is currently only creating release tags of the form `vX.Y.Z` (i.e the version)
1817
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
1918

2019
# KUEUE_VERSION defines the default version of Kueue (used for testing)

‎config/crd/appwrapper/kustomization.yaml

+1-1
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=v0.20.2
4+
- github.com/project-codeflare/appwrapper/config/crd?ref=v0.21.1

‎go.mod

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ require (
99
github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0
1010
github.com/openshift/api v0.0.0-20230823114715-5fdd7511b790
1111
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
12-
github.com/project-codeflare/appwrapper v0.20.2
12+
github.com/project-codeflare/appwrapper v0.21.1
1313
github.com/project-codeflare/codeflare-common v0.0.0-20240628111341-56c962a09b7e
1414
github.com/ray-project/kuberay/ray-operator v1.1.1
1515
go.uber.org/zap v1.27.0
16-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
16+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
1717
k8s.io/api v0.30.1
1818
k8s.io/apiextensions-apiserver v0.29.2
1919
k8s.io/apimachinery v0.30.1
@@ -22,7 +22,7 @@ require (
2222
k8s.io/klog/v2 v2.120.1
2323
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2424
sigs.k8s.io/controller-runtime v0.17.3
25-
sigs.k8s.io/kueue v0.7.0
25+
sigs.k8s.io/kueue v0.7.1
2626
sigs.k8s.io/yaml v1.4.0
2727
)
2828

@@ -34,13 +34,18 @@ replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.open
3434

3535
replace github.com/jackc/pgx/v4 => github.com/jackc/pgx/v5 v5.5.4
3636

37+
// These replace directives support the backlevel go version required by ODH build
38+
replace github.com/project-codeflare/appwrapper v0.21.1 => github.com/project-codeflare/appwrapper v0.21.2-0.20240712173553-5b007c947b37
39+
40+
replace sigs.k8s.io/kueue v0.7.1 => github.com/opendatahub-io/kueue v0.7.0-odh-test
41+
3742
require (
3843
github.com/aymerick/douceur v0.2.0 // indirect
3944
github.com/beorn7/perks v1.0.1 // indirect
4045
github.com/blang/semver/v4 v4.0.0 // indirect
4146
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
4247
github.com/cespare/xxhash/v2 v2.2.0 // indirect
43-
github.com/davecgh/go-spew v1.1.1 // indirect
48+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4449
github.com/distribution/reference v0.5.0 // indirect
4550
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4651
github.com/evanphx/json-patch v5.6.0+incompatible // indirect

‎go.sum

+8-7
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8
3131
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
3232
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3333
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
34-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3534
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
35+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3637
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
3738
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
3839
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
@@ -229,6 +230,8 @@ github.com/open-policy-agent/frameworks/constraint v0.0.0-20230822235116-f0b62fe
229230
github.com/open-policy-agent/frameworks/constraint v0.0.0-20230822235116-f0b62fe1e4c4/go.mod h1:54/KzLMvA5ndBVpm7B1OjLeV0cUtTLTz2bZ2OtydLpU=
230231
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
231232
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
233+
github.com/opendatahub-io/kueue v0.7.0-odh-test h1:QZg/iBs/+kbX7zIxktAi9j5yOezEgXq9BCLSvHJ+BIU=
234+
github.com/opendatahub-io/kueue v0.7.0-odh-test/go.mod h1:uTAgWTJVrIkm1FPbp6BnhZhr29zlUcgzb5z1m5rFw9k=
232235
github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0 h1:tOX6R3N41pdyC+E1TeLErVY7KJV0zg9GAd/Z7xLT7no=
233236
github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0/go.mod h1:Hgy6bUPl29drwjs9F/5PZHUopOOojQpAPv1mWh3jnJQ=
234237
github.com/openshift-online/ocm-sdk-go v0.1.411 h1:DlNHC3yqmk77Wzc+YJBsd0ccHXn7JFwGC1C1NOp/faw=
@@ -243,8 +246,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
243246
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
244247
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
245248
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
246-
github.com/project-codeflare/appwrapper v0.20.2 h1:0+kLqVZUqSaLf0OaoQQoD3greKr8untX2jjYFAfRQ+U=
247-
github.com/project-codeflare/appwrapper v0.20.2/go.mod h1:mGGvStJ1dVQTDnLdTttuYMem/okn4aVa+k93MDjrAtE=
249+
github.com/project-codeflare/appwrapper v0.21.2-0.20240712173553-5b007c947b37 h1:x4qdbN98B9gtaU7pseJWABZzwoDawXLC5QMlx0idXxc=
250+
github.com/project-codeflare/appwrapper v0.21.2-0.20240712173553-5b007c947b37/go.mod h1:gKjO+iRtMIdBvIBYmN+VciL9kzWmkfwgk/+24wCLhSM=
248251
github.com/project-codeflare/codeflare-common v0.0.0-20240628111341-56c962a09b7e h1:juFd1dQyioeMxbVE6F0YD25ozm/jiqJE+MpDhu8p22k=
249252
github.com/project-codeflare/codeflare-common v0.0.0-20240628111341-56c962a09b7e/go.mod h1:unKTw+XoMANTES3WieG016im7rxZ7IR2/ph++L5Vp1Y=
250253
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
@@ -329,8 +332,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
329332
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
330333
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
331334
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
332-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
333-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
335+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
336+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
334337
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
335338
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
336339
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -540,8 +543,6 @@ sigs.k8s.io/jobset v0.5.1/go.mod h1:Vg99rj/6OoGvy1uvywGEHOcVLCWWJYkJtisKqdWzcFw=
540543
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
541544
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
542545
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
543-
sigs.k8s.io/kueue v0.7.0 h1:Rwg2Ce/0kjZwdov1XdsAFb11QQtOOHx7HCTwFSMd8wc=
544-
sigs.k8s.io/kueue v0.7.0/go.mod h1:tjzIB8Y1vWwBJRWJsXByRIx89PGUq5/mzeLnYHZoFtk=
545546
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
546547
sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
547548
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

0 commit comments

Comments
 (0)