Skip to content

Commit 869bed0

Browse files
dgrove-ossopenshift-merge-bot[bot]
dgrove-oss
authored and
openshift-merge-bot[bot]
committed
Update to AppWrapper v0.20.1 and Kueue v0.7.0
1 parent e4ff160 commit 869bed0

File tree

6 files changed

+128
-131
lines changed

6 files changed

+128
-131
lines changed

Diff for: ‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Here are a few things to go over before getting started with CodeFlare Operator
55
## Environment setup
66

77
The following should be installed in your working environment:
8-
- Go 1.21.x
8+
- Go 1.22.x
99
- [Download release](https://go.dev/dl/)
1010
- [Install Instructions](https://go.dev/doc/install)
1111
- [Operator SDK](https://sdk.operatorframework.io/docs/installation/)

Diff for: ‎Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Build the manager binary
22

3-
# BEGIN -- workaround lack of go-toolset for golang 1.21
3+
# BEGIN -- workaround lack of go-toolset for golang 1.22
44

5-
ARG GOLANG_IMAGE=golang:1.21
5+
ARG GOLANG_IMAGE=golang:1.22
66

77
ARG GOARCH=amd64
88

@@ -20,7 +20,7 @@ RUN dnf upgrade -y && dnf install -y \
2020
ENV PATH=/usr/local/go/bin:$PATH
2121
COPY --from=golang /usr/local/go /usr/local/go
2222

23-
# END -- workaround lack of go-toolset for golang 1.21
23+
# END -- workaround lack of go-toolset for golang 1.22
2424

2525
WORKDIR /workspace
2626
# Copy the Go Modules manifests

Diff for: ‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ 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.13.1
16-
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)
18-
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
15+
APPWRAPPER_VERSION ?= v0.20.1
16+
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)
18+
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
1919

20-
# KUEUE_VERSION defines the default version of Kueue (used for testing)
21-
KUEUE_VERSION ?= v0.6.2
20+
# KUEUE_VERSION defines the default version of Kueue (used for testing)
21+
KUEUE_VERSION ?= v0.7.0
2222

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

Diff for: ‎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.13.1
4+
- github.com/project-codeflare/appwrapper/config/crd?ref=v0.20.1

Diff for: ‎go.mod

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
module github.com/project-codeflare/codeflare-operator
22

3-
go 1.21
3+
go 1.22.2
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.16.0
7-
github.com/onsi/gomega v1.31.1
6+
github.com/onsi/ginkgo/v2 v2.19.0
7+
github.com/onsi/gomega v1.33.1
88
github.com/open-policy-agent/cert-controller v0.10.1
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.13.1
12+
github.com/project-codeflare/appwrapper v0.20.1
1313
github.com/project-codeflare/codeflare-common v0.0.0-20240617130731-0c3f3b3c0e5f
14-
github.com/ray-project/kuberay/ray-operator v1.1.0
15-
go.uber.org/zap v1.26.0
14+
github.com/ray-project/kuberay/ray-operator v1.1.1
15+
go.uber.org/zap v1.27.0
1616
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
17-
k8s.io/api v0.29.2
17+
k8s.io/api v0.30.1
1818
k8s.io/apiextensions-apiserver v0.29.2
19-
k8s.io/apimachinery v0.29.2
19+
k8s.io/apimachinery v0.30.1
2020
k8s.io/client-go v11.0.0+incompatible
21-
k8s.io/component-base v0.29.2
22-
k8s.io/klog/v2 v2.110.1
23-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
24-
sigs.k8s.io/controller-runtime v0.17.0
25-
sigs.k8s.io/kueue v0.6.2
21+
k8s.io/component-base v0.29.5
22+
k8s.io/klog/v2 v2.120.1
23+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
24+
sigs.k8s.io/controller-runtime v0.17.3
25+
sigs.k8s.io/kueue v0.7.0
2626
sigs.k8s.io/yaml v1.4.0
2727
)
2828

@@ -46,22 +46,22 @@ require (
4646
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4747
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
4848
github.com/fsnotify/fsnotify v1.7.0 // indirect
49-
github.com/go-logr/logr v1.4.1 // indirect
49+
github.com/go-logr/logr v1.4.2 // indirect
5050
github.com/go-logr/zapr v1.3.0 // indirect
5151
github.com/go-openapi/jsonpointer v0.20.0 // indirect
5252
github.com/go-openapi/jsonreference v0.20.2 // indirect
5353
github.com/go-openapi/swag v0.22.4 // indirect
54-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
54+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5555
github.com/gogo/protobuf v1.3.2 // indirect
5656
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5757
github.com/golang/glog v1.1.2 // indirect
5858
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
59-
github.com/golang/protobuf v1.5.3 // indirect
59+
github.com/golang/protobuf v1.5.4 // indirect
6060
github.com/google/gnostic-models v0.6.8 // indirect
6161
github.com/google/go-cmp v0.6.0 // indirect
6262
github.com/google/gofuzz v1.2.0 // indirect
63-
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
64-
github.com/google/uuid v1.3.1 // indirect
63+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
64+
github.com/google/uuid v1.6.0 // indirect
6565
github.com/gorilla/css v1.0.0 // indirect
6666
github.com/imdario/mergo v0.3.16 // indirect
6767
github.com/jackc/pgx/v5 v5.5.5 // indirect
@@ -78,30 +78,30 @@ require (
7878
github.com/openshift/custom-resource-status v1.1.2 // indirect
7979
github.com/pkg/errors v0.9.1 // indirect
8080
github.com/prometheus/client_golang v1.18.0 // indirect
81-
github.com/prometheus/client_model v0.5.0 // indirect
81+
github.com/prometheus/client_model v0.6.1 // indirect
8282
github.com/prometheus/common v0.46.0 // indirect
8383
github.com/prometheus/procfs v0.12.0 // indirect
8484
github.com/sirupsen/logrus v1.9.3 // indirect
8585
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
8686
github.com/spf13/pflag v1.0.5 // indirect
8787
go.uber.org/atomic v1.11.0 // indirect
8888
go.uber.org/multierr v1.11.0 // indirect
89-
golang.org/x/net v0.23.0 // indirect
89+
golang.org/x/net v0.25.0 // indirect
9090
golang.org/x/oauth2 v0.16.0 // indirect
91-
golang.org/x/sys v0.18.0 // indirect
92-
golang.org/x/term v0.18.0 // indirect
93-
golang.org/x/text v0.14.0 // indirect
91+
golang.org/x/sys v0.20.0 // indirect
92+
golang.org/x/term v0.20.0 // indirect
93+
golang.org/x/text v0.15.0 // indirect
9494
golang.org/x/time v0.3.0 // indirect
95-
golang.org/x/tools v0.17.0 // indirect
95+
golang.org/x/tools v0.21.0 // indirect
9696
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9797
google.golang.org/appengine v1.6.8 // indirect
9898
google.golang.org/protobuf v1.33.0 // indirect
9999
gopkg.in/inf.v0 v0.9.1 // indirect
100100
gopkg.in/yaml.v2 v2.4.0 // indirect
101101
gopkg.in/yaml.v3 v3.0.1 // indirect
102-
k8s.io/apiserver v0.29.2 // indirect
103-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
104-
sigs.k8s.io/jobset v0.3.1 // indirect
102+
k8s.io/apiserver v0.29.5 // indirect
103+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
104+
sigs.k8s.io/jobset v0.5.1 // indirect
105105
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
106106
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
107107
)

0 commit comments

Comments
 (0)